Use <cstdint> instead of <boost/cstdint.hpp>

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

diff --git a/src/frontends/qt4/GuiTexinfo.cpp b/src/frontends/qt4/GuiTexinfo.cpp
index 9fbeb5adb2ba9f48cd060bbb1fbe5090ef994d78..554b874095cde560d057c2115976fb10a8770e7e 100644 (file)
--- a/src/frontends/qt4/GuiTexinfo.cpp
+++ b/src/frontends/qt4/GuiTexinfo.cpp
@@ -54,7 +54,8 @@ GuiTexInfo::GuiTexInfo(GuiView & lv)
        warningPosted_ = false;
        activeStyle_ = ClsType;
 
-       connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+       connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+               this, SLOT(slotButtonBox(QAbstractButton *)));
 
        connect(viewPB, SIGNAL(clicked()), this, SLOT(viewClicked()));
        connect(whatStyleCO, SIGNAL(activated(QString)),
@@ -69,7 +70,7 @@ GuiTexInfo::GuiTexInfo(GuiView & lv)
                this, SLOT(enableViewPB()));
 
        bc().setPolicy(ButtonPolicy::OkCancelPolicy);
-       bc().setCancel(closePB);
+       bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
 }
 
 
@@ -93,10 +94,10 @@ void GuiTexInfo::viewClicked()
        // takes advantage of enum order
        static QString const ext[] = { "cls", "sty", "bst", "bib", "bbx", "cbx" };
        int const fitem = fileListLW->currentRow();
-       QStringList const & data = texdata_[activeStyle_];
-       QString file = data[fitem];
+       QStringList const & sdata = texdata_[activeStyle_];
+       QString file = sdata[fitem];
        if (!pathCB->isChecked())
-               file = texFileFromList(data[fitem], ext[activeStyle_]);
+               file = texFileFromList(sdata[fitem], ext[activeStyle_]);
        viewFile(file);
 }
 
@@ -124,28 +125,28 @@ void GuiTexInfo::updateStyles(TexFileType type)
 
        QString const filename = filenames[type];
 
-       QStringList data = texFileList(filename);
-       if (data.empty()) {
+       QStringList flist = texFileList(filename);
+       if (flist.empty()) {
                // build filelists of all availabe bst/cls/sty-files.
                // Done through kpsewhich and an external script,
                // saved in *Files.lst
                rescanTexStyles();
-               data = texFileList(filename);
+               flist = texFileList(filename);
        }
 
        if (!pathCB->isChecked()) {
-               for (int i = 0; i != data.size(); ++i)
-                       data[i] = onlyFileName(data[i]);
+               for (int i = 0; i != flist.size(); ++i)
+                       flist[i] = onlyFileName(flist[i]);
        }
        // sort on filename only (no path)
-       data.sort();
+       flist.sort();
 
        fileListLW->clear();
-       for(QString const & item : data)
+       for(QString const & item : flist)
                fileListLW->addItem(item);
 
        activeStyle_ = type;
-       texdata_[type] = data;
+       texdata_[type] = flist;
 }