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/qfiledialog_p.h | |
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/qfiledialog_p.h')
-rw-r--r-- | src/widgets/dialogs/qfiledialog_p.h | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index fe14836b11..6d4a00e681 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -76,8 +76,6 @@ #include <qdebug.h> #include "qsidebar_p.h" #include "qfscompleter_p.h" -#include "private/qguiplatformplugin_p.h" - #if defined (Q_OS_UNIX) #include <unistd.h> @@ -370,83 +368,71 @@ inline void QFileDialogPrivate::deleteNativeDialog_sys() { if (QPlatformDialogHelper *helper = platformHelper()) helper->deleteNativeDialog_sys(); - else - qt_guiPlatformPlugin()->fileDialogDelete(q_func()); } inline bool QFileDialogPrivate::setVisible_sys(bool visible) { if (QPlatformDialogHelper *helper = platformHelper()) return helper->setVisible_sys(visible); - return qt_guiPlatformPlugin()->fileDialogSetVisible(q_func(), visible); + return false; } inline QDialog::DialogCode QFileDialogPrivate::dialogResultCode_sys() { if (QPlatformDialogHelper *helper = platformHelper()) return helper->dialogResultCode_sys(); - return qt_guiPlatformPlugin()->fileDialogResultCode(q_func()); + return QDialog::Rejected; } inline void QFileDialogPrivate::setDirectory_sys(const QString &directory) { if (QPlatformDialogHelper *helper = platformHelper()) helper->setDirectory_sys(directory); - else - qt_guiPlatformPlugin()->fileDialogSetDirectory(q_func(), directory); } inline QString QFileDialogPrivate::directory_sys() const { if (QPlatformDialogHelper *helper = platformHelper()) return helper->directory_sys(); - return qt_guiPlatformPlugin()->fileDialogDirectory(q_func()); + return QString(); } inline void QFileDialogPrivate::selectFile_sys(const QString &filename) { if (QPlatformDialogHelper *helper = platformHelper()) helper->selectFile_sys(filename); - else - qt_guiPlatformPlugin()->fileDialogSelectFile(q_func(), filename); } inline QStringList QFileDialogPrivate::selectedFiles_sys() const { if (QPlatformDialogHelper *helper = platformHelper()) return helper->selectedFiles_sys(); - return qt_guiPlatformPlugin()->fileDialogSelectedFiles(q_func()); + return QStringList(); } inline void QFileDialogPrivate::setFilter_sys() { if (QPlatformDialogHelper *helper = platformHelper()) helper->setFilter_sys(); - else - qt_guiPlatformPlugin()->fileDialogSetFilter(q_func()); } inline void QFileDialogPrivate::setNameFilters_sys(const QStringList &filters) { if (QPlatformDialogHelper *helper = platformHelper()) helper->setNameFilters_sys(filters); - else - qt_guiPlatformPlugin()->fileDialogSetNameFilters(q_func(), filters); } inline void QFileDialogPrivate::selectNameFilter_sys(const QString &filter) { if (QPlatformDialogHelper *helper = platformHelper()) helper->selectNameFilter_sys(filter); - else - qt_guiPlatformPlugin()->fileDialogSelectNameFilter(q_func(), filter); } inline QString QFileDialogPrivate::selectedNameFilter_sys() const { if (QPlatformDialogHelper *helper = platformHelper()) return helper->selectedNameFilter_sys(); - return qt_guiPlatformPlugin()->fileDialogSelectedNameFilter(q_func()); + return QString(); } QT_END_NAMESPACE |