diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-15 14:36:02 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-15 12:47:36 +0000 |
| commit | 8793cba8aab832a03ed0f608114d83765a02a8ec (patch) | |
| tree | 639058d38fa38132a498ddadae5218ce30058e7e /src/imports/platform/qquickplatformfontdialog.cpp | |
| parent | 748a9418544e25c2abc6e3eb8862517bea091e7d (diff) | |
Platform dialogs: cleanup creation
Now that we know the type and whether it should be native, it can
be all done in the base class to reduce a lot of code duplication.
Change-Id: I7d7d7057fa499df75b72914d2b505bfa0288048d
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/platform/qquickplatformfontdialog.cpp')
| -rw-r--r-- | src/imports/platform/qquickplatformfontdialog.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/imports/platform/qquickplatformfontdialog.cpp b/src/imports/platform/qquickplatformfontdialog.cpp index ab6e05ec..ae1baa07 100644 --- a/src/imports/platform/qquickplatformfontdialog.cpp +++ b/src/imports/platform/qquickplatformfontdialog.cpp @@ -36,14 +36,6 @@ #include "qquickplatformfontdialog_p.h" -#include <QtCore/qloggingcategory.h> -#include <QtGui/qpa/qplatformtheme.h> -#include <QtGui/private/qguiapplication_p.h> - -#ifdef QT_WIDGETS_LIB -#include "widgets/qwidgetplatformfontdialog_p.h" -#endif - QT_BEGIN_NAMESPACE /*! @@ -95,8 +87,6 @@ QT_BEGIN_NAMESPACE \labs */ -Q_DECLARE_LOGGING_CATEGORY(qtLabsPlatformDialogs) - QQuickPlatformFontDialog::QQuickPlatformFontDialog(QObject *parent) : QQuickPlatformDialog(QPlatformTheme::FontDialog, parent), m_options(QFontDialogOptions::create()) @@ -193,22 +183,12 @@ bool QQuickPlatformFontDialog::useNativeDialog() const return !m_options->testOption(QFontDialogOptions::DontUseNativeDialog); } -QPlatformDialogHelper *QQuickPlatformFontDialog::onCreate() +void QQuickPlatformFontDialog::onCreate(QPlatformDialogHelper *dialog) { - QPlatformDialogHelper *dialog = nullptr; - if (useNativeDialog()) - dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::FontDialog); -#ifdef QT_WIDGETS_LIB - if (!dialog) - dialog = new QWidgetPlatformFontDialog(this); -#endif - qCDebug(qtLabsPlatformDialogs) << "FontDialog:" << dialog; - if (QPlatformFontDialogHelper *fontDialog = qobject_cast<QPlatformFontDialogHelper *>(dialog)) { connect(fontDialog, &QPlatformFontDialogHelper::currentFontChanged, this, &QQuickPlatformFontDialog::currentFontChanged); fontDialog->setOptions(m_options); } - return dialog; } void QQuickPlatformFontDialog::onShow(QPlatformDialogHelper *dialog) |