Skip to content

Commit c585f30

Browse files
author
telwertowski
committedJan 15, 2006
Convert deprecated Qt3 QDialog(parent, name, modal, flags) constructors 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
·
final-1_7_1Preview-0.9.0-1
1 parent 9cb8c41 commit c585f30

File tree

82 files changed

+222
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+222
-195
lines changed
 

‎src/gui/qgisapp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5709,7 +5709,7 @@ void QgisApp::customProjection()
57095709
// Create an instance of the Custom Projection Designer modeless dialog.
57105710
// Autodelete the dialog when closing since a pointer is not retained.
57115711
QgsCustomProjectionDialog * myDialog = new QgsCustomProjectionDialog(this,
5712-
"Projection Designer", Qt::WDestructiveClose);
5712+
Qt::WDestructiveClose);
57135713
myDialog->show();
57145714
}
57155715
void QgisApp::showBookmarks()

‎src/gui/qgisgui.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@
2525
namespace QgisGui
2626
{
2727

28-
/*!
29-
* /var ModalDialogFlags
30-
* /brief Flags used to create a modal dialog (adapted from QMessageBox).
31-
*
32-
* Using these flags for all modal dialogs throughout QGIS ensures that
33-
* for platforms such as the Mac where modal and modeless dialogs have
34-
* different looks, QGIS modal dialogs will look the same as Qt modal
35-
* dialogs and all modal dialogs will look distinct from modeless dialogs.
36-
* Althought not the standard Mac modal look, it does lack the minimize
37-
* control which makes sense only for modeless dislogs.
38-
*
39-
* The Qt3 method of creating a true Mac modal dialog is deprecated in Qt4
40-
* and should not be used due to conflicts with QMessageBox style dialogs.
41-
*
42-
* Qt::WindowMaximizeButtonHint is included but will be ignored if
43-
* the dialog is a fixed size and does not have a size grip.
44-
*/
45-
Qt::WFlags ModalDialogFlags =
46-
Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMaximizeButtonHint;
28+
/*!
29+
* /var ModalDialogFlags
30+
* /brief Flags used to create a modal dialog (adapted from QMessageBox).
31+
*
32+
* Using these flags for all modal dialogs throughout QGIS ensures that
33+
* for platforms such as the Mac where modal and modeless dialogs have
34+
* different looks, QGIS modal dialogs will look the same as Qt modal
35+
* dialogs and all modal dialogs will look distinct from modeless dialogs.
36+
* Althought not the standard Mac modal look, it does lack the minimize
37+
* control which makes sense only for modeless dislogs.
38+
*
39+
* The Qt3 method of creating a true Mac modal dialog is deprecated in Qt4
40+
* and should not be used due to conflicts with QMessageBox style dialogs.
41+
*
42+
* Qt::WindowMaximizeButtonHint is included but will be ignored if
43+
* the dialog is a fixed size and does not have a size grip.
44+
*/
45+
static const Qt::WFlags ModalDialogFlags =
46+
Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMaximizeButtonHint;
4747

4848
}
4949

0 commit comments

Comments
 (0)
Please sign in to comment.