Re: [Cvslog] r28426 - in /lyx-devel/trunk: development/scons/scons_man...

[Vincent van Ravesteijn]

poen...@lyx.org schreef:

Author: poenitz
Date: Tue Feb 10 00:30:24 2009
New Revision: 28426

URL: http://www.lyx.org/trac/changeset/28426
Log:
move ColorSet to a header of its own to reduce #include dependencies

@@ -126,9 +126,6 @@
 private:
        friend bool operator==(FontInfo const & lhs, FontInfo const & rhs);

- /// The color used for painting

-       Color paint_color_;
-
        ///
        FontFamily family_;
        ///
@@ -141,6 +138,8 @@
        ColorCode color_;
        ///
        ColorCode background_;
+       /// The color used for painting
+       Color paint_color_;
        ///
        FontState emph_;
        ///

 namespace lyx {

@@ -40,9 +36,9 @@

                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);
        }

Thank you for cleaning up my mess..

Vincent