Convert deprecated Qt3 QDialog(parent, name, modal, flags) constructo…

…rs to Qt4 QDialog(parent, flags) constructors. Use QgisGui::ModalDialogFlags to specify modal dialogs. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4688 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 15, 2006 · c585f30 · c585f30
1 parent 9cb8c41
commit c585f30
Show file tree

Hide file tree

Showing 82 changed files with 222 additions and 195 deletions.
diff --git a/src/gui/qgisapp.cpp b/src/gui/qgisapp.cpp
@@ -5709,7 +5709,7 @@ void QgisApp::customProjection()
   // Create an instance of the Custom Projection Designer modeless dialog.
   // Autodelete the dialog when closing since a pointer is not retained.
   QgsCustomProjectionDialog * myDialog = new QgsCustomProjectionDialog(this,
-      "Projection Designer", Qt::WDestructiveClose);
+      Qt::WDestructiveClose);
   myDialog->show();
 }
 void QgisApp::showBookmarks()

diff --git a/src/gui/qgisgui.h b/src/gui/qgisgui.h
@@ -25,25 +25,25 @@
 namespace QgisGui
 {
 
-/*!
- * /var ModalDialogFlags
- * /brief Flags used to create a modal dialog (adapted from QMessageBox).
- *
- * Using these flags for all modal dialogs throughout QGIS ensures that
- * for platforms such as the Mac where modal and modeless dialogs have
- * different looks, QGIS modal dialogs will look the same as Qt modal
- * dialogs and all modal dialogs will look distinct from modeless dialogs.
- * Althought not the standard Mac modal look, it does lack the minimize
- * control which makes sense only for modeless dislogs.
- *
- * The Qt3 method of creating a true Mac modal dialog is deprecated in Qt4
- * and should not be used due to conflicts with QMessageBox style dialogs.
- *
- * Qt::WindowMaximizeButtonHint is included but will be ignored if
- * the dialog is a fixed size and does not have a size grip.
- */
-Qt::WFlags ModalDialogFlags =
-    Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMaximizeButtonHint;
+  /*!
+   * /var ModalDialogFlags
+   * /brief Flags used to create a modal dialog (adapted from QMessageBox).
+   *
+   * Using these flags for all modal dialogs throughout QGIS ensures that
+   * for platforms such as the Mac where modal and modeless dialogs have
+   * different looks, QGIS modal dialogs will look the same as Qt modal
+   * dialogs and all modal dialogs will look distinct from modeless dialogs.
+   * Althought not the standard Mac modal look, it does lack the minimize
+   * control which makes sense only for modeless dislogs.
+   *
+   * The Qt3 method of creating a true Mac modal dialog is deprecated in Qt4
+   * and should not be used due to conflicts with QMessageBox style dialogs.
+   *
+   * Qt::WindowMaximizeButtonHint is included but will be ignored if
+   * the dialog is a fixed size and does not have a size grip.
+   */
+  static const Qt::WFlags ModalDialogFlags =
+      Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMaximizeButtonHint;
 
 }
 

diff --git a/src/gui/qgsadvancedattrsearch.cpp b/src/gui/qgsadvancedattrsearch.cpp
@@ -21,8 +21,8 @@
 #include <QMessageBox>
 
 
-QgsAdvancedAttrSearch::QgsAdvancedAttrSearch(QWidget *parent, const char *name)
-    :QDialog(parent)
+QgsAdvancedAttrSearch::QgsAdvancedAttrSearch(QWidget *parent, Qt::WFlags fl)
+    :QDialog(parent, fl)
 {
   setupUi(this);
   connect(btnShowHelp, SIGNAL(clicked()), this, SLOT(showHelp()));

diff --git a/src/gui/qgsadvancedattrsearch.h b/src/gui/qgsadvancedattrsearch.h
@@ -21,15 +21,15 @@
 #define QGSADVANCEDATTRSEARCH_H
 
 #include "ui_qgsadvancedattrsearchbase.h"
-#include <QDialog>
+#include "qgisgui.h"
 
 class QString;
 class QgsAdvancedAttrSearch : public QDialog, private Ui::QgsAdvancedAttrSearchBase
 {
   Q_OBJECT
 
   public:
-    QgsAdvancedAttrSearch(QWidget *parent = 0, const char *name = 0);
+    QgsAdvancedAttrSearch(QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags);
     QString searchString();
 
   public slots:

diff --git a/src/gui/qgsbookmarks.cpp b/src/gui/qgsbookmarks.cpp
@@ -31,14 +31,8 @@
 #include <sqlite3.h>
 #include <fstream>
 
-QgsBookmarks::QgsBookmarks(QWidget *parent, const char *name)
-#ifdef Q_OS_MACX
-  // Mac modeless dialog dosn't have correct window type if parent is specified
-  : QDialog(NULL),
-#else
-  // Specifying parent suppresses separate taskbar entry for dialog
-  : QDialog(parent),
-#endif
+QgsBookmarks::QgsBookmarks(QWidget *parent, Qt::WFlags fl)
+  : QDialog(parent, fl),
   mParent(parent)
 {
   setupUi(this);

diff --git a/src/gui/qgsbookmarks.h b/src/gui/qgsbookmarks.h
@@ -28,7 +28,7 @@ class QgsBookmarks : public QDialog, private Ui::QgsBookmarksBase
 {
   Q_OBJECT
 public:
- QgsBookmarks(QWidget *parent=0, const char *name=0);
+ QgsBookmarks(QWidget *parent = 0, Qt::WFlags fl = 0);
  ~QgsBookmarks();
  static bool createDatabase();
 public slots:

diff --git a/src/gui/qgscustomprojectiondialog.cpp b/src/gui/qgscustomprojectiondialog.cpp
@@ -32,14 +32,8 @@ extern "C"{
 }
 
 
-QgsCustomProjectionDialog::QgsCustomProjectionDialog( QWidget* parent , const char* name , Qt::WFlags fl  )
-#ifdef Q_OS_MACX
-  // Mac modeless dialog dosn't have correct window type if parent is specified
-  : QDialog(NULL, name, false, fl)
-#else
-  // Specifying parent suppresses separate taskbar entry for dialog
-  : QDialog(parent, name, false, fl)
-#endif
+QgsCustomProjectionDialog::QgsCustomProjectionDialog(QWidget *parent, Qt::WFlags fl)
+  : QDialog(parent, fl)
 {
   setupUi(this);
 

diff --git a/src/gui/qgscustomprojectiondialog.h b/src/gui/qgscustomprojectiondialog.h
@@ -24,7 +24,7 @@ class QgsCustomProjectionDialog : public QDialog, private Ui::QgsCustomProjectio
 {
 Q_OBJECT
 public:
-    QgsCustomProjectionDialog(QWidget* parent, const char* name = "", Qt::WFlags fl=0);
+    QgsCustomProjectionDialog(QWidget *parent = 0, Qt::WFlags fl = 0);
     ~QgsCustomProjectionDialog();
     //a recursive function to make a directory and its ancestors
     bool makeDir(QDir &theQDir);

diff --git a/src/gui/qgsdbsourceselect.cpp b/src/gui/qgsdbsourceselect.cpp
@@ -20,7 +20,6 @@ email                : sherman at mrcc.com
 #include "qgsdbsourceselect.h"
 
 #include "qgisapp.h"
-#include "qgisgui.h"
 #include "qgsapplication.h"
 #include "qgscontexthelp.h"
 #include "qgsnewconnection.h"
@@ -33,8 +32,8 @@ email                : sherman at mrcc.com
 #include <cassert>
 #include <iostream>
 
-QgsDbSourceSelect::QgsDbSourceSelect(QgisApp *app)
-: QDialog(app, QgisGui::ModalDialogFlags), qgisApp(app)
+QgsDbSourceSelect::QgsDbSourceSelect(QgisApp *app, Qt::WFlags fl)
+: QDialog(app, fl), qgisApp(app)
 {
   setupUi(this);
   btnAdd->setEnabled(false);

diff --git a/src/gui/qgsdbsourceselect.h b/src/gui/qgsdbsourceselect.h
@@ -18,7 +18,7 @@
 #ifndef QGSDBSOURCESELECT_H
 #define QGSDBSOURCESELECT_H
 #include "ui_qgsdbsourceselectbase.h"
-#include <QDialog>
+#include "qgisgui.h"
 extern "C"
 {
 #include <libpq-fe.h>
@@ -42,7 +42,7 @@ class QgsDbSourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase
  public:
 
     //! Constructor
-    QgsDbSourceSelect(QgisApp *app);
+    QgsDbSourceSelect(QgisApp *app, Qt::WFlags fl = QgisGui::ModalDialogFlags);
     //! Destructor
     ~QgsDbSourceSelect();
     //! Opens the create connection dialog to build a new connection

diff --git a/src/gui/qgshelpviewer.cpp b/src/gui/qgshelpviewer.cpp
@@ -26,11 +26,10 @@
 #include <qtooltip.h>
 #include <q3whatsthis.h>
 #include "qgshelpviewer.h"
-QgsHelpViewer::QgsHelpViewer(QWidget * parent, const char *name, bool modal, Qt::WFlags fl):
-  //tim removed parameters during qt4 ui port - FIXME !!!
-  QgsHelpViewerBase()
+QgsHelpViewer::QgsHelpViewer(QWidget * parent, Qt::WFlags fl)
+: QDialog(parent, fl)
 {
-
+  setupUi(this);
 }
 
 /*

diff --git a/src/gui/qgshelpviewer.h b/src/gui/qgshelpviewer.h
@@ -40,7 +40,7 @@ class QgsHelpViewer : public QDialog, private Ui::QgsHelpViewerBase
     Q_OBJECT
 
 public:
-    QgsHelpViewer( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
+    QgsHelpViewer( QWidget* parent = 0, Qt::WFlags fl = 0 );
     ~QgsHelpViewer();
     void showContent(QString path, QString doc);
 

diff --git a/src/gui/qgslayerprojectionselector.cpp b/src/gui/qgslayerprojectionselector.cpp
@@ -23,9 +23,8 @@
  * \class QgsLayerProjectionSelector - Set user layerprojectionselector and preferences
  * Constructor
  */
-QgsLayerProjectionSelector::QgsLayerProjectionSelector(QWidget *parent, 
-    const char * name, bool modal) 
-  : QDialog(parent, name, modal)
+QgsLayerProjectionSelector::QgsLayerProjectionSelector(QWidget *parent, Qt::WFlags fl)
+  : QDialog(parent, fl)
 {
   setupUi(this);
   connect(pbnOK, SIGNAL(clicked()), this, SLOT( accept()));

diff --git a/src/gui/qgslayerprojectionselector.h b/src/gui/qgslayerprojectionselector.h
@@ -19,18 +19,19 @@
 #ifndef QGSLAYERPROJECTIONSELECTOR_H
 #define QGSLAYERPROJECTIONSELECTOR_H
 #include "ui_qgslayerprojectionselectorbase.h"
+#include "qgisgui.h"
 /**
  * \class QgsLayerProjectionSelector
  * \brief Set Projection system for a layer
  */
-class QgsLayerProjectionSelector :public QDialog, private Ui::QgsLayerProjectionSelectorBase
+class QgsLayerProjectionSelector : public QDialog, private Ui::QgsLayerProjectionSelectorBase
 {
   Q_OBJECT;
   public:
     /**
      * Constructor
      */
-    QgsLayerProjectionSelector(QWidget *parent=0, const char *name=0, bool modal=true);
+    QgsLayerProjectionSelector(QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags);
     //! Destructor
     ~QgsLayerProjectionSelector();
 

diff --git a/src/gui/qgslinestyledialog.cpp b/src/gui/qgslinestyledialog.cpp
@@ -21,10 +21,11 @@
 #include <iostream>
 #include "qgssymbologyutils.h"
 
-QgsLineStyleDialog::QgsLineStyleDialog(QWidget * parent, const char *name, bool modal, Qt::WFlags fl):
-  //params disabled during qt4 gui port - Fixme!!
-  QgsLineStyleDialogBase()
+QgsLineStyleDialog::QgsLineStyleDialog(QWidget * parent, Qt::WFlags fl):
+  QDialog(parent, fl)
 {
+  setupUi(this);
+
   //load the icons stored in QgsSymbologyUtils.cpp (to avoid redundancy)
   solid->setPixmap(QgsSymbologyUtils::char2LinePixmap("SolidLine"));
   dash->setPixmap(QgsSymbologyUtils::char2LinePixmap("DashLine"));

diff --git a/src/gui/qgslinestyledialog.h b/src/gui/qgslinestyledialog.h
@@ -21,13 +21,13 @@
 
 class qnamespace;
 #include "ui_qgslinestyledialogbase.h"
-#include <QDialog>
+#include "qgisgui.h"
 /**Dialog class to query line styles*/
 class QgsLineStyleDialog: public QDialog, private Ui::QgsLineStyleDialogBase
 {
   Q_OBJECT
  public:
-    QgsLineStyleDialog(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = Qt::WStyle_StaysOnTop);
+    QgsLineStyleDialog(QWidget * parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags);
     ~QgsLineStyleDialog();
     Qt::PenStyle style();
  protected:

diff --git a/src/gui/qgsludialog.cpp b/src/gui/qgsludialog.cpp
@@ -19,8 +19,8 @@
 #include "qgsludialog.h"
 
 
-QgsLUDialog::QgsLUDialog(QWidget *parent, const char *name, bool modal)
-: QDialog(parent, name, modal)
+QgsLUDialog::QgsLUDialog(QWidget *parent, Qt::WFlags fl)
+: QDialog(parent, fl)
 {
     setupUi(this);
     connect(mOkButton, SIGNAL(clicked()), this, SLOT(accept()));

diff --git a/src/gui/qgsludialog.h b/src/gui/qgsludialog.h
@@ -20,13 +20,14 @@
 #define QGSLUDIALOG_H
 
 #include "ui_qgsludialogbase.h"
+#include "qgisgui.h"
 
 
 class QgsLUDialog: public QDialog, private Ui::QgsLUDialogBase
 {
     Q_OBJECT
  public:
-    QgsLUDialog(QWidget *parent=0, const char *name=0, bool modal=true);
+    QgsLUDialog(QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags);
     ~QgsLUDialog();
     QString lowerValue() const;
     void setLowerValue(QString val);

diff --git a/src/gui/qgsmapserverexport.cpp b/src/gui/qgsmapserverexport.cpp
@@ -32,8 +32,8 @@ email                : sherman at mrcc.com
 #include <fstream>
 
 // constructor
-QgsMapserverExport::QgsMapserverExport(QgsMapCanvas * _map, QWidget * parent, const char *name, bool modal, Qt::WFlags fl)
-  :QDialog(parent, name, modal, fl), map(_map)
+QgsMapserverExport::QgsMapserverExport(QgsMapCanvas * _map, QWidget * parent, Qt::WFlags fl)
+  : QDialog(parent, fl), map(_map)
 {
   setupUi(this);
   connect(buttonOk, SIGNAL(clicked()), this, SLOT(accept()));

diff --git a/src/gui/qgsmapserverexport.h b/src/gui/qgsmapserverexport.h
@@ -20,7 +20,7 @@
 #ifndef QGSMAPSERVEREXPORT_H
 #define QGSMAPSERVEREXPORT_H
 #include "ui_qgsmapserverexportbase.h"
-#include <QDialog>
+#include "qgisgui.h"
 class QgsMapCanvas;
 
 /*! \class QgsMapServerExport
@@ -31,7 +31,7 @@ class QgsMapserverExport:public QDialog, private Ui::QgsMapserverExportBase
 Q_OBJECT
 public:
   QgsMapserverExport(QgsMapCanvas *map=0, QWidget* parent = 0, 
-	const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
+	Qt::WFlags fl = QgisGui::ModalDialogFlags);
   ~QgsMapserverExport();
   //! Read the file and create the map
   bool read();

diff --git a/src/gui/qgsmessageviewer.cpp b/src/gui/qgsmessageviewer.cpp
@@ -19,8 +19,8 @@
 #include "qgsmessageviewer.h"
 
 
-QgsMessageViewer::QgsMessageViewer(QWidget *parent, const char *name, bool modal, Qt::WFlags f)
-: QDialog(parent, name, modal, f)
+QgsMessageViewer::QgsMessageViewer(QWidget *parent, Qt::WFlags fl)
+: QDialog(parent, fl)
 {
   setupUi(this);
 }

diff --git a/src/gui/qgsmessageviewer.h b/src/gui/qgsmessageviewer.h
@@ -19,12 +19,12 @@
 #define QGSMESSAGEVIEWER_H
 
 #include "ui_qgsmessageviewer.h"
-#include <QDialog>
+#include "qgisgui.h"
 
 class QgsMessageViewer: public QDialog, private Ui::QgsMessageViewer
 {
   public:
-    QgsMessageViewer(QWidget *parent, const char *name = 0, bool modal = false, Qt::WFlags f = 0);
+    QgsMessageViewer(QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags);
     ~QgsMessageViewer();
     void setTextFormat(Qt::TextFormat f);
     void setMessage(const QString& msg);

diff --git a/src/gui/qgsnewconnection.cpp b/src/gui/qgsnewconnection.cpp
@@ -26,8 +26,8 @@ extern "C"
 {
 #include <libpq-fe.h>
 }
-QgsNewConnection::QgsNewConnection(QWidget *parent, const QString& connName, bool modal)
-: QgsNewConnectionBase()
+QgsNewConnection::QgsNewConnection(QWidget *parent, const QString& connName, Qt::WFlags fl)
+: QDialog(parent, fl)
 {
   setupUi(this);
   if (!connName.isEmpty())

diff --git a/src/gui/qgsnewconnection.h b/src/gui/qgsnewconnection.h
@@ -18,7 +18,7 @@
 #ifndef QGSNEWCONNECTION_H
 #define QGSNEWCONNECTION_H
 #include "ui_qgsnewconnectionbase.h"
-#include <QDialog>
+#include "qgisgui.h"
 /*! \class QgsNewConnection
  * \brief Dialog to allow the user to configure and save connection
  * information for a PostgresQl database
@@ -28,7 +28,7 @@ class QgsNewConnection : public QDialog, private Ui::QgsNewConnectionBase
   Q_OBJECT
   public:
     //! Constructor
-    QgsNewConnection(QWidget *parent = 0, const QString& connName = QString::null, bool modal = true);
+    QgsNewConnection(QWidget *parent = 0, const QString& connName = QString::null, Qt::WFlags fl = QgisGui::ModalDialogFlags);
     //! Destructor
     ~QgsNewConnection();
     //! Tests the connection using the parameters supplied

diff --git a/src/gui/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp
@@ -18,8 +18,8 @@
 #include "qgsnewhttpconnection.h"
 #include <QSettings>
 
-QgsNewHttpConnection::QgsNewHttpConnection(QString connName)
-                    : QDialog()
+QgsNewHttpConnection::QgsNewHttpConnection(QWidget *parent, const QString& connName, Qt::WFlags fl)
+                    : QDialog(parent, fl)
 {
   setupUi(this);
   connect(btnHelp, SIGNAL(clicked()), this, SLOT(helpInfo()));