Let paragraph::requestSpellcheck() consider contained insets

[lyx.git] / src / support / lassert.cpp

diff --git a/src/support/lassert.cpp b/src/support/lassert.cpp
index 26347494806954df63603a8cc271f620026dad8b..3e594153cbe89ecb879b7d071cb0404ca371b3b9 100644 (file)
--- a/src/support/lassert.cpp
+++ b/src/support/lassert.cpp
@@ -10,7 +10,8 @@
  */
 
 #include <config.h>
-#include <lassert.h>
+
+#include "support/lassert.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
@@ -21,13 +22,13 @@
 
 #include <boost/assert.hpp>
 
-#include <QString>
 
 #ifdef LYX_CALLSTACK_PRINTING
 #include <cstdio>
 #include <cstdlib>
 #include <execinfo.h>
 #include <cxxabi.h>
+#include <QString>
 #endif
 
 
@@ -109,7 +110,7 @@ docstring printCallStack()
        char** messages = backtrace_symbols(array, size);
 
        docstring bt;
-       for (size_t i = 1; i < size && messages != NULL; i++) {
+       for (size_t i = 1; i < size && messages != nullptr; i++) {
                const std::string orig(messages[i]);
                char* mangled = nullptr;
                for (char *p = messages[i]; *p; ++p) {