diff widgets/ListInputDialog.h @ 640:c6d705bf1672

Merge from branch "qt5". This revision actually builds with Qt4 (late releases) or Qt5, though it will warn on configure with Qt4.
author Chris Cannam
date Tue, 14 May 2013 12:36:43 +0100
parents d632a1e87018
children 05d614f6e46d
line wrap: on
line diff
--- a/widgets/ListInputDialog.h	Tue Apr 16 15:17:33 2013 +0100
+++ b/widgets/ListInputDialog.h	Tue May 14 12:36:43 2013 +0100
@@ -37,7 +37,7 @@
 public:
     ListInputDialog(QWidget *parent, const QString &title,
                     const QString &label, const QStringList &list,
-                    int current = 0, Qt::WFlags f = 0);
+                    int current = 0);
     virtual ~ListInputDialog();
 
     void setItemAvailability(int item, bool available);
@@ -47,7 +47,7 @@
     
     static QString getItem(QWidget *parent, const QString &title,
                            const QString &label, const QStringList &list,
-                           int current = 0, bool *ok = 0, Qt::WFlags f = 0);
+                           int current = 0, bool *ok = 0);
 
 protected:
     QStringList m_strings;