* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / ColorCache.cpp

diff --git a/src/frontends/qt4/ColorCache.cpp b/src/frontends/qt4/ColorCache.cpp
index dde6bc6368ba6df40afe7a8f46eb810de2c87599..5b7a416afcc38d7bd5d8a3ebd53718da16bb9060 100644 (file)
--- a/src/frontends/qt4/ColorCache.cpp
+++ b/src/frontends/qt4/ColorCache.cpp
@@ -11,11 +11,7 @@
 #include <config.h>
 
 #include "ColorCache.h"
-
-#include "Color.h"
-
-#include <string>
-
+#include "ColorSet.h"
 
 namespace lyx {
 
@@ -40,9 +36,9 @@ QColor ColorCache::get(Color color) const
                QColor base_color = get(color.baseColor).toRgb();
                QColor merge_color = get(color.mergeColor).toRgb();
                return QColor(
-                       (base_color.red() + merge_color.red())/2,
-                       (base_color.green() + merge_color.green())/2,
-                       (base_color.blue() + merge_color.blue())/2);
+                       (base_color.red() + merge_color.red()) / 2,
+                       (base_color.green() + merge_color.green()) / 2,
+                       (base_color.blue() + merge_color.blue()) / 2);
        }
        // used by branches
        return QColor(lcolor.getX11Name(color.baseColor).c_str());