Fix up 'Reduce metrics updates from 4 to 1 when loading file'

[lyx.git] / src / frontends / qt / GuiCharacter.cpp

diff --git a/src/frontends/qt/GuiCharacter.cpp b/src/frontends/qt/GuiCharacter.cpp
index 59b7ca3f0e50074d3d79fd11b3452fcec5c91947..dadae88c33fb045ead4ee162a9e9da5fbae7242d 100644 (file)
--- a/src/frontends/qt/GuiCharacter.cpp
+++ b/src/frontends/qt/GuiCharacter.cpp
@@ -18,7 +18,6 @@
 #include "GuiApplication.h"
 #include "qt_helpers.h"
 
-#include "Font.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
@@ -31,7 +30,6 @@
 #include "Paragraph.h"
 
 #include "support/gettext.h"
-#include "support/lstrings.h"
 
 #include <QAbstractItemModel>
 #include <QPushButton>
@@ -221,14 +219,14 @@ GuiCharacter::GuiCharacter(GuiView & lv)
        connect(autoapplyCB, SIGNAL(stateChanged(int)), this,
                SLOT(slotAutoApply()));
 
-       connect(ulineCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(strikeCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(sizeCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(familyCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(seriesCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(shapeCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(colorCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
-       connect(langCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor()));
+       connect(ulineCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(strikeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(sizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(familyCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(seriesCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(shapeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(colorCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
+       connect(langCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
 
        family = familyData();
        series = seriesData();
@@ -237,7 +235,7 @@ GuiCharacter::GuiCharacter(GuiView & lv)
        bar    = barData();
        strike = strikeData();
        color  = colorData();
-       qSort(color.begin(), color.end(), ColorSorter);
+       sort(color.begin(), color.end(), ColorSorter);
 
        language = languageData();
        language.prepend(LanguagePair(qt_("Default"), "reset"));
@@ -435,7 +433,7 @@ void GuiCharacter::change_adaptor()
 
        // to be really good here, we should set the combos to the values of
        // the current text, and make it appear as "no change" if the values
-       // stay the same between applys. Might be difficult though wrt to a
+       // stay the same between applies. Might be difficult though wrt to a
        // moved cursor - jbl
        slotApply();
 }
@@ -698,9 +696,6 @@ void GuiCharacter::restoreSession()
 }
 
 
-Dialog * createGuiCharacter(GuiView & lv) { return new GuiCharacter(lv); }
-
-
 } // namespace frontend
 } // namespace lyx