do what the FIXME suggested

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

diff --git a/src/frontends/qt4/GuiDelimiter.cpp b/src/frontends/qt4/GuiDelimiter.cpp
index fabf3db3bacdf9314ef94b2dbc1a65f142bf2eab..b164316a2eccc280373b31a5732037a418ddb2f3 100644 (file)
--- a/src/frontends/qt4/GuiDelimiter.cpp
+++ b/src/frontends/qt4/GuiDelimiter.cpp
@@ -16,16 +16,13 @@
 #include "GuiView.h"
 
 #include "qt_helpers.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include <QPixmap>
 #include <QCheckBox>
 #include <QListWidgetItem>
 
-// Set to zero if unicode symbols are preferred.
-#define USE_PIXMAP 1
-
-using std::string;
+using namespace std;
 
 static char const *  latex_delimiters[] = {
        "(", ")", "{", "}", "[", "]",
@@ -69,12 +66,10 @@ namespace lyx {
 namespace frontend {
 
 
-GuiDelimiter::GuiDelimiter(LyXView & lv)
-       : GuiMath(lv, "mathdelimiter")
+GuiDelimiter::GuiDelimiter(GuiView & lv)
+       : GuiMath(lv, "mathdelimiter", qt_("Math Delimiter"))
 {
        setupUi(this);
-       setViewTitle(_("Math Delimiter"));
-       setController(this, false);
 
        connect(closePB, SIGNAL(clicked()), this, SLOT(accept()));
 
@@ -83,7 +78,7 @@ GuiDelimiter::GuiDelimiter(LyXView & lv)
        leftLW->setViewMode(QListView::IconMode);
        rightLW->setViewMode(QListView::IconMode);
 
-       typedef std::map<char_type, QListWidgetItem *> ListItems;
+       typedef map<char_type, QListWidgetItem *> ListItems;
        ListItems list_items;
        // The last element is the empty one.
        int const end = nr_latex_delimiters - 1;
@@ -94,7 +89,7 @@ GuiDelimiter::GuiDelimiter(LyXView & lv)
                        QChar(ms.fontcode) : toqstr(docstring(1, ms.unicode)));
                QListWidgetItem * lwi = new QListWidgetItem(symbol);
                lwi->setToolTip(toqstr(delim));
-               Font lyxfont;
+               FontInfo lyxfont;
                lyxfont.setFamily(ms.fontfamily);
                QFont const & symbol_font = guiApp->guiFontLoader().get(lyxfont);
                lwi->setFont(symbol_font);
@@ -244,7 +239,7 @@ void GuiDelimiter::on_matchCB_stateChanged(int state)
 }
 
 
-Dialog * createGuiDelimiter(LyXView & lv) { return new GuiDelimiter(lv); }
+Dialog * createGuiDelimiter(GuiView & lv) { return new GuiDelimiter(lv); }
 
 
 } // namespace frontend