do what the FIXME suggested

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

diff --git a/src/frontends/qt4/GuiTexinfo.cpp b/src/frontends/qt4/GuiTexinfo.cpp
index 65900275cd6353089d70e70a25a1219e13850b35..b718d4b28788e22f62470c74e047ec852668181e 100644 (file)
--- a/src/frontends/qt4/GuiTexinfo.cpp
+++ b/src/frontends/qt4/GuiTexinfo.cpp
@@ -14,15 +14,14 @@
 #include "GuiTexinfo.h"
 
 #include "FuncRequest.h"
-#include "debug.h"
 
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/FileName.h"
 #include "support/lstrings.h"
 
 #include "qt_helpers.h"
 
-#include <QCloseEvent>
 #include <QCheckBox>
 #include <QListWidget>
 #include <QPushButton>
@@ -30,20 +29,12 @@
 #include <fstream>
 #include <algorithm>
 
-using std::string;
-using std::vector;
-using std::endl;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::FileName;
-using support::contains;
-using support::split;
-using support::token;
-using support::getExtension;
-using support::libFileSearch;
-using support::onlyFilename;
 
 static string texFileFromList(string const & file, string const & type)
 {
@@ -68,7 +59,8 @@ static string texFileFromList(string const & file, string const & type)
                lyxerr << "File `'" << lstfile << "' not found." << endl;
                return string();
        }
-       string const allClasses = getFileContents(abslstfile);
+       // FIXME UNICODE
+       string const allClasses = to_utf8(abslstfile.fileContents("UTF-8"));
        int entries = 0;
        string classfile = token(allClasses, '\n', entries);
        int count = 0;
@@ -85,12 +77,10 @@ static string texFileFromList(string const & file, string const & type)
 }
 
 
-GuiTexInfo::GuiTexInfo(LyXView & lv)
-       : GuiDialog(lv, "texinfo"), Controller(this)
+GuiTexInfo::GuiTexInfo(GuiView & lv)
+       : GuiDialog(lv, "texinfo", qt_("TeX Information"))
 {
        setupUi(this);
-       setViewTitle(_("TeX Information"));
-       setController(this, false);
 
        warningPosted = false;
        activeStyle = ClsType;
@@ -122,13 +112,6 @@ void GuiTexInfo::change_adaptor()
 }
 
 
-void GuiTexInfo::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiTexInfo::rescanClicked()
 {
        // build new *Files.lst
@@ -184,10 +167,10 @@ void GuiTexInfo::updateStyles(TexFileType type)
        vector<string>::iterator it1  = data.begin();
        vector<string>::iterator end1 = data.end();
        for (; it1 != end1; ++it1)
-               *it1 = support::onlyFilename(*it1);
+               *it1 = onlyFilename(*it1);
 
        // sort on filename only (no path)
-       std::sort(data.begin(), data.end());
+       sort(data.begin(), data.end());
 
        fileListLW->clear();
        ContentsType::const_iterator it  = data.begin();
@@ -218,7 +201,7 @@ string GuiTexInfo::classOptions(string const & classname) const
        if (filename.empty())
                return string();
        string optionList;
-       std::ifstream is(filename.toFilesystemEncoding().c_str());
+       ifstream is(filename.toFilesystemEncoding().c_str());
        while (is) {
                string s;
                is >> s;
@@ -241,7 +224,7 @@ string GuiTexInfo::fileType(TexFileType type) const
 }
 
 
-Dialog * createGuiTexInfo(LyXView & lv) { return new GuiTexInfo(lv); }
+Dialog * createGuiTexInfo(GuiView & lv) { return new GuiTexInfo(lv); }
 
 
 } // namespace frontend