Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / Color.cpp

diff --git a/src/Color.cpp b/src/Color.cpp
index 93f142399c4e9e956fc61731ea2af39ee8961e92..6752ff8ad3b0da9a25c0add24abbac329458d55f 100644 (file)
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -18,9 +18,8 @@
 
 #include "Color.h"
 
-#include "debug.h"
-#include "gettext.h"
-
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <boost/assert.hpp>
@@ -31,23 +30,11 @@
 #include <iomanip>
 
 
-#ifndef CXX_GLOBAL_CSTD
-using std::floor;
-#endif
-
-using std::max;
-using std::min;
-using std::setw;
-
-using std::istringstream;
-using std::ostringstream;
-using std::string;
-using std::endl;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::compare_ascii_no_case;
-using support::ascii_lowercase;
 
 struct ColorSet::ColorEntry {
        ColorCode lcolor;
@@ -62,7 +49,7 @@ static int hexstrToInt(string const & str)
 {
        int val = 0;
        istringstream is(str);
-       is >> std::setbase(16) >> val;
+       is >> setbase(16) >> val;
        return val;
 }
 
@@ -78,7 +65,7 @@ string const X11hexname(RGBColor const & col)
 {
        ostringstream ostr;
 
-       ostr << '#' << std::setbase(16) << std::setfill('0')
+       ostr << '#' << setbase(16) << setfill('0')
             << setw(2) << col.r
             << setw(2) << col.g
             << setw(2) << col.b;
@@ -159,7 +146,8 @@ ColorSet::ColorSet()
        { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline",
             "LightSteelBlue", "tabularonoffline" },
        { Color_bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" },
-       { Color_pagebreak, N_("page break"), "pagebreak", "RoyalBlue", "pagebreak" },
+       { Color_newpage, N_("new page"), "newpage", "Blue", "newpage" },
+       { Color_pagebreak, N_("page break / line break"), "pagebreak", "RoyalBlue", "pagebreak" },
        { Color_buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" },
        { Color_buttonbg, N_("button background"), "buttonbg", "#dcd2c8", "buttonbg" },
        { Color_buttonhoverbg, N_("button background under focus"), "buttonhoverbg", "#C7C7CA", "buttonhoverbg" },
@@ -232,7 +220,7 @@ bool ColorSet::setColor(ColorCode col, string const & x11name)
        InfoTab::iterator it = infotab.find(col);
        if (it == infotab.end()) {
                lyxerr << "Color " << col << " not found in database."
-                      << std::endl;
+                      << endl;
                return false;
        }
 
@@ -253,9 +241,8 @@ bool ColorSet::setColor(string const & lyxname, string const &x11name)
 {
        string const lcname = ascii_lowercase(lyxname);
        if (lyxcolors.find(lcname) == lyxcolors.end()) {
-               LYXERR(Debug::GUI)
-                       << "ColorSet::setColor: Unknown color \""
-                      << lyxname << '"' << endl;
+               LYXERR(Debug::GUI, "ColorSet::setColor: Unknown color \""
+                      << lyxname << '"');
                addColor(static_cast<ColorCode>(infotab.size()), lcname);
        }