r38961 - lyx-devel/trunk/src/frontends/qt4

[vfr]

Author: vfr
Date: Mon Jun  6 01:24:56 2011
New Revision: 38961
URL: http://www.lyx.org/trac/changeset/38961

Log:
Compile fix for qt versions below 4.6.

Modified:
   lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.cpp
   lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.h
   lyx-devel/trunk/src/frontends/qt4/PanelStack.cpp

Modified: lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.cpp Sun Jun  5 20:47:47 
2011        (r38960)
+++ lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.cpp Mon Jun  6 01:24:56 
2011        (r38961)
@@ -26,6 +26,8 @@
 #include <QtGui/QStyle>
 #include <QtGui/QPaintEvent>
 
+#if QT_VERSION >= 0x040600
+
 enum { margin = 6 };
 
 #define ICONBUTTON_HEIGHT 18
@@ -302,4 +304,6 @@
 
 }
 
+#endif // QT_VERSION >= 0x040600
+
 #include "moc_FancyLineEdit.cpp"

Modified: lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.h
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.h   Sun Jun  5 20:47:47 
2011        (r38960)
+++ lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.h   Mon Jun  6 01:24:56 
2011        (r38961)
@@ -62,6 +62,13 @@
 public:
     enum Side {Left = 0, Right = 1};
 
+Q_SIGNALS:
+    void buttonClicked(Side side);
+    void leftButtonClicked();
+    void rightButtonClicked();
+
+#if QT_VERSION >= 0x040600
+public:
     explicit FancyLineEdit(QWidget *parent = 0);
     ~FancyLineEdit();
 
@@ -85,11 +92,6 @@
     void setAutoHideButton(Side side, bool h);
     bool hasAutoHideButton(Side side) const;
 
-Q_SIGNALS:
-       void buttonClicked(Side side);
-    void leftButtonClicked();
-    void rightButtonClicked();
-
 private Q_SLOTS:
     void checkButtons(const QString &);
     void iconClicked();
@@ -103,6 +105,12 @@
 
     FancyLineEditPrivate *m_d;
     QString m_oldText;
+#else
+public:
+       explicit FancyLineEdit(QWidget *parent = 0) 
+               : QLineEdit(parent) 
+       {}
+#endif // QT_VERSION >= 0x040600*/
 };
 
 }

Modified: lyx-devel/trunk/src/frontends/qt4/PanelStack.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/PanelStack.cpp    Sun Jun  5 20:47:47 
2011        (r38960)
+++ lyx-devel/trunk/src/frontends/qt4/PanelStack.cpp    Mon Jun  6 01:24:56 
2011        (r38961)
@@ -75,10 +75,12 @@
        search_->setPlaceholderText(qt_("Search"));
 #endif
 
+#if QT_VERSION >= 0x040600
        search_->setButtonPixmap(FancyLineEdit::Right, getPixmap("images/", 
"editclear", "png"));
        search_->setButtonVisible(FancyLineEdit::Right, true);
        search_->setButtonToolTip(FancyLineEdit::Right, qt_("Clear text"));
        search_->setAutoHideButton(FancyLineEdit::Right, true);
+#endif
        connect(search_, SIGNAL(rightButtonClicked()), this, 
SLOT(resetSearch()));
        connect(search_, SIGNAL(textEdited(QString)), this, 
SLOT(filterChanged(QString)));