diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-05-22 12:00:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-08 13:00:03 +0200 |
| commit | 2922f85e707ad086025149fdb7cb1e2608b9e7b2 (patch) | |
| tree | 3d3fd3a72ef788d71350e41c9b8d1914408df588 /src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm | |
| parent | 5fc8cc830e09bdf5f94762d9ed90fb2a417b00c6 (diff) | |
Reduce QtWidgets dependencies in the Cocoa plugin.
b8246f08 added the new menus implementation which
removes one of the major QtWidget dependencies.
Continuing on the path to QtWidget-freedom this
commit removes the following:
- qmenu_mac.h/mm. Not used.
- FORMS += filedialog.ui. Not used.
- qt_strippedText from qaction.cpp. Duplicate.
- Misc stray includes.
What is left should be the dependencies needed by
the print engine implementation. These will be
handled at a later time.
Change-Id: I0cead4cdaddcebd402d30c6112f3e889d0f28740
Conflicts:
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm index 05149a8098..1d87f71b33 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm @@ -48,29 +48,25 @@ *****************************************************************************/ //#define DEBUG_FILEDIALOG_FILTERS -#include <qapplication.h> -#include <private/qapplication_p.h> -#include <private/qfiledialog_p.h> +#include <qguiapplication.h> +#include <private/qguiapplication_p.h> #include "qt_mac_p.h" #include "qcocoahelpers.h" #include <qregexp.h> #include <qbuffer.h> #include <qdebug.h> #include <qstringlist.h> -#include <qaction.h> #include <qtextcodec.h> #include <qvarlengtharray.h> -#include <qdesktopwidget.h> #include <stdlib.h> #include <qabstracteventdispatcher.h> + +#include <qpa/qplatformnativeinterface.h> + #import <AppKit/NSSavePanel.h> -#include "ui_qfiledialog.h" -QT_FORWARD_DECLARE_CLASS(QFileDialogPrivate) QT_FORWARD_DECLARE_CLASS(QString) QT_FORWARD_DECLARE_CLASS(QStringList) -QT_FORWARD_DECLARE_CLASS(QWidget) -QT_FORWARD_DECLARE_CLASS(QAction) QT_FORWARD_DECLARE_CLASS(QFileInfo) QT_FORWARD_DECLARE_CLASS(QWindow) QT_USE_NAMESPACE @@ -194,10 +190,24 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions; [super dealloc]; } +static QString strippedText(QString s) +{ + s.remove( QString::fromLatin1("...") ); + int i = 0; + while (i < s.size()) { + ++i; + if (s.at(i-1) != QLatin1Char('&')) + continue; + if (i < s.size() && s.at(i) == QLatin1Char('&')) + ++i; + s.remove(i-1,1); + } + return s.trimmed(); +} + - (NSString *)strip:(const QString &)label { - QAction a(label, 0); - return QCFString::toNSString(a.iconText()); + return QCFString::toNSString(strippedText(label)); } - (void)closePanel |