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 920cc9c8a4e30854a05aed44dd3f3589760dbe0c..66ec9e6f96958dfcbcc2a6e1fda7f2b6851ebdda 100644 (file)
--- a/src/frontends/qt4/qt_helpers.h
+++ b/src/frontends/qt4/qt_helpers.h
@@ -15,21 +15,27 @@
 
 #include "Length.h"
 #include "support/qstring_helpers.h"
-#include "support/strfwd.h"
+#include "qt_i18n.h"
 
-#include <vector>
+#include <QString>
 
 class QComboBox;
 class QLineEdit;
 class QCheckBox;
 class QString;
 class QWidget;
+template <class T> class QList;
 
 class LengthCombo;
 
 namespace lyx {
 
-namespace support { class FileFilterList; }
+namespace support { class FileName; }
+
+class BufferParams;
+class LyXErr;
+
+LyXErr & operator<<(LyXErr &, QString const &);
 
 namespace frontend {
 
@@ -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,12 +69,8 @@ QString const qt_(char const * str, const char * comment = 0);
 QString const qt_(std::string const & str);
 
 ///
-typedef std::pair<docstring, std::string> LanguagePair;
-
-/** If the caller is the character dialog, add "No change" and "Reset"
-*  to the vector.
-*/
-std::vector<LanguagePair> const getLanguageData(bool character_dlg);
+support::FileName libFileSearch(QString const & dir, QString const & name,
+                               QString const & ext = QString());
 
 /** Wrapper around browseFile which tries to provide a filename
        relative to relpath.  If the relative path is of the form "foo.txt"
@@ -87,7 +81,7 @@ std::vector<LanguagePair> const getLanguageData(bool character_dlg);
 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(),
@@ -103,12 +97,34 @@ void rescanTexStyles();
 /** Fill \c contents from one of the three texfiles.
  *  Each entry in the file list is returned as a name_with_path
  */
-void getTexFileList(std::string const & filename, std::vector<std::string> & contents);
+QStringList texFileList(QString const & filename);
 
 // wrapper around the docstring versions
-QString internalPath(const QString &);
-QString onlyFilename(const QString & str);
-QString onlyPath(const QString & str);
+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);
+
+/// Remove the extension from \p name
+QString removeExtension(QString const & name);
+
+/** Add the extension \p ext to \p name.
+ Use this instead of changeExtension if you know that \p name is without
+ extension, because changeExtension would wrongly interpret \p name if it
+ contains a dot.
+ */
+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