X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fqt_helpers.h;h=dd284a8655099af9de1b77028d41ad0993e43911;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=f42c993361b2f7660058972e1356e5b9a7f94999;hpb=be624b3de0df348047ac2db05d27dbf16ec56e07;p=lyx.git

diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h
index f42c993361..dd284a8655 100644
--- 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,10 @@ class LengthCombo;
 
 namespace lyx {
 
-namespace support { class FileFilterList; }
 namespace support { class FileName; }
 
+class BufferParams;
+
 namespace frontend {
 
 /// method to get a Length from widgets (LengthCombo)
@@ -45,9 +48,20 @@ Length const & len, Length::UNIT default_unit);
 /// method to set widgets from a string
 void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
 std::string const & len, Length::UNIT default_unit);
-/// method to set widgets from a Length with optional "auto" if zero
-void lengthAutoToWidgets(QLineEdit * input, LengthCombo * combo,
-Length const & len, Length::UNIT defaultUnit);
+/// method to set widgets from a docstring
+void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
+docstring const & len, Length::UNIT default_unit);
+
+/// method to get a double value from a localized widget (QLineEdit)
+double widgetToDouble(QLineEdit const * input);
+/// method to get a double value from a localized widget (QLineEdit)
+std::string widgetToDoubleStr(QLineEdit const * input);
+/// method to set a (localized) double value in a widget (QLineEdit)
+void doubleToWidget(QLineEdit * input, double const & value,
+	char f = 'g', int prec = 6);
+/// method to set a (localized) double value in a widget (QLineEdit)
+void doubleToWidget(QLineEdit * input, std::string const & value,
+	char f = 'g', int prec = 6);
 
 /// colors a widget red if invalid
 void setValid(QWidget * widget, bool valid);
@@ -55,14 +69,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 +77,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 +89,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(),
@@ -108,10 +107,17 @@ void rescanTexStyles();
  */
 QStringList texFileList(QString const & filename);
 
+/// Convert internal line endings to line endings as expected by the OS
+QString const externalLineEnding(docstring const & str);
+
+/// Convert line endings in any formnat to internal line endings
+docstring const internalLineEnding(QString const & str);
+
 // wrapper around the docstring versions
 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 +133,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