- Link against qt-mt333.lib which is what the current qt3 cvs produces

[lyx.git] / src / LColor.C

diff --git a/src/LColor.C b/src/LColor.C
index e515ed5dc866c043b34c03dc1d6e9d91165a2a5f..2f24d5c9a5a0dc760e159765bec37f7897a1dfa7 100644 (file)
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -42,9 +42,11 @@ struct ColorEntry {
 
 }
 
-struct LColor::Pimpl {
+class LColor::Pimpl {
+public:
        ///
-       struct information {
+       class information {
+       public:
                /// the name as it appears in the GUI
                string guiname;
                /// the name used in LaTeX
@@ -160,10 +162,10 @@ LColor::~LColor()
 {}
 
 
-void LColor::operator=(LColor const & c)
+LColor & LColor::operator=(LColor tmp)
 {
-       LColor tmp(c);
        boost::swap(pimpl_, tmp.pimpl_);
+       return *this;
 }
 
 
@@ -223,7 +225,7 @@ bool LColor::setColor(LColor::color col, string const & x11name)
                       << " may not be redefined" << endl;
                return false;
        }
-       
+
        it->second.x11name = x11name;
        return true;
 }
@@ -233,8 +235,8 @@ bool LColor::setColor(string const & lyxname, string const &x11name)
 {
        string const lcname = ascii_lowercase(lyxname);
        if (pimpl_->transform.find(lcname) == pimpl_->transform.end()) {
-               lyxerr[Debug::GUI] 
-                       << "LColor::setColor: Unknown color \"" 
+               lyxerr[Debug::GUI]
+                       << "LColor::setColor: Unknown color \""
                       << lyxname << '"' << endl;
                addColor(static_cast<color>(pimpl_->infotab.size()), lcname);
        }
@@ -267,7 +269,7 @@ LColor::color LColor::getFromLyXName(string const & lyxname) const
 {
        string const lcname = ascii_lowercase(lyxname);
        if (pimpl_->transform.find(lcname) == pimpl_->transform.end()) {
-               lyxerr << "LColor::getFromLyXName: Unknown color \"" 
+               lyxerr << "LColor::getFromLyXName: Unknown color \""
                       << lyxname << '"' << endl;
                return none;
        }