#include <config.h>
-#include "support/convert.h"
#include "support/debug.h"
+
+#include "support/convert.h"
#include "support/FileName.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/ProgressInterface.h"
-#include "support/regex.h"
#include <iostream>
#include <iomanip>
namespace {
-struct ErrorItem {
+struct DebugErrorItem {
Debug::Type level;
char const * name;
char const * desc;
};
-ErrorItem errorTags[] = {
+DebugErrorItem errorTags[] = {
{ Debug::NONE, "none", N_("No debugging messages")},
{ Debug::INFO, "info", N_("General information")},
{ Debug::INIT, "init", N_("Program initialisation")},
{ Debug::INSETS, "insets", N_("LyX Insets")},
{ Debug::FILES, "files", N_("Files used by LyX")},
{ Debug::WORKAREA, "workarea", N_("Workarea events")},
- { Debug::INSETTEXT, "insettext", N_("Insettext/tabular messages")},
+ { Debug::CLIPBOARD, "clipboard", N_("Clipboard handling")},
{ Debug::GRAPHICS, "graphics", N_("Graphics conversion and loading")},
{ Debug::CHANGES, "changes", N_("Change tracking")},
{ Debug::EXTERNAL, "external", N_("External template/inset messages")},
int const numErrorTags = sizeof(errorTags)/sizeof(errorTags[0]);
-} // namespace anon
+} // namespace
int Debug::levelCount()
break;
}
if (st == string::npos)
- break;
+ break;
v.erase(0, st + 1);
}
return l;
char const * LyXErr::stripName(char const * n)
{
string const name = n;
- // find the last occurence of /src/ in name
- static regex re("[\\/]src[\\/]");
- string::const_iterator const begin = name.begin();
- string::const_iterator it = begin;
- string::const_iterator const end = name.end();
- smatch results;
- while (regex_search(it, end, results, re)) {
- it = results[0].second;
- }
- return n + std::distance(begin, it);
+ // find the last occurrence of /src/ in name
+ size_t pos = name.rfind("/src/");
+ if (pos == string::npos)
+ pos = name.rfind("\\src\\");
+ if (pos == string::npos)
+ return n;
+ else
+ return n + pos + 5;
}
// It seems not possible to instantiate operator template out of class body
template<class T>
-LyXErr & toStream(LyXErr & l, T t)
+LyXErr & toStream(LyXErr & l, T t)
{
if (l.enabled()){
l.stream() << t;
{ return toStream(l, t); }
LyXErr & operator<<(LyXErr & l, unsigned long t)
{ return toStream(l, t); }
+#ifdef HAVE_LONG_LONG_INT
+LyXErr & operator<<(LyXErr & l, long long t)
+{ return toStream(l, t); }
+LyXErr & operator<<(LyXErr & l, unsigned long long t)
+{ return toStream(l, t); }
+#endif
LyXErr & operator<<(LyXErr & l, double t)
{ return toStream(l, t); }
LyXErr & operator<<(LyXErr & l, string const & t)