On Mac, moving down a paragraph should place the cursor at the end of the current...

[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 44e6b0e07b8ee38cff3610170db68decd31c796b..0f7fd63137ece5ec6a3d6082230f9bfe524183ff 100644 (file)
--- a/src/frontends/qt4/qt_helpers.h
+++ b/src/frontends/qt4/qt_helpers.h
@@ -17,7 +17,7 @@
 #include "support/qstring_helpers.h"
 #include "qt_i18n.h"
 
-#include <QString>
+#include <QHeaderView>
 
 class QComboBox;
 class QLineEdit;
@@ -31,7 +31,7 @@ namespace lyx {
 namespace support { class FileName; }
 
 class BufferParams;
-
+ 
 namespace frontend {
 
 class LengthCombo;
@@ -41,13 +41,17 @@ std::string widgetsToLength(QLineEdit const * input, LengthCombo const * combo);
 /// method to get a Length from widgets (QComboBox)
 Length widgetsToLength(QLineEdit const * input, QComboBox const * combo);
 
-//FIXME It would be nice if defaultUnit were a default argument
 /// method to set widgets from a Length
+//FIXME Remove default_unit argument for the first form. FIXME Change
+// all the code to remove default_unit argument when equal to the
+// default.
 void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
-Length const & len, Length::UNIT default_unit);
+                    Length const & len, 
+                    Length::UNIT default_unit = Length::defaultUnit());
 /// method to set widgets from a string
 void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
-std::string const & len, Length::UNIT default_unit);
+                    std::string const & len, 
+                    Length::UNIT default_unit = Length::defaultUnit());
 /// method to set widgets from a docstring
 void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
 docstring const & len, Length::UNIT default_unit);
@@ -66,6 +70,13 @@ void doubleToWidget(QLineEdit * input, std::string const & value,
 /// colors a widget red if invalid
 void setValid(QWidget * widget, bool valid);
 
+/// Qt5 changed setSectionMode to setSectionResizeMode
+/// These wrappers work for Qt4 and Qt5
+void setSectionResizeMode(QHeaderView * view,
+    int logicalIndex, QHeaderView::ResizeMode mode);
+void setSectionResizeMode(QHeaderView * view,
+       QHeaderView::ResizeMode mode);
+
 } // namespace frontend
 
 
@@ -75,6 +86,8 @@ void setValid(QWidget * widget, bool valid);
  * Use this in qt4/ instead of _()
  */
 QString const qt_(std::string const & str);
+QString const qt_(QString const & qstr);
+
 
 ///
 support::FileName libFileSearch(QString const & dir, QString const & name,