qpa: Clean up QPlatformDialogHelper API

Remove the _sys suffix from all members of QPlatformDialogHelper and its
subclasses. The QPlatform* class prefix already implies that these
methods are system specific, we don't need the method suffix as well.

Change-Id: I5ad1f928fab3a989992951acc244915e7fa48d32
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

4 files changed, 15 insertions, 15 deletions

diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index d7a8f5dc21..0dd3d3cdfc 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -1248,7 +1248,7 @@ inline bool QColorDialogPrivate::isAlphaVisible() const { return cs->isAlphaVisi
 QColor QColorDialogPrivate::currentQColor() const
 {
     if (!options->testOption(QColorDialogOptions::DontUseNativeDialog) && nativeDialogInUse)
-        return platformColorDialogHelper()->currentColor_sys();
+        return platformColorDialogHelper()->currentColor();
     return cs->currentQColor();
 }
 
@@ -1707,7 +1707,7 @@ void QColorDialog::setCurrentColor(const QColor &color)
     d->setCurrentAlpha(color.alpha());
 
     if (!testOption(QColorDialog::DontUseNativeDialog) && d->nativeDialogInUse)
-        d->platformColorDialogHelper()->setCurrentColor_sys(color);
+        d->platformColorDialogHelper()->setCurrentColor(color);
 }
 
 QColor QColorDialog::currentColor() const
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
index 29a8576e6b..b0cc35340d 100644
--- a/src/widgets/dialogs/qdialog.cpp
+++ b/src/widgets/dialogs/qdialog.cpp
@@ -108,9 +108,9 @@ bool QDialogPrivate::setNativeDialogVisible(bool visible)
         if (visible) {
             Q_Q(QDialog);
             helperPrepareShow(helper);
-            nativeDialogInUse = helper->show_sys(q->windowFlags(), q->windowModality(), parentWindow());
+            nativeDialogInUse = helper->show(q->windowFlags(), q->windowModality(), parentWindow());
         } else {
-            helper->hide_sys();
+            helper->hide();
         }
     }
     return nativeDialogInUse;
@@ -126,7 +126,7 @@ QVariant QDialogPrivate::styleHint(QPlatformDialogHelper::StyleHint hint) const
 void QDialogPrivate::deleteNativeDialog()
 {
     if (QPlatformDialogHelper *helper = platformHelper()) {
-        helper->deleteNativeDialog_sys();
+        helper->deleteNativeDialog();
         nativeDialogInUse = false;
     }
 }
@@ -528,7 +528,7 @@ int QDialog::exec()
 
     QPointer<QDialog> guard = this;
     if (d->nativeDialogInUse) {
-        d->platformHelper()->exec_sys();
+        d->platformHelper()->exec();
     } else {
         QEventLoop eventLoop;
         d->eventLoop = &eventLoop;
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h
index 0132d4ba6f..d7b5ce6527 100644
--- a/src/widgets/dialogs/qfiledialog_p.h
+++ b/src/widgets/dialogs/qfiledialog_p.h
@@ -348,45 +348,45 @@ inline QString QFileDialogPrivate::rootPath() const {
 inline void QFileDialogPrivate::setDirectory_sys(const QString &directory)
 {
     if (QPlatformFileDialogHelper *helper = platformFileDialogHelper())
-        helper->setDirectory_sys(directory);
+        helper->setDirectory(directory);
 }
 
 inline QString QFileDialogPrivate::directory_sys() const
 {
     if (QPlatformFileDialogHelper *helper = platformFileDialogHelper())
-        return helper->directory_sys();
+        return helper->directory();
     return QString();
 }
 
 inline void QFileDialogPrivate::selectFile_sys(const QString &filename)
 {
     if (QPlatformFileDialogHelper *helper = platformFileDialogHelper())
-        helper->selectFile_sys(filename);
+        helper->selectFile(filename);
 }
 
 inline QStringList QFileDialogPrivate::selectedFiles_sys() const
 {
     if (QPlatformFileDialogHelper *helper = platformFileDialogHelper())
-        return helper->selectedFiles_sys();
+        return helper->selectedFiles();
     return QStringList();
 }
 
 inline void QFileDialogPrivate::setFilter_sys()
 {
     if (QPlatformFileDialogHelper *helper = platformFileDialogHelper())
-        helper->setFilter_sys();
+        helper->setFilter();
 }
 
 inline void QFileDialogPrivate::selectNameFilter_sys(const QString &filter)
 {
     if (QPlatformFileDialogHelper *helper = platformFileDialogHelper())
-        helper->selectNameFilter_sys(filter);
+        helper->selectNameFilter(filter);
 }
 
 inline QString QFileDialogPrivate::selectedNameFilter_sys() const
 {
     if (QPlatformFileDialogHelper *helper = platformFileDialogHelper())
-        return helper->selectedNameFilter_sys();
+        return helper->selectedNameFilter();
     return QString();
 }
 
diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
index b267f67422..3e3a149386 100644
--- a/src/widgets/dialogs/qfontdialog.cpp
+++ b/src/widgets/dialogs/qfontdialog.cpp
@@ -802,7 +802,7 @@ void QFontDialog::setCurrentFont(const QFont &font)
     d->updateFamilies();
     if (d->canBeNativeDialog()) {
         if (QPlatformFontDialogHelper *helper = d->platformFontDialogHelper())
-            helper->setCurrentFont_sys(font);
+            helper->setCurrentFont(font);
     }
 
 #ifdef Q_WS_MAC
@@ -823,7 +823,7 @@ QFont QFontDialog::currentFont() const
     Q_D(const QFontDialog);
     if (d->canBeNativeDialog()) {
         if (const QPlatformFontDialogHelper *helper = d->platformFontDialogHelper())
-            return helper->currentFont_sys();
+            return helper->currentFont();
     }
     return d->sampleEdit->font();
 }