diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-27 14:48:51 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 03:18:16 +0200 |
commit | a85d343a39577cdf953d0759e356c59a77ae743f (patch) | |
tree | fdbd9229902d5efc0ca637dc79d6aa7cc5645635 /src/widgets/dialogs/qmessagebox.cpp | |
parent | 3b6bb13e6a197bb4ba85b397ae9d2b8c659d6b26 (diff) |
Widgets: Remove QT3_SUPPPORT.
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ie884f0cc9b3970b01c3c0c26600b1bcd92548077
Reviewed-on: http://codereview.qt-project.org/5629
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/dialogs/qmessagebox.cpp')
-rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 98 |
1 files changed, 0 insertions, 98 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 26180ab38b..63c4f88ce5 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -2561,104 +2561,6 @@ void QMessageBox::setWindowModality(Qt::WindowModality windowModality) setDefaultButton(d_func()->defaultButton); } -#ifdef QT3_SUPPORT -/*! - \compat - - Constructs a message box with the given \a parent, \a name, and - window flags, \a f. - The window title is specified by \a title, and the message box - displays message text and an icon specified by \a text and \a icon. - - The buttons that the user can access to respond to the message are - defined by \a button0, \a button1, and \a button2. -*/ -QMessageBox::QMessageBox(const QString& title, - const QString &text, Icon icon, - int button0, int button1, int button2, - QWidget *parent, const char *name, - bool modal, Qt::WindowFlags f) - : QDialog(*new QMessageBoxPrivate, parent, - f | Qt::WStyle_Customize | Qt::WStyle_DialogBorder | Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WindowCloseButtonHint) -{ - Q_D(QMessageBox); - setObjectName(QString::fromAscii(name)); - d->init(title, text); - d->addOldButtons(button0, button1, button2); - setModal(modal); - setIcon(icon); -} - -/*! - \compat - Constructs a message box with the given \a parent and \a name. -*/ -QMessageBox::QMessageBox(QWidget *parent, const char *name) - : QDialog(*new QMessageBoxPrivate, parent, - Qt::WStyle_Customize | Qt::WStyle_DialogBorder | Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WindowCloseButtonHint) -{ - Q_D(QMessageBox); - setObjectName(QString::fromAscii(name)); - d->init(); -} - -/*! - Returns the pixmap used for a standard icon. This - allows the pixmaps to be used in more complex message boxes. - \a icon specifies the required icon, e.g. QMessageBox::Information, - QMessageBox::Warning or QMessageBox::Critical. - - \a style is unused. -*/ - -QPixmap QMessageBox::standardIcon(Icon icon, Qt::GUIStyle style) -{ - Q_UNUSED(style); - return QMessageBox::standardIcon(icon); -} - -/*! - \fn int QMessageBox::message(const QString &title, const QString &text, - const QString &buttonText, QWidget *parent = 0, - const char *name = 0) - - Opens a modal message box with the given \a title and showing the - given \a text. The message box has a single button which has the - given \a buttonText (or tr("OK")). The message box is centred over - its \a parent and is called \a name. - - Use information(), warning(), question(), or critical() instead. - - \oldcode - QMessageBox::message(tr("My App"), tr("All occurrences replaced."), - tr("Close"), this); - \newcode - QMessageBox::information(this, tr("My App"), - tr("All occurrences replaced."), - QMessageBox::Close); - \endcode -*/ - -/*! - \fn bool QMessageBox::query(const QString &caption, - const QString& text, - const QString& yesButtonText, - const QString& noButtonText, - QWidget *parent, const char *name) - - \obsolete - - Queries the user using a modal message box with up to two buttons. - The message box has the given \a caption (although some window - managers don't show it), and shows the given \a text. The left - button has the \a yesButtonText (or tr("OK")), and the right button - has the \a noButtonText (or isn't shown). The message box is centred - over its \a parent and is called \a name. - - Use information(), question(), warning(), or critical() instead. -*/ - -#endif QPixmap QMessageBoxPrivate::standardIcon(QMessageBox::Icon icon, QMessageBox *mb) { |