Compil fix.

[lyx.git] / src / frontends / qt4 / qt_helpers.h

diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h
index f42c993361b2f7660058972e1356e5b9a7f94999..66ec9e6f96958dfcbcc2a6e1fda7f2b6851ebdda 100644 (file)
--- a/src/frontends/qt4/qt_helpers.h
+++ b/src/frontends/qt4/qt_helpers.h
@@ -15,7 +15,9 @@
 
 #include "Length.h"
 #include "support/qstring_helpers.h"
-#include "support/strfwd.h"
+#include "qt_i18n.h"
+
+#include <QString>
 
 class QComboBox;
 class QLineEdit;
@@ -28,9 +30,13 @@ class LengthCombo;
 
 namespace lyx {
 
-namespace support { class FileFilterList; }
 namespace support { class FileName; }
 
+class BufferParams;
+class LyXErr;
+
+LyXErr & operator<<(LyXErr &, QString const &);
+
 namespace frontend {
 
 /// method to get a Length from widgets (LengthCombo)
@@ -55,14 +61,6 @@ void setValid(QWidget * widget, bool valid);
 } // namespace frontend
 
 
-/**
-* qt_ - i18nize string and convert to QString
- *
- * Use this in qt4/ instead of _()
- */
-QString const qt_(char const * str, const char * comment = 0);
-
-
 /**
  * qt_ - i18nize string and convert to QString
  *
@@ -71,13 +69,6 @@ QString const qt_(char const * str, const char * comment = 0);
 QString const qt_(std::string const & str);
 
 ///
-typedef std::pair<QString, QString> LanguagePair;
-
-/** If the caller is the character dialog, add "No change" and "Reset"
-*  to the vector.
-*/
-QList<LanguagePair> languageData(bool character_dlg);
-
 support::FileName libFileSearch(QString const & dir, QString const & name,
                                QString const & ext = QString());
 
@@ -90,7 +81,7 @@ support::FileName libFileSearch(QString const & dir, QString const & name,
 QString browseRelFile(QString const & filename,
        QString const & refpath,
        QString const & title,
-       support::FileFilterList const & filters,
+       QStringList const & filters,
        bool save = false,
        QString const & label1 = QString(),
        QString const & dir1 = QString(),
@@ -112,6 +103,7 @@ QStringList texFileList(QString const & filename);
 QString internalPath(QString const &);
 QString onlyFilename(QString const & str);
 QString onlyPath(QString const & str);
+QStringList fileFilters(QString const & description);
 
 QString changeExtension(QString const & oldname, QString const & extension);
 
@@ -127,6 +119,12 @@ QString addExtension(QString const & name, QString const & extension);
 
 /// Return the extension of the file (not including the .)
 QString getExtension(QString const & name);
+QString makeAbsPath(QString const & relpath, QString const & base);
+QString changeExtension(QString const & oldname, QString const & ext);
+
+/// \return the display string associated with given type and buffer
+/// parameter.
+QString guiName(std::string const & type, BufferParams const & bp);
 
 } // namespace lyx