diff options
author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-02-07 14:23:50 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 20:04:44 +0100 |
commit | 194d2ca5c3bbf7e5c06a5f8e4fbbbc8e1247f549 (patch) | |
tree | 17d8244de34dbfe51fe44fee18630487face84ea /src/widgets/dialogs | |
parent | 3cb871241a727193b17b1e0f28a5a9ba87f61d36 (diff) | |
download | qtbase-194d2ca5c3bbf7e5c06a5f8e4fbbbc8e1247f549.tar.gz |
Use Q_OS_WINCE instead of Q_WS_WINCE
Window system defines have been deprecated,
so use Q_OS_WINCE instead.
Change-Id: I52059d0f854fe783ac20610ab248800c3e1e827c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 6 | ||||
-rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 6 | ||||
-rw-r--r-- | src/widgets/dialogs/qdialog.h | 4 | ||||
-rw-r--r-- | src/widgets/dialogs/qdialog_p.h | 2 | ||||
-rw-r--r-- | src/widgets/dialogs/qerrormessage.cpp | 10 | ||||
-rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 2 | ||||
-rw-r--r-- | src/widgets/dialogs/qfontdialog.cpp | 4 | ||||
-rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 18 | ||||
-rw-r--r-- | src/widgets/dialogs/qmessagebox.h | 2 | ||||
-rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 4 |
10 files changed, 29 insertions, 29 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index e592f14704..4a91443d00 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -1060,7 +1060,7 @@ QColorShower::QColorShower(QColorDialog *parent) gl->setMargin(gl->spacing()); lab = new QColorShowLabel(this); -#ifndef Q_WS_WINCE +#ifndef Q_OS_WINCE #ifdef QT_SMALL_COLORDIALOG lab->setMinimumHeight(60); #endif @@ -1452,7 +1452,7 @@ void QColorDialogPrivate::init(const QColor &initial) leftLay = 0; -#if defined(Q_WS_WINCE) || defined(QT_SMALL_COLORDIALOG) +#if defined(Q_OS_WINCE) || defined(QT_SMALL_COLORDIALOG) smallDisplay = true; const int lumSpace = 20; #else @@ -1477,7 +1477,7 @@ void QColorDialogPrivate::init(const QColor &initial) leftLay->addWidget(lblBasicColors); leftLay->addWidget(standard); -#if !defined(Q_WS_WINCE) +#if !defined(Q_OS_WINCE) leftLay->addStretch(); #endif diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index f462a362ca..861cbf902c 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -404,8 +404,8 @@ void QDialogPrivate::resetModalitySetByOpen() resetModalityTo = -1; } -#if defined(Q_WS_WINCE) -#ifdef Q_WS_WINCE_WM +#if defined(Q_OS_WINCE) +#ifdef Q_OS_WINCE_WM void QDialogPrivate::_q_doneAction() { //Done... @@ -419,7 +419,7 @@ void QDialogPrivate::_q_doneAction() bool QDialog::event(QEvent *e) { bool result = QWidget::event(e); -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE if (e->type() == QEvent::OkRequest) { accept(); result = true; diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index 40bfbb63ee..7d3052a782 100644 --- a/src/widgets/dialogs/qdialog.h +++ b/src/widgets/dialogs/qdialog.h @@ -102,7 +102,7 @@ public Q_SLOTS: protected: QDialog(QDialogPrivate &, QWidget *parent, Qt::WindowFlags f = 0); -#if defined(Q_WS_WINCE) +#if defined(Q_OS_WINCE) bool event(QEvent *e); #endif void keyPressEvent(QKeyEvent *); @@ -119,7 +119,7 @@ private: Q_DISABLE_COPY(QDialog) Q_PRIVATE_SLOT(d_func(), void _q_platformRunNativeAppModalPanel()) -#ifdef Q_WS_WINCE_WM +#ifdef Q_OS_WINCE_WM Q_PRIVATE_SLOT(d_func(), void _q_doneAction()) #endif }; diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h index ca99600489..c40a885f86 100644 --- a/src/widgets/dialogs/qdialog_p.h +++ b/src/widgets/dialogs/qdialog_p.h @@ -101,7 +101,7 @@ public: void hideDefault(); void resetModalitySetByOpen(); -#ifdef Q_WS_WINCE_WM +#ifdef Q_OS_WINCE_WM void _q_doneAction(); #endif diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp index 4993a6d80f..84021d0988 100644 --- a/src/widgets/dialogs/qerrormessage.cpp +++ b/src/widgets/dialogs/qerrormessage.cpp @@ -61,7 +61,7 @@ #include <stdio.h> #include <stdlib.h> -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE extern bool qt_wince_is_mobile(); //defined in qguifunctions_wince.cpp extern bool qt_wince_is_high_dpi(); //defined in qguifunctions_wince.cpp @@ -107,7 +107,7 @@ public: QSize QErrorMessageTextView::minimumSizeHint() const { -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE if (qt_wince_is_mobile()) if (qt_wince_is_high_dpi()) return QSize(200, 200); @@ -122,7 +122,7 @@ QSize QErrorMessageTextView::minimumSizeHint() const QSize QErrorMessageTextView::sizeHint() const { -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE if (qt_wince_is_mobile()) if (qt_wince_is_high_dpi()) return QSize(400, 200); @@ -132,7 +132,7 @@ QSize QErrorMessageTextView::sizeHint() const return QSize(300, 100); #else return QSize(250, 75); -#endif //Q_WS_WINCE +#endif //Q_OS_WINCE } /*! @@ -255,7 +255,7 @@ QErrorMessage::QErrorMessage(QWidget * parent) #endif -#if defined(Q_WS_WINCE) +#if defined(Q_OS_WINCE) d->ok->setFixedSize(0,0); #endif connect(d->ok, SIGNAL(clicked()), this, SLOT(accept())); diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index db13cfea0f..ecedf8328f 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -2002,7 +2002,7 @@ QString QFileDialog::getExistingDirectory(QWidget *parent, #if defined(Q_WS_WIN) if (QGuiApplicationPrivate::platformIntegration()->usePlatformNativeDialog() && !(args.options & DontUseNativeDialog) && (options & ShowDirsOnly) -#if defined(Q_WS_WINCE) +#if defined(Q_OS_WINCE) && qt_priv_ptr_valid #endif ) { diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index 2402f2a955..7e71cd7cd4 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -316,11 +316,11 @@ void QFontDialogPrivate::init() buttonBox->addButton(QDialogButtonBox::Cancel); QObject::connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject())); -#if defined(Q_WS_WINCE) +#if defined(Q_OS_WINCE) q->resize(180, 120); #else q->resize(500, 360); -#endif // Q_WS_WINCE +#endif // Q_OS_WINCE sizeEdit->installEventFilter(q); familyList->installEventFilter(q); diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 0f57fa67e1..c6ffaa2788 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -189,7 +189,7 @@ public: int layoutMinimumWidth(); void retranslateStrings(); -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE void hideSpecial(); #endif @@ -307,7 +307,7 @@ void QMessageBoxPrivate::updateSize() return; QSize screenSize = QApplication::desktop()->availableGeometry(QCursor::pos()).size(); -#if defined(Q_WS_QWS) || defined(Q_WS_WINCE) +#if defined(Q_WS_QWS) || defined(Q_OS_WINCE) // the width of the screen, less the window border. int hardLimit = screenSize.width() - (q->frameGeometry().width() - q->geometry().width()); #else @@ -322,11 +322,11 @@ void QMessageBoxPrivate::updateSize() int softLimit = qMin(hardLimit, 500); #else // note: ideally on windows, hard and soft limits but it breaks compat -#ifndef Q_WS_WINCE +#ifndef Q_OS_WINCE int softLimit = qMin(screenSize.width()/2, 500); #else int softLimit = qMin(screenSize.width() * 3 / 4, 500); -#endif //Q_WS_WINCE +#endif //Q_OS_WINCE #endif if (informativeLabel) @@ -384,7 +384,7 @@ void QMessageBoxPrivate::updateSize() } -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE /*! \internal Hides special buttons which are rather shown in the title bar @@ -1239,7 +1239,7 @@ bool QMessageBox::event(QEvent *e) case QEvent::LanguageChange: d_func()->retranslateStrings(); break; -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE case QEvent::OkRequest: case QEvent::HelpRequest: { QString bName = @@ -1382,7 +1382,7 @@ void QMessageBox::keyPressEvent(QKeyEvent *e) QDialog::keyPressEvent(e); } -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE /*! \reimp */ @@ -1453,7 +1453,7 @@ void QMessageBox::showEvent(QShowEvent *e) Q_D(QMessageBox); if (d->autoAddOkButton) { addButton(Ok); -#if defined(Q_WS_WINCE) +#if defined(Q_OS_WINCE) d->hideSpecial(); #endif } @@ -1773,7 +1773,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) QPixmap pm(QLatin1String(":/trolltech/qmessagebox/images/qtlogo-64.png")); if (!pm.isNull()) msgBox->setIconPixmap(pm); -#if defined(Q_WS_WINCE) +#if defined(Q_OS_WINCE) msgBox->setDefaultButton(msgBox->addButton(QMessageBox::Ok)); #endif diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index b42681a565..37dfd96514 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -143,7 +143,7 @@ public: QPushButton *addButton(StandardButton button); void removeButton(QAbstractButton *button); -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE void setVisible(bool visible); #endif diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 629b6828b7..324831ea52 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -69,7 +69,7 @@ #include "private/qdialog_p.h" #include <qdebug.h> -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE extern bool qt_wince_is_mobile(); //defined in qguifunctions_wce.cpp #endif @@ -2178,7 +2178,7 @@ QWizard::QWizard(QWidget *parent, Qt::WindowFlags flags) { Q_D(QWizard); d->init(); -#ifdef Q_WS_WINCE +#ifdef Q_OS_WINCE if (!qt_wince_is_mobile()) setWindowFlags(windowFlags() & ~Qt::WindowOkButtonHint); #endif |