make frontend::Application a bit slimmer

[lyx.git] / src / BranchList.cpp

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index 128d27c59051c5929c9b31df649cae9c10611f34..b846641e15556a217053a245a120862089c46181 100644 (file)
--- a/src/BranchList.cpp
+++ b/src/BranchList.cpp
@@ -11,21 +11,22 @@
 #include <config.h>
 
 #include "BranchList.h"
-#include "LColor.h"
+#include "Color.h"
 
 #include "frontends/Application.h"
 
 #include <algorithm>
 
+using std::string;
 
 namespace lyx {
 
-using std::string;
-
 
-Branch::Branch()
+Branch::Branch() : selected_(false)
 {
-       theApp()->getRgbColor(LColor::background, color_);
+       // no theApp() with command line export
+       if (theApp())
+               theApp()->getRgbColor(Color_background, color_);
 }
 
 
@@ -68,13 +69,13 @@ void Branch::setColor(RGBColor const & c)
 }
 
 
-void Branch::setColor(string const & c)
+void Branch::setColor(string const & str)
 {
-       if (c.size() == 7 && c[0] == '#')
-               color_ = RGBColor(c);
+       if (str.size() == 7 && str[0] == '#')
+               color_ = rgbFromHexName(str);
        else
                // no color set or invalid color - use normal background
-               theApp()->getRgbColor(LColor::background, color_);
+               theApp()->getRgbColor(Color_background, color_);
 }