From d223b30c42a9a8d42a8dd35b2d93615e646b4f1e Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 9 May 2012 12:54:38 +0200 Subject: 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 Reviewed-by: Lars Knoll --- .../platforms/windows/qwindowsdialoghelpers.cpp | 44 +++++++++++----------- .../platforms/windows/qwindowsdialoghelpers.h | 8 ++-- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/plugins/platforms/windows') diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index ea47d0abb2..e1aae23b8c 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -445,7 +445,7 @@ QWindowsNativeDialogBase *QWindowsDialogHelperBase::ensureNativeDialo } template -void QWindowsDialogHelperBase::deleteNativeDialog_sys() +void QWindowsDialogHelperBase::deleteNativeDialog() { if (QWindowsContext::verboseDialogs) qDebug("%s" , __FUNCTION__); @@ -486,7 +486,7 @@ void QWindowsDialogThread::run() } template -bool QWindowsDialogHelperBase::show_sys(Qt::WindowFlags, +bool QWindowsDialogHelperBase::show(Qt::WindowFlags, Qt::WindowModality windowModality, QWindow *parent) { @@ -511,7 +511,7 @@ bool QWindowsDialogHelperBase::show_sys(Qt::WindowFlags, } template -void QWindowsDialogHelperBase::hide_sys() +void QWindowsDialogHelperBase::hide() { if (m_nativeDialog) m_nativeDialog->close(); @@ -519,7 +519,7 @@ void QWindowsDialogHelperBase::hide_sys() } template -void QWindowsDialogHelperBase::exec_sys() +void QWindowsDialogHelperBase::exec() { if (QWindowsContext::verboseDialogs) qDebug("%s" , __FUNCTION__); @@ -1106,14 +1106,14 @@ public: virtual bool defaultNameFilterDisables() const { return true; } - virtual void setDirectory_sys(const QString &directory); - virtual QString directory_sys() const; - virtual void selectFile_sys(const QString &filename); - virtual QStringList selectedFiles_sys() const; - virtual void setFilter_sys(); - virtual void setNameFilters_sys(const QStringList &filters); - virtual void selectNameFilter_sys(const QString &filter); - virtual QString selectedNameFilter_sys() const; + virtual void setDirectory(const QString &directory); + virtual QString directory() const; + virtual void selectFile(const QString &filename); + virtual QStringList selectedFiles() const; + virtual void setFilter(); + virtual void setNameFilters(const QStringList &filters); + virtual void selectNameFilter(const QString &filter); + virtual QString selectedNameFilter() const; private: virtual QWindowsNativeDialogBase *createNativeDialog(); @@ -1159,7 +1159,7 @@ QWindowsNativeDialogBase *QWindowsFileDialogHelper::createNativeDialog() return result; } -void QWindowsFileDialogHelper::setDirectory_sys(const QString &directory) +void QWindowsFileDialogHelper::setDirectory(const QString &directory) { if (QWindowsContext::verboseDialogs) qDebug("%s %s" , __FUNCTION__, qPrintable(directory)); @@ -1168,19 +1168,19 @@ void QWindowsFileDialogHelper::setDirectory_sys(const QString &directory) nfd->setDirectory(directory); } -QString QWindowsFileDialogHelper::directory_sys() const +QString QWindowsFileDialogHelper::directory() const { if (const QWindowsNativeFileDialogBase *nfd = nativeFileDialog()) return nfd->directory(); return QString(); } -void QWindowsFileDialogHelper::selectFile_sys(const QString & /* filename */) +void QWindowsFileDialogHelper::selectFile(const QString & /* filename */) { // Not implemented. } -QStringList QWindowsFileDialogHelper::selectedFiles_sys() const +QStringList QWindowsFileDialogHelper::selectedFiles() const { QStringList files; if (const QWindowsNativeFileDialogBase *nfd = nativeFileDialog()) @@ -1191,13 +1191,13 @@ QStringList QWindowsFileDialogHelper::selectedFiles_sys() const return files; } -void QWindowsFileDialogHelper::setFilter_sys() +void QWindowsFileDialogHelper::setFilter() { if (QWindowsContext::verboseDialogs) qDebug("%s" , __FUNCTION__); } -void QWindowsFileDialogHelper::setNameFilters_sys(const QStringList &filters) +void QWindowsFileDialogHelper::setNameFilters(const QStringList &filters) { if (QWindowsContext::verboseDialogs) qDebug("%s" , __FUNCTION__); @@ -1205,13 +1205,13 @@ void QWindowsFileDialogHelper::setNameFilters_sys(const QStringList &filters) nfd->setNameFilters(filters); } -void QWindowsFileDialogHelper::selectNameFilter_sys(const QString &filter) +void QWindowsFileDialogHelper::selectNameFilter(const QString &filter) { if (QWindowsNativeFileDialogBase *nfd = nativeFileDialog()) nfd->selectNameFilter(filter); } -QString QWindowsFileDialogHelper::selectedNameFilter_sys() const +QString QWindowsFileDialogHelper::selectedNameFilter() const { if (const QWindowsNativeFileDialogBase *nfd = nativeFileDialog()) return nfd->selectedNameFilter(); @@ -1322,8 +1322,8 @@ public: virtual bool supportsNonModalDialog() { return false; } - virtual QColor currentColor_sys() const { return *m_currentColor; } - virtual void setCurrentColor_sys(const QColor &c) { *m_currentColor = c; } + virtual QColor currentColor() const { return *m_currentColor; } + virtual void setCurrentColor(const QColor &c) { *m_currentColor = c; } private: inline QWindowsNativeColorDialog *nativeFileDialog() const diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.h b/src/plugins/platforms/windows/qwindowsdialoghelpers.h index 8a06c35167..a8e0de0383 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.h +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.h @@ -66,12 +66,12 @@ class QWindowsDialogHelperBase : public BaseClass { public: - virtual void exec_sys(); - virtual void deleteNativeDialog_sys(); - virtual bool show_sys(Qt::WindowFlags windowFlags, + virtual void exec(); + virtual void deleteNativeDialog(); + virtual bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent); - virtual void hide_sys(); + virtual void hide(); virtual QVariant styleHint(QPlatformDialogHelper::StyleHint) const; virtual bool supportsNonModalDialog() const { return true; } -- cgit v1.2.3