Remove non-copyable idioms

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

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index e0f7b1186d77708fa23821861144ed2d244524e8..bff9bf415a993a2cda8768a869f243884de52107 100644 (file)
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -14,14 +14,16 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/FileName.h"
 #include "support/ProgressInterface.h"
+#include "support/regex.h"
 
 #include <iostream>
 #include <iomanip>
 
+
 using namespace std;
 using namespace lyx::support;
 
@@ -29,14 +31,14 @@ namespace lyx {
 
 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")},
@@ -58,7 +60,7 @@ ErrorItem errorTags[] = {
        { 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")},
@@ -143,10 +145,10 @@ Debug::Type Debug::value(string const & val)
 void Debug::showLevel(ostream & os, Debug::Type level)
 {
        // Show what features are traced
-       for (int i = 0; i != numErrorTags; ++i) {
+       for (int i = 0; i < numErrorTags; ++i) {
                if (errorTags[i].level != Debug::ANY
-                   && errorTags[i].level != Debug::NONE
-                   && errorTags[i].level & level) {
+                     && errorTags[i].level != Debug::NONE
+                     && errorTags[i].level & level) {
                        // avoid to_utf8(_(...)) re-entrance problem
                        docstring const s = _(errorTags[i].desc);
                        os << to_utf8(bformat(_("Debugging `%1$s' (%2$s)"),
@@ -182,7 +184,7 @@ void LyXErr::enable()
 
 bool LyXErr::debugging(Debug::Type t) const
 {
-       return (dt & t);
+       return (dt_ & t);
 }
 
 
@@ -190,9 +192,25 @@ void LyXErr::endl()
 {
        if (enabled_) {
                stream() << std::endl;
-               if (second_used_)
-                       second() << "\n";
+               if (second_enabled_)
+                       secondStream() << std::endl;
+       }
+}
+
+
+char const * LyXErr::stripName(char const * n)
+{
+       string const name = n;
+       // find the last occurence of /src/ in name
+       static const 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);
 }
 
 
@@ -202,8 +220,8 @@ LyXErr & toStream(LyXErr & l, T t)
 {
        if (l.enabled()){
                l.stream() << t;
-               if (l.second_used()){
-                       l.second() << t;
+               if (l.secondEnabled()) {
+                       l.secondStream() << t;
                        ProgressInterface::instance()->lyxerrFlush();
                }
        }
@@ -225,6 +243,12 @@ LyXErr & operator<<(LyXErr & l, long t)
 { return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, unsigned long t)
 { return toStream(l, t); }
+#ifdef LYX_USE_LONG_LONG
+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)
@@ -242,4 +266,6 @@ LyXErr & operator<<(LyXErr & l, ios_base &(*t)(ios_base &))
 // The global instance
 LyXErr lyxerr;
 
+
+
 } // namespace lyx