Use QFontMetrics information for underlines (and friends) width and position

[lyx.git] / src / frontends / qt4 / GuiBox.h

diff --git a/src/frontends/qt4/GuiBox.h b/src/frontends/qt4/GuiBox.h
index e40bcae4efe4eb884a802c3c2ed9274df2f75e5f..955335037fa9f9b935ab61370c70979ddca4ed0e 100644 (file)
--- a/src/frontends/qt4/GuiBox.h
+++ b/src/frontends/qt4/GuiBox.h
@@ -20,8 +20,6 @@
 namespace lyx {
 namespace frontend {
 
-typedef std::pair<QString, ColorCode>  ColorPair;
-
 class GuiBox : public InsetParamsWidget, public Ui::BoxUi
 {
        Q_OBJECT
@@ -48,6 +46,8 @@ private:
        bool checkWidgets(bool readonly) const;
        //@}
 
+       /// Fill the color combos
+       void fillComboColor(QComboBox * combo, bool const is_none);
        /// add and remove special lengths
        void setSpecial(bool ibox);
        /// only show valid inner box items
@@ -61,7 +61,7 @@ private:
        ///
        QStringList gui_names_spec_;
        ///
-       QList<ColorPair> color;
+       QList<ColorCode> color_codes_;
 };
 
 } // namespace frontend