diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-08 15:08:48 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-09 10:41:09 +0100 |
| commit | 260416393e83fe91bcd81546649877b810418a4e (patch) | |
| tree | ba5288408af785157327099766c9658a9eb4333c /src/widgets/dialogs/qcolordialog.cpp | |
| parent | ca26fefc0624264262a2abe630568271cefa2753 (diff) | |
Widgets: Remove dialog functionality from QGuiPlatformPlugin.
(as QGuiPlatformPlugin is deprecated)
Clean up qdialog.cpp.
Acked-by: Morten Johan Sorvig <morten.sorvig@nokia.com>
Change-Id: Id49d6cfe235d5afb4c89b0697c6b3980130a5299
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets/dialogs/qcolordialog.cpp')
| -rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index 73302be5e3..6b956b1277 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -63,13 +63,8 @@ #include "qmimedata.h" #include "qspinbox.h" #include "qdialogbuttonbox.h" -#include "private/qguiplatformplugin_p.h" -#ifdef Q_WS_S60 -#include "private/qt_s60_p.h" -#endif - -#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) +#ifdef MAEMO_UI # define QT_SMALL_COLORDIALOG #endif @@ -1762,8 +1757,9 @@ void QColorDialog::setCurrentColor(const QColor &color) d->setCurrentQColor(color); d->setCocoaPanelColor(color); #endif - if (d->nativeDialogInUse) - qt_guiPlatformPlugin()->colorDialogSetCurrentColor(this, color); + // ### fixme: Call helper + // if (d->nativeDialogInUse) + // qt_guiPlatformPlugin()->colorDialogSetCurrentColor(this, color); } QColor QColorDialog::currentColor() const @@ -2050,8 +2046,8 @@ QRgb QColorDialog::getRgba(QRgb initial, bool *ok, QWidget *parent) QColorDialog::~QColorDialog() { - Q_D(QColorDialog); #if defined(Q_WS_MAC) + Q_D(QColorDialog); if (d->delegate) { d->releaseCocoaColorPanelDelegate(); QColorDialogPrivate::sharedColorPanelAvailable = true; @@ -2065,12 +2061,8 @@ QColorDialog::~QColorDialog() settings.setValue(QLatin1String("Qt/customColors/") + QString::number(i), cusrgb[i]); } #endif - if (d->nativeDialogInUse) - qt_guiPlatformPlugin()->colorDialogDelete(this); - } - /*! \reimp */ |