From a85d343a39577cdf953d0759e356c59a77ae743f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 27 Sep 2011 14:48:51 +0200 Subject: Widgets: Remove QT3_SUPPPORT. Reviewed-by: Lars Knoll Change-Id: Ie884f0cc9b3970b01c3c0c26600b1bcd92548077 Reviewed-on: http://codereview.qt-project.org/5629 Reviewed-by: Friedemann Kleint Reviewed-by: Qt Sanity Bot Reviewed-by: Lars Knoll --- src/widgets/dialogs/qcolordialog.h | 6 --- src/widgets/dialogs/qdialog.cpp | 15 ------ src/widgets/dialogs/qdialog.h | 4 -- src/widgets/dialogs/qerrormessage.h | 3 -- src/widgets/dialogs/qfiledialog.cpp | 86 -------------------------------- src/widgets/dialogs/qfiledialog.h | 51 ------------------- src/widgets/dialogs/qfontdialog.h | 6 --- src/widgets/dialogs/qinputdialog.h | 21 -------- src/widgets/dialogs/qmessagebox.cpp | 98 ------------------------------------- src/widgets/dialogs/qmessagebox.h | 25 ---------- 10 files changed, 315 deletions(-) (limited to 'src/widgets/dialogs') diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index 2eb4658634..86b0b5e96a 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -109,12 +109,6 @@ public: static void setCustomColor(int index, QRgb color); static void setStandardColor(int index, QRgb color); -#ifdef QT3_SUPPORT - static QColor getColor(const QColor &init, QWidget *parent, const char *name) - { Q_UNUSED(name); return getColor(init, parent); } - static QRgb getRgba(QRgb rgba, bool *ok, QWidget *parent, const char *name) - { Q_UNUSED(name); return getRgba(rgba, ok, parent); } -#endif Q_SIGNALS: void currentColorChanged(const QColor &color); diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 2fb6c67e50..41b34a1065 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -274,21 +274,6 @@ QDialog::QDialog(QWidget *parent, Qt::WindowFlags f) #endif } -#ifdef QT3_SUPPORT -/*! - \overload - \obsolete -*/ -QDialog::QDialog(QWidget *parent, const char *name, bool modal, Qt::WindowFlags f) - : QWidget(*new QDialogPrivate, parent, - f - | QFlag(modal ? Qt::WShowModal : Qt::WindowType(0)) - | QFlag((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : Qt::WindowType(0)) - ) -{ - setObjectName(QString::fromAscii(name)); -} -#endif /*! \overload diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index ce8aa91bc7..6ab7c12ead 100644 --- a/src/widgets/dialogs/qdialog.h +++ b/src/widgets/dialogs/qdialog.h @@ -63,10 +63,6 @@ class Q_WIDGETS_EXPORT QDialog : public QWidget public: explicit QDialog(QWidget *parent = 0, Qt::WindowFlags f = 0); -#ifdef QT3_SUPPORT - QT3_SUPPORT_CONSTRUCTOR QDialog(QWidget *parent, const char *name, bool modal = false, - Qt::WindowFlags f = 0); -#endif ~QDialog(); enum DialogCode { Rejected, Accepted }; diff --git a/src/widgets/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h index a8805a2372..3736526f93 100644 --- a/src/widgets/dialogs/qerrormessage.h +++ b/src/widgets/dialogs/qerrormessage.h @@ -67,9 +67,6 @@ public: public Q_SLOTS: void showMessage(const QString &message); void showMessage(const QString &message, const QString &type); -#ifdef QT3_SUPPORT - inline QT_MOC_COMPAT void message(const QString &text) { showMessage(text); } -#endif protected: void done(int); diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 9d6e348b0d..3c2e134c9b 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -3461,92 +3461,6 @@ QStringList QFSCompleter::splitPath(const QString &path) const #endif // QT_NO_COMPLETER -#ifdef QT3_SUPPORT -/*! - Use selectedFiles() instead. - - \oldcode - QString selected = dialog->selectedFile(); - \newcode - QStringList files = dialog->selectedFiles(); - QString selected; - if (!files.isEmpty()) - selected = files[0]; - \endcode -*/ -QString QFileDialog::selectedFile() const -{ - QStringList files = selectedFiles(); - return files.size() ? files.at(0) : QString(); -} - -/*! - \typedef QFileDialog::Mode - - Use QFileDialog::FileMode instead. -*/ - -/*! - \fn void QFileDialog::setMode(FileMode m) - - Use setFileMode() instead. -*/ - -/*! - \fn FileMode QFileDialog::mode() const - - Use fileMode() instead. -*/ - -/*! - \fn void QFileDialog::setDir(const QString &directory) - - Use setDirectory() instead. -*/ - -/*! - \fn void QFileDialog::setDir( const QDir &directory ) - - Use setDirectory() instead. -*/ - -/*! - \fn QStringList QFileDialog::getOpenFileNames(const QString &filter, - const QString &dir, QWidget *parent, const char* name, - const QString &caption, QString *selectedFilter, bool resolveSymlinks) - - Use the getOpenFileNames() overload that takes \a parent as the first - argument instead. -*/ - -/*! - \fn QString QFileDialog::getOpenFileName(const QString &dir, - const QString &filter, QWidget *parent = 0, const char *name, - const QString &caption, QString *selectedFilter, bool resolveSymlinks) - - Use the getOpenFileName() overload that takes \a parent as the first - argument instead. -*/ - -/*! - \fn QString QFileDialog::getSaveFileName(const QString &dir, - const QString &filter, QWidget *parent, const char *name, - const QString &caption, QString *selectedFilter, bool resolveSymlinks) - - Use the getSaveFileName() overload that takes \a parent as the first - argument instead. -*/ - -/*! - \fn QString QFileDialog::getExistingDirectory(const QString &dir, - QWidget *parent, const char *name, const QString &caption, - bool dirOnly, bool resolveSymlinks) - - Use the getExistingDirectory() overload that takes \a parent as - the first argument instead. -*/ - -#endif // QT3_SUPPORT QT_END_NAMESPACE diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index 1fd7c25255..e27b655ba1 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -198,14 +198,6 @@ Q_SIGNALS: void filterSelected(const QString &filter); public: -#ifdef QT3_SUPPORT - typedef FileMode Mode; - inline QT3_SUPPORT void setMode(FileMode m) { setFileMode(m); } - inline QT3_SUPPORT FileMode mode() const { return fileMode(); } - inline QT3_SUPPORT void setDir(const QString &directory) { setDirectory(directory); } - inline QT3_SUPPORT void setDir( const QDir &directory ) { setDirectory(directory); } - QT3_SUPPORT QString selectedFile() const; -#endif static QString getOpenFileName(QWidget *parent = 0, const QString &caption = QString(), @@ -233,49 +225,6 @@ public: QString *selectedFilter = 0, Options options = 0); -#ifdef QT3_SUPPORT - inline static QString QT3_SUPPORT getOpenFileName(const QString &dir, - const QString &filter = QString(), - QWidget *parent = 0, const char* name = 0, - const QString &caption = QString(), - QString *selectedFilter = 0, - bool resolveSymlinks = true) - { Q_UNUSED(name); - return getOpenFileName(parent, caption, dir, filter, selectedFilter, - resolveSymlinks ? Option(0) : DontResolveSymlinks); } - - inline static QString QT3_SUPPORT getSaveFileName(const QString &dir, - const QString &filter = QString(), - QWidget *parent = 0, const char* name = 0, - const QString &caption = QString(), - QString *selectedFilter = 0, - bool resolveSymlinks = true) - { Q_UNUSED(name); - return getSaveFileName(parent, caption, dir, filter, selectedFilter, - resolveSymlinks ? Option(0) : DontResolveSymlinks); } - - inline static QString QT3_SUPPORT getExistingDirectory(const QString &dir, - QWidget *parent = 0, - const char* name = 0, - const QString &caption = QString(), - bool dirOnly = true, - bool resolveSymlinks = true) - { Q_UNUSED(name); - return getExistingDirectory(parent, caption, dir, - Options((resolveSymlinks ? Option(0) : DontResolveSymlinks) - | (dirOnly ? ShowDirsOnly : Option(0)))); } - - inline static QStringList QT3_SUPPORT getOpenFileNames(const QString &filter, - const QString &dir = QString(), - QWidget *parent = 0, - const char* name = 0, - const QString &caption = QString(), - QString *selectedFilter = 0, - bool resolveSymlinks = true) - { Q_UNUSED(name); - return getOpenFileNames(parent, caption, dir, filter, selectedFilter, - resolveSymlinks ? Option(0) : DontResolveSymlinks); } -#endif // QT3_SUPPORT protected: QFileDialog(const QFileDialogArgs &args); diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index 03ef2b7e81..469a5680e1 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -104,12 +104,6 @@ public: static QFont getFont(bool *ok, const QFont &initial, QWidget *parent = 0); static QFont getFont(bool *ok, QWidget *parent = 0); -#ifdef QT3_SUPPORT - static QFont getFont(bool *ok, const QFont &initial, QWidget *parent, const char *name) - { Q_UNUSED(name); return getFont(ok, initial, parent); } - static QFont getFont(bool *ok, QWidget *parent, const char *name) - { Q_UNUSED(name); return getFont(ok, parent); } -#endif Q_SIGNALS: void currentFontChanged(const QFont &font); diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index 51411c7ae1..93abdaec22 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -204,27 +204,6 @@ public: int minValue = -2147483647, int maxValue = 2147483647, int step = 1, bool *ok = 0, Qt::WindowFlags flags = 0); -#ifdef QT3_SUPPORT - inline static QT3_SUPPORT QString getText(const QString &title, const QString &label, - QLineEdit::EchoMode echo = QLineEdit::Normal, - const QString &text = QString(), bool *ok = 0, - QWidget *parent = 0, const char * = 0, Qt::WindowFlags flags = 0) - { return getText(parent, title, label, echo, text, ok, flags); } - inline static QT3_SUPPORT int getInteger(const QString &title, const QString &label, int value = 0, - int minValue = -2147483647, int maxValue = 2147483647, - int step = 1, bool *ok = 0, - QWidget *parent = 0, const char * = 0, Qt::WindowFlags flags = 0) - { return getInteger(parent, title, label, value, minValue, maxValue, step, ok, flags); } - inline static QT3_SUPPORT double getDouble(const QString &title, const QString &label, double value = 0, - double minValue = -2147483647, double maxValue = 2147483647, - int decimals = 1, bool *ok = 0, - QWidget *parent = 0, const char * = 0, Qt::WindowFlags flags = 0) - { return getDouble(parent, title, label, value, minValue, maxValue, decimals, ok, flags); } - inline static QT3_SUPPORT QString getItem(const QString &title, const QString &label, const QStringList &list, - int current = 0, bool editable = true, bool *ok = 0, - QWidget *parent = 0, const char * = 0, Qt::WindowFlags flags = 0) - { return getItem(parent, title, label, list, current, editable, ok, flags); } -#endif Q_SIGNALS: // ### emit signals! 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) { diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index b2c99d3881..ebfd28a1aa 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -288,31 +288,6 @@ public: void setWindowTitle(const QString &title); void setWindowModality(Qt::WindowModality windowModality); -#ifdef QT3_SUPPORT - QT3_SUPPORT_CONSTRUCTOR 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 = Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint); - QT3_SUPPORT_CONSTRUCTOR QMessageBox(QWidget *parent, const char *name); - - static QT3_SUPPORT QPixmap standardIcon(Icon icon, Qt::GUIStyle); - static QT3_SUPPORT int message(const QString &title, - const QString& text, - const QString& buttonText=QString(), - QWidget *parent = 0, const char * = 0) { - return QMessageBox::information(parent, title, text, - buttonText.isEmpty() ? tr("OK") : buttonText) == 0; - } - static QT3_SUPPORT bool query(const QString &title, - const QString& text, - const QString& yesButtonText = QString(), - const QString& noButtonText = QString(), - QWidget *parent = 0, const char * = 0) { - return QMessageBox::information(parent, title, text, - yesButtonText.isEmpty() ? tr("OK") : yesButtonText, - noButtonText) == 0; - } -#endif static QPixmap standardIcon(Icon icon); -- cgit v1.2.3