Compil fix.

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

diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp
index 8f908e15eacbc15dde79c40efdfd42eb611d6c75..11472e7463daafe5ac2958b88a179cc581650328 100644 (file)
--- a/src/frontends/qt4/GuiListings.cpp
+++ b/src/frontends/qt4/GuiListings.cpp
@@ -14,15 +14,17 @@
 #include "GuiListings.h"
 
 #include "qt_helpers.h"
+
 #include "FuncRequest.h"
+
 #include "insets/InsetListings.h"
 #include "insets/InsetListingsParams.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <QLineEdit>
-#include <QCloseEvent>
 #include <QPushButton>
 #include <QValidator>
 #include <QRegExpValidator>
@@ -158,10 +160,9 @@ char const * font_styles_gui[] =
 
 
 GuiListings::GuiListings(GuiView & lv)
-       : GuiDialog(lv, "listings")
+       : GuiDialog(lv, "listings", qt_("Program Listing Settings"))
 {
        setupUi(this);
-       setViewTitle(_("Program Listing Settings"));
 
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
@@ -238,13 +239,6 @@ GuiListings::GuiListings(GuiView & lv)
 }
 
 
-void GuiListings::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiListings::change_adaptor()
 {
        changed();
@@ -253,7 +247,7 @@ void GuiListings::change_adaptor()
 
 string GuiListings::construct_params()
 {
-       string language = languages[languageCO->currentIndex()];
+       string language = languages[qMax(0, languageCO->currentIndex())];
        string dialect;
        string const dialect_gui = fromqstr(dialectCO->currentText());
        if (dialectCO->currentIndex() > 0) {
@@ -273,7 +267,7 @@ string GuiListings::construct_params()
                placement = fromqstr(placementLE->text());
 
        string numberSide;
-       switch (numberSideCO->currentIndex()) {
+       switch (qMax(0, numberSideCO->currentIndex())) {
        case 0:
                numberSide = "none";
                break;
@@ -288,12 +282,12 @@ string GuiListings::construct_params()
                break;
        }
        string stepnumber = fromqstr(numberStepLE->text());
-       string numberfontsize = font_sizes[numberFontSizeCO->currentIndex()];
+       string numberfontsize = font_sizes[qMax(0, numberFontSizeCO->currentIndex())];
        string firstline = fromqstr(firstlineLE->text());
        string lastline = fromqstr(lastlineLE->text());
 
-       string fontsize = font_sizes[fontsizeCO->currentIndex()];
-       string fontstyle = font_styles[fontstyleCO->currentIndex()];
+       string fontsize = font_sizes[qMax(0, fontsizeCO->currentIndex())];
+       string fontstyle = font_styles[qMax(0, fontstyleCO->currentIndex())];
        string basicstyle;
        if (fontsize != "default")
                basicstyle = "\\" + fontsize;
@@ -611,7 +605,7 @@ bool GuiListings::isValid()
 
 bool GuiListings::initialiseParams(string const & data)
 {
-       InsetListingsMailer::string2params(data, params_);
+       InsetListings::string2params(data, params_);
        return true;
 }
 
@@ -624,7 +618,7 @@ void GuiListings::clearParams()
 
 void GuiListings::dispatchParams()
 {
-       string const lfun = InsetListingsMailer::params2string(params_);
+       string const lfun = InsetListings::params2string(params_);
        dispatch(FuncRequest(getLfun(), lfun));
 }