*/
#include <config.h>
-#include <lassert.h>
+
+#include "support/lassert.h"
#include "support/convert.h"
#include "support/debug.h"
#include <boost/assert.hpp>
-#include <QString>
#ifdef LYX_CALLSTACK_PRINTING
#include <cstdio>
#include <cstdlib>
#include <execinfo.h>
#include <cxxabi.h>
+#include <QString>
#endif
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) {