diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-04-11 09:09:15 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-04-11 14:05:58 +0200 |
| commit | 94d81270509dbb438bf21790f9932123a77a8c3c (patch) | |
| tree | 2c777b0cdf9ad76cf63f2634b5875a6c890b946f | |
| parent | 671ebc828ed2fd5e29d6812929f82764a690fdd8 (diff) | |
Rename QtMacToolbarDelegate / QtNSToolbarNotifier
Change-Id: Ia81bee1255388969df395ca92f040bd6fd8da35d
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| -rw-r--r-- | src/macextras/qmactoolbardelegate.h | 4 | ||||
| -rw-r--r-- | src/macextras/qmactoolbardelegate.mm | 2 | ||||
| -rw-r--r-- | src/macextras/qmacunifiedtoolbar.mm | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/macextras/qmactoolbardelegate.h b/src/macextras/qmactoolbardelegate.h index f6ce541..ef4d3a2 100644 --- a/src/macextras/qmactoolbardelegate.h +++ b/src/macextras/qmactoolbardelegate.h @@ -50,7 +50,7 @@ class QAction; class QIcon; -@interface QtMacToolbarDelegate : NSObject <NSToolbarDelegate> +@interface QMacToolbarDelegate : NSObject <NSToolbarDelegate> { @public QList<QMacToolButton *> items; @@ -79,4 +79,4 @@ class QIcon; @end -#endif // QTMACTOOLBARDELEGATE_H +#endif // QMACTOOLBARDELEGATE_H diff --git a/src/macextras/qmactoolbardelegate.mm b/src/macextras/qmactoolbardelegate.mm index 4a5d712..6b3c3d5 100644 --- a/src/macextras/qmactoolbardelegate.mm +++ b/src/macextras/qmactoolbardelegate.mm @@ -87,7 +87,7 @@ QString qt_strippedText(QString s) return s.trimmed(); } -@implementation QtMacToolbarDelegate +@implementation QMacToolbarDelegate - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar { diff --git a/src/macextras/qmacunifiedtoolbar.mm b/src/macextras/qmacunifiedtoolbar.mm index 38e09d8..a6b667e 100644 --- a/src/macextras/qmacunifiedtoolbar.mm +++ b/src/macextras/qmacunifiedtoolbar.mm @@ -113,7 +113,7 @@ Qt::ToolButtonStyle toQtToolButtonStyle(NSToolbarDisplayMode toolbarDisplayMode) } } -@interface QtNSToolbarNotifier : NSObject +@interface QNSToolbarNotifier : NSObject { @public QMacUnifiedToolBarPrivate *pimpl; @@ -126,8 +126,8 @@ class QMacUnifiedToolBarPrivate public: QMacUnifiedToolBar *qtToolbar; NSToolbar *toolbar; - QtMacToolbarDelegate *delegate; - QtNSToolbarNotifier *notifier; + QMacToolbarDelegate *delegate; + QNSToolbarNotifier *notifier; QMacUnifiedToolBarPrivate(QMacUnifiedToolBar *parent, const QString &identifier = QString()) { @@ -135,10 +135,10 @@ public: toolbar = [[QtNSToolbar alloc] initWithIdentifier:QtMacExtras::toNSString(identifier.isEmpty() ? QUuid::createUuid().toString() : identifier)]; [toolbar setAutosavesConfiguration:NO]; - delegate = [[QtMacToolbarDelegate alloc] init]; + delegate = [[QMacToolbarDelegate alloc] init]; [toolbar setDelegate:delegate]; - notifier = [[QtNSToolbarNotifier alloc] init]; + notifier = [[QNSToolbarNotifier alloc] init]; notifier->pimpl = this; [[NSNotificationCenter defaultCenter] addObserver:notifier selector:@selector(notification:) name:nil object:toolbar]; } @@ -180,7 +180,7 @@ public: } }; -@implementation QtNSToolbarNotifier +@implementation QNSToolbarNotifier - (void)notification:(NSNotification*)note { |