diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-08-28 05:56:42 (GMT) |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-08-28 05:56:42 (GMT) |
| commit | 1e982527668ea168f12875fda4ecc56ae017d7b3 (patch) | |
| tree | eddcebda5333d54cda0acdaa3f15086b441a5df1 /src/gui/widgets | |
| parent | bc1b2e0528265841be8c4af912a665a92ce5906d (diff) | |
| download | Qt-1e982527668ea168f12875fda4ecc56ae017d7b3.zip Qt-1e982527668ea168f12875fda4ecc56ae017d7b3.tar.gz Qt-1e982527668ea168f12875fda4ecc56ae017d7b3.tar.bz2 | |
Compile with Qt-in-a-namepsace.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qcocoatoolbardelegate_mac.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/widgets/qcocoatoolbardelegate_mac.mm b/src/gui/widgets/qcocoatoolbardelegate_mac.mm index 3b58a4e..2ef0ead 100644 --- a/src/gui/widgets/qcocoatoolbardelegate_mac.mm +++ b/src/gui/widgets/qcocoatoolbardelegate_mac.mm @@ -100,7 +100,8 @@ QT_FORWARD_DECLARE_CLASS(QCFString); { Q_UNUSED(flag); Q_UNUSED(nstoolbar); - QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value(qt_mac_NSStringToQString(itemIdentifier)); + QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value( + QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)(itemIdentifier)); NSToolbarItem *item = nil; if (tb) { item = [[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier]; @@ -112,7 +113,8 @@ QT_FORWARD_DECLARE_CLASS(QCFString); - (void)toolbarWillAddItem:(NSNotification *)notification { NSToolbarItem *item = [[notification userInfo] valueForKey:@"item"]; - QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value(qt_mac_NSStringToQString([item itemIdentifier])); + QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value( + QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)([item itemIdentifier])); if (!tb) return; // I can't really do anything about this. [item retain]; |