summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs/qfiledialog_p.h
diff options
context:
space:
mode:
authorMorten Sorvig <morten.sorvig@nokia.com>2011-09-29 14:29:05 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-10 07:47:58 +0200
commit9fa6e8f627d0c61fd5a3b993903a362dc04bf707 (patch)
tree56858ef0994ef4b300d5f6928fa51b0844bf1861 /src/widgets/dialogs/qfiledialog_p.h
parent33233ca3e3d79152744eedd353106c5d95737e00 (diff)
Clean-up a macro for Cocoa
Remove the usage of Q_MAC_USE_COCOA and Carbon code paths. Change-Id: Ib569ad8c6d9ffe258f454b3c3b06e95294a10112 Reviewed-on: http://codereview.qt-project.org/5100 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Sanity-Review: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/widgets/dialogs/qfiledialog_p.h')
-rw-r--r--src/widgets/dialogs/qfiledialog_p.h28
1 files changed, 0 insertions, 28 deletions
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h
index 6a534bb60f..c820202e75 100644
--- a/src/widgets/dialogs/qfiledialog_p.h
+++ b/src/widgets/dialogs/qfiledialog_p.h
@@ -279,36 +279,8 @@ public:
#if defined(Q_WS_MAC)
void *mDelegate;
-#ifndef QT_MAC_USE_COCOA
- NavDialogRef mDialog;
- bool mDialogStarted;
- bool mDialogClosed;
- QString mCurrentLocation;
- QString mCurrentSelection;
- QStringList mCurrentSelectionList;
-
- struct QtMacFilterName {
- QString description;
- QString regexp;
- QString filter;
- };
- struct QtMacNavFilterInfo {
- QtMacNavFilterInfo() : currentSelection(-1) {}
- int currentSelection;
- QList<QtMacFilterName> filters;
- } filterInfo;
-
- static void qt_mac_filedialog_event_proc(const NavEventCallbackMessage msg, NavCBRecPtr p,
- NavCallBackUserData data);
- static Boolean qt_mac_filedialog_filter_proc(AEDesc *theItem, void *info, void *data,
- NavFilterModes);
- bool showCarbonNavServicesDialog();
- bool hideCarbonNavServicesDialog();
- void createNavServicesDialog();
-#else
bool showCocoaFilePanel();
bool hideCocoaFilePanel();
-#endif
void createNSOpenSavePanelDelegate();
void QNSOpenSavePanelDelegate_selectionChanged(const QString &newPath);
void QNSOpenSavePanelDelegate_panelClosed(bool accepted);