From 658a239eb9263d79381d16d22b0b4b2e982ce607 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 18 Jan 2012 14:45:55 +0100 Subject: Rename all our interfaces from com.trolltech to org.qt-project MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6db7211fcf6b24bd75e360645bbb2fdf1ef8a8bc Reviewed-by: Frederik Gladhorn Reviewed-by: João Abecasis --- src/widgets/widgets/qcocoatoolbardelegate_mac.mm | 2 +- src/widgets/widgets/qmainwindowlayout_mac.mm | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/widgets/widgets') diff --git a/src/widgets/widgets/qcocoatoolbardelegate_mac.mm b/src/widgets/widgets/qcocoatoolbardelegate_mac.mm index 1127d01b19..e17744886c 100644 --- a/src/widgets/widgets/qcocoatoolbardelegate_mac.mm +++ b/src/widgets/widgets/qcocoatoolbardelegate_mac.mm @@ -71,7 +71,7 @@ QT_FORWARD_DECLARE_CLASS(QCFString); - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar { Q_UNUSED(toolbar); - return [NSArray arrayWithObject:@"com.trolltech.qt.nstoolbar-qtoolbar"]; + return [NSArray arrayWithObject:@"org.qt-project.qt.nstoolbar-qtoolbar"]; } - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar diff --git a/src/widgets/widgets/qmainwindowlayout_mac.mm b/src/widgets/widgets/qmainwindowlayout_mac.mm index b6fcca88fa..7dba60678f 100644 --- a/src/widgets/widgets/qmainwindowlayout_mac.mm +++ b/src/widgets/widgets/qmainwindowlayout_mac.mm @@ -54,10 +54,10 @@ QT_BEGIN_NAMESPACE // namespace up the stuff #define SS(x) #x #define S0(x) SS(x) -#define S "com.trolltech.qt-" S0(QT_NAMESPACE) ".qmainwindow.qtoolbarInHIToolbar" -#define SToolbar "com.trolltech.qt-" S0(QT_NAMESPACE) ".hitoolbar-qtoolbar" -#define SNSToolbar "com.trolltech.qt-" S0(QT_NAMESPACE) ".qtoolbarInNSToolbar" -#define MacToolbar "com.trolltech.qt-" S0(QT_NAMESPACE) ".qmainwindow.mactoolbar" +#define S "org.qt-project.qt-" S0(QT_NAMESPACE) ".qmainwindow.qtoolbarInHIToolbar" +#define SToolbar "org.qt-project.qt-" S0(QT_NAMESPACE) ".hitoolbar-qtoolbar" +#define SNSToolbar "org.qt-project.qt-" S0(QT_NAMESPACE) ".qtoolbarInNSToolbar" +#define MacToolbar "org.qt-project.qt-" S0(QT_NAMESPACE) ".qmainwindow.mactoolbar" static NSString *kQToolBarNSToolbarIdentifier = @SNSToolbar; static CFStringRef kQMainWindowMacToolbarID = CFSTR(MacToolbar); @@ -69,8 +69,8 @@ static CFStringRef kQMainWindowMacToolbarID = CFSTR(MacToolbar); #undef MacToolbar #else -static NSString *kQToolBarNSToolbarIdentifier = @"com.trolltech.qt.qmainwindow.qtoolbarInNSToolbar"; -static CFStringRef kQMainWindowMacToolbarID = CFSTR("com.trolltech.qt.qmainwindow.mactoolbar"); +static NSString *kQToolBarNSToolbarIdentifier = @"org.qt-project.qt.qmainwindow.qtoolbarInNSToolbar"; +static CFStringRef kQMainWindowMacToolbarID = CFSTR("org.qt-project.qt.qmainwindow.mactoolbar"); #endif // QT_NAMESPACE -- cgit v1.2.3