* QPrefsDialog::QPrefsDialog():

  - fix from Edwin Leuven: colorsModule did not recognize colornames grey40, etc.
  - delete unused variable.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13445 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/QPrefsDialog.C b/src/frontends/qt4/QPrefsDialog.C
index cbe5768ecaa37c50241ce6981c02706fbc72015d..a24ee45451aa368748e04876dd7de81eca02d1cb 100644 (file)
--- a/src/frontends/qt4/QPrefsDialog.C
+++ b/src/frontends/qt4/QPrefsDialog.C
@@ -44,6 +44,7 @@
 
 #include "gettext.h"
 #include "LColor.h"
+#include "lcolorcache.h"
 
 #include "controllers/ControlPrefs.h"
 
@@ -168,9 +169,8 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
                        || lc == LColor::ignore) continue;
 
                colors_.push_back(lc);
-               string const x11name(lcolor.getX11Name(lc));
                string const guiname(lcolor.getGUIName(lc));
-               QColorItem * ci(new QColorItem(QColor(toqstr(x11name)),
+               QColorItem * ci(new QColorItem(lcolorcache.get(lc),
                                toqstr(guiname)));
                colorsModule->lyxObjectsLB->insertItem(ci);
        }