Platform dialogs: revise the names of the protected helper methods

Change-Id: I4b65c7623a34d016243e626146437d2fa20fd93b
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

12 files changed, 31 insertions, 31 deletions

diff --git a/src/imports/platform/qquickplatformcolordialog.cpp b/src/imports/platform/qquickplatformcolordialog.cpp
index ccd7d518..7d14231e 100644
--- a/src/imports/platform/qquickplatformcolordialog.cpp
+++ b/src/imports/platform/qquickplatformcolordialog.cpp
@@ -184,7 +184,7 @@ void QQuickPlatformColorDialog::setOptions(QColorDialogOptions::ColorDialogOptio
     emit optionsChanged();
 }
 
-QPlatformDialogHelper *QQuickPlatformColorDialog::createHelper()
+QPlatformDialogHelper *QQuickPlatformColorDialog::onCreate()
 {
     QPlatformDialogHelper *dialog = nullptr;
     if (!m_options->testOption(QColorDialogOptions::DontUseNativeDialog))
@@ -202,10 +202,10 @@ QPlatformDialogHelper *QQuickPlatformColorDialog::createHelper()
     return dialog;
 }
 
-void QQuickPlatformColorDialog::applyOptions(QPlatformDialogHelper *handle)
+void QQuickPlatformColorDialog::onShow(QPlatformDialogHelper *dialog)
 {
     m_options->setWindowTitle(title());
-    if (QPlatformColorDialogHelper *colorDialog = qobject_cast<QPlatformColorDialogHelper *>(handle))
+    if (QPlatformColorDialogHelper *colorDialog = qobject_cast<QPlatformColorDialogHelper *>(dialog))
         colorDialog->setOptions(m_options);
 }
 
diff --git a/src/imports/platform/qquickplatformcolordialog_p.h b/src/imports/platform/qquickplatformcolordialog_p.h
index d9f8d0ab..1671dabf 100644
--- a/src/imports/platform/qquickplatformcolordialog_p.h
+++ b/src/imports/platform/qquickplatformcolordialog_p.h
@@ -80,8 +80,8 @@ Q_SIGNALS:
     void optionsChanged();
 
 protected:
-    QPlatformDialogHelper *createHelper() override;
-    void applyOptions(QPlatformDialogHelper *handle) override;
+    QPlatformDialogHelper *onCreate() override;
+    void onShow(QPlatformDialogHelper *dialog) override;
     void accept() override;
 
 private:
diff --git a/src/imports/platform/qquickplatformdialog.cpp b/src/imports/platform/qquickplatformdialog.cpp
index 62b4d974..684a599f 100644
--- a/src/imports/platform/qquickplatformdialog.cpp
+++ b/src/imports/platform/qquickplatformdialog.cpp
@@ -258,7 +258,7 @@ void QQuickPlatformDialog::open()
     if (m_visible || !create())
         return;
 
-    applyOptions(m_handle);
+    onShow(m_handle);
     m_visible = m_handle->show(m_flags, m_modality, m_parentWindow);
     if (m_visible)
         emit visibleChanged();
@@ -337,7 +337,7 @@ void QQuickPlatformDialog::componentComplete()
 bool QQuickPlatformDialog::create()
 {
     if (!m_handle) {
-        m_handle = createHelper();
+        m_handle = onCreate();
         if (m_handle) {
             connect(m_handle, &QPlatformDialogHelper::accept, this, &QQuickPlatformDialog::accept);
             connect(m_handle, &QPlatformDialogHelper::reject, this, &QQuickPlatformDialog::reject);
@@ -352,9 +352,9 @@ void QQuickPlatformDialog::destroy()
     m_handle = nullptr;
 }
 
-void QQuickPlatformDialog::applyOptions(QPlatformDialogHelper *handle)
+void QQuickPlatformDialog::onShow(QPlatformDialogHelper *dialog)
 {
-    Q_UNUSED(handle);
+    Q_UNUSED(dialog);
 }
 
 QWindow *QQuickPlatformDialog::findParentWindow() const
diff --git a/src/imports/platform/qquickplatformdialog_p.h b/src/imports/platform/qquickplatformdialog_p.h
index 212e1bd1..1a7ff39d 100644
--- a/src/imports/platform/qquickplatformdialog_p.h
+++ b/src/imports/platform/qquickplatformdialog_p.h
@@ -125,8 +125,8 @@ protected:
     bool create();
     void destroy();
 
-    virtual QPlatformDialogHelper *createHelper() = 0;
-    virtual void applyOptions(QPlatformDialogHelper *handle);
+    virtual QPlatformDialogHelper *onCreate() = 0;
+    virtual void onShow(QPlatformDialogHelper *dialog);
 
     QWindow *findParentWindow() const;
 
diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp
index e3ab8b01..50012354 100644
--- a/src/imports/platform/qquickplatformfiledialog.cpp
+++ b/src/imports/platform/qquickplatformfiledialog.cpp
@@ -456,7 +456,7 @@ void QQuickPlatformFileDialog::resetRejectLabel()
     setRejectLabel(QString());
 }
 
-QPlatformDialogHelper *QQuickPlatformFileDialog::createHelper()
+QPlatformDialogHelper *QQuickPlatformFileDialog::onCreate()
 {
     QPlatformDialogHelper *dialog = nullptr;
     if (!m_options->testOption(QFileDialogOptions::DontUseNativeDialog))
@@ -478,10 +478,10 @@ QPlatformDialogHelper *QQuickPlatformFileDialog::createHelper()
     return dialog;
 }
 
-void QQuickPlatformFileDialog::applyOptions(QPlatformDialogHelper *handle)
+void QQuickPlatformFileDialog::onShow(QPlatformDialogHelper *dialog)
 {
     m_options->setWindowTitle(title());
-    if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle))
+    if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(dialog))
         fileDialog->setOptions(m_options);
 }
 
diff --git a/src/imports/platform/qquickplatformfiledialog_p.h b/src/imports/platform/qquickplatformfiledialog_p.h
index 43d17ec6..f06927e4 100644
--- a/src/imports/platform/qquickplatformfiledialog_p.h
+++ b/src/imports/platform/qquickplatformfiledialog_p.h
@@ -137,8 +137,8 @@ Q_SIGNALS:
     void rejectLabelChanged();
 
 protected:
-    QPlatformDialogHelper *createHelper() override;
-    void applyOptions(QPlatformDialogHelper *handle) override;
+    QPlatformDialogHelper *onCreate() override;
+    void onShow(QPlatformDialogHelper *dialog) override;
     void accept() override;
 
 private:
diff --git a/src/imports/platform/qquickplatformfolderdialog.cpp b/src/imports/platform/qquickplatformfolderdialog.cpp
index dacd68aa..5d7718f5 100644
--- a/src/imports/platform/qquickplatformfolderdialog.cpp
+++ b/src/imports/platform/qquickplatformfolderdialog.cpp
@@ -259,7 +259,7 @@ void QQuickPlatformFolderDialog::resetRejectLabel()
     setRejectLabel(QString());
 }
 
-QPlatformDialogHelper *QQuickPlatformFolderDialog::createHelper()
+QPlatformDialogHelper *QQuickPlatformFolderDialog::onCreate()
 {
     QPlatformDialogHelper *dialog = nullptr;
     if (!m_options->testOption(QFileDialogOptions::DontUseNativeDialog))
@@ -277,10 +277,10 @@ QPlatformDialogHelper *QQuickPlatformFolderDialog::createHelper()
     return dialog;
 }
 
-void QQuickPlatformFolderDialog::applyOptions(QPlatformDialogHelper *handle)
+void QQuickPlatformFolderDialog::onShow(QPlatformDialogHelper *dialog)
 {
     m_options->setWindowTitle(title());
-    if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(handle))
+    if (QPlatformFileDialogHelper *fileDialog = qobject_cast<QPlatformFileDialogHelper *>(dialog))
         fileDialog->setOptions(m_options);
 }
 
diff --git a/src/imports/platform/qquickplatformfolderdialog_p.h b/src/imports/platform/qquickplatformfolderdialog_p.h
index ebc44c0c..d58ade0e 100644
--- a/src/imports/platform/qquickplatformfolderdialog_p.h
+++ b/src/imports/platform/qquickplatformfolderdialog_p.h
@@ -93,8 +93,8 @@ Q_SIGNALS:
     void rejectLabelChanged();
 
 protected:
-    QPlatformDialogHelper *createHelper() override;
-    void applyOptions(QPlatformDialogHelper *handle) override;
+    QPlatformDialogHelper *onCreate() override;
+    void onShow(QPlatformDialogHelper *dialog) override;
     void accept() override;
 
 private:
diff --git a/src/imports/platform/qquickplatformfontdialog.cpp b/src/imports/platform/qquickplatformfontdialog.cpp
index 892869a7..1643c89b 100644
--- a/src/imports/platform/qquickplatformfontdialog.cpp
+++ b/src/imports/platform/qquickplatformfontdialog.cpp
@@ -187,7 +187,7 @@ void QQuickPlatformFontDialog::setOptions(QFontDialogOptions::FontDialogOptions
     emit optionsChanged();
 }
 
-QPlatformDialogHelper *QQuickPlatformFontDialog::createHelper()
+QPlatformDialogHelper *QQuickPlatformFontDialog::onCreate()
 {
     QPlatformDialogHelper *dialog = nullptr;
     if (!m_options->testOption(QFontDialogOptions::DontUseNativeDialog))
@@ -205,10 +205,10 @@ QPlatformDialogHelper *QQuickPlatformFontDialog::createHelper()
     return dialog;
 }
 
-void QQuickPlatformFontDialog::applyOptions(QPlatformDialogHelper *handle)
+void QQuickPlatformFontDialog::onShow(QPlatformDialogHelper *dialog)
 {
     m_options->setWindowTitle(title());
-    if (QPlatformFontDialogHelper *fontDialog = qobject_cast<QPlatformFontDialogHelper *>(handle))
+    if (QPlatformFontDialogHelper *fontDialog = qobject_cast<QPlatformFontDialogHelper *>(dialog))
         fontDialog->setOptions(m_options);
 }
 
diff --git a/src/imports/platform/qquickplatformfontdialog_p.h b/src/imports/platform/qquickplatformfontdialog_p.h
index 48362e1a..7fe7d635 100644
--- a/src/imports/platform/qquickplatformfontdialog_p.h
+++ b/src/imports/platform/qquickplatformfontdialog_p.h
@@ -80,8 +80,8 @@ Q_SIGNALS:
     void optionsChanged();
 
 protected:
-    QPlatformDialogHelper *createHelper() override;
-    void applyOptions(QPlatformDialogHelper *handle) override;
+    QPlatformDialogHelper *onCreate() override;
+    void onShow(QPlatformDialogHelper *dialog) override;
     void accept() override;
 
 private:
diff --git a/src/imports/platform/qquickplatformmessagedialog.cpp b/src/imports/platform/qquickplatformmessagedialog.cpp
index b9395eba..59e617ba 100644
--- a/src/imports/platform/qquickplatformmessagedialog.cpp
+++ b/src/imports/platform/qquickplatformmessagedialog.cpp
@@ -345,7 +345,7 @@ void QQuickPlatformMessageDialog::setButtons(QPlatformDialogHelper::StandardButt
     emit buttonsChanged();
 }
 
-QPlatformDialogHelper *QQuickPlatformMessageDialog::createHelper()
+QPlatformDialogHelper *QQuickPlatformMessageDialog::onCreate()
 {
     QPlatformDialogHelper *dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::MessageDialog);
 #ifdef QT_WIDGETS_LIB
@@ -361,10 +361,10 @@ QPlatformDialogHelper *QQuickPlatformMessageDialog::createHelper()
     return dialog;
 }
 
-void QQuickPlatformMessageDialog::applyOptions(QPlatformDialogHelper *handle)
+void QQuickPlatformMessageDialog::onShow(QPlatformDialogHelper *dialog)
 {
     m_options->setWindowTitle(title());
-    if (QPlatformMessageDialogHelper *messageDialog = qobject_cast<QPlatformMessageDialogHelper *>(handle))
+    if (QPlatformMessageDialogHelper *messageDialog = qobject_cast<QPlatformMessageDialogHelper *>(dialog))
         messageDialog->setOptions(m_options);
 }
 
diff --git a/src/imports/platform/qquickplatformmessagedialog_p.h b/src/imports/platform/qquickplatformmessagedialog_p.h
index 656d8f1f..1190c71d 100644
--- a/src/imports/platform/qquickplatformmessagedialog_p.h
+++ b/src/imports/platform/qquickplatformmessagedialog_p.h
@@ -104,8 +104,8 @@ Q_SIGNALS:
     void restoreDefaultsClicked();
 
 protected:
-    QPlatformDialogHelper *createHelper() override;
-    void applyOptions(QPlatformDialogHelper *handle) override;
+    QPlatformDialogHelper *onCreate() override;
+    void onShow(QPlatformDialogHelper *dialog) override;
 
 private Q_SLOTS:
     void handleClick(QPlatformDialogHelper::StandardButton button);