diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-01-18 14:45:55 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 14:28:49 +0100 |
commit | 658a239eb9263d79381d16d22b0b4b2e982ce607 (patch) | |
tree | e0686187db06f68f524987a5eb782d10623ea44c /src/widgets | |
parent | 408a347d80f59b4127b044b9da1a9c15783cf34d (diff) |
Rename all our interfaces from com.trolltech to org.qt-project
Change-Id: I6db7211fcf6b24bd75e360645bbb2fdf1ef8a8bc
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/graphicsview/qgraphicsitem.h | 2 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicslayout.h | 2 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicslayoutitem.h | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qiconengineplugin.h | 4 | ||||
-rw-r--r-- | src/widgets/styles/qstyleplugin.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qcocoatoolbardelegate_mac.mm | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qmainwindowlayout_mac.mm | 12 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index 3873857b8a..e9311c7d05 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -496,7 +496,7 @@ private: }; Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsItem::GraphicsItemFlags) -Q_DECLARE_INTERFACE(QGraphicsItem, "com.trolltech.Qt.QGraphicsItem") +Q_DECLARE_INTERFACE(QGraphicsItem, "org.qt-project.Qt.QGraphicsItem") inline void QGraphicsItem::setPos(qreal ax, qreal ay) { setPos(QPointF(ax, ay)); } diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index 4e5b2a982a..05e1c2b37b 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -88,7 +88,7 @@ private: friend class QGraphicsWidget; }; -Q_DECLARE_INTERFACE(QGraphicsLayout, "com.trolltech.Qt.QGraphicsLayout") +Q_DECLARE_INTERFACE(QGraphicsLayout, "org.qt-project.Qt.QGraphicsLayout") #endif diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 926a2b15dc..54c4a861f0 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem.h @@ -122,7 +122,7 @@ private: friend class QGraphicsLayout; }; -Q_DECLARE_INTERFACE(QGraphicsLayoutItem, "com.trolltech.Qt.QGraphicsLayoutItem") +Q_DECLARE_INTERFACE(QGraphicsLayoutItem, "org.qt-project.Qt.QGraphicsLayoutItem") inline void QGraphicsLayoutItem::setMinimumSize(qreal aw, qreal ah) { setMinimumSize(QSizeF(aw, ah)); } diff --git a/src/widgets/kernel/qiconengineplugin.h b/src/widgets/kernel/qiconengineplugin.h index 1bd9075866..1bbdcb0f17 100644 --- a/src/widgets/kernel/qiconengineplugin.h +++ b/src/widgets/kernel/qiconengineplugin.h @@ -60,7 +60,7 @@ struct Q_WIDGETS_EXPORT QIconEngineFactoryInterface : public QFactoryInterface }; #define QIconEngineFactoryInterface_iid \ - "com.trolltech.Qt.QIconEngineFactoryInterface" + "org.qt-project.Qt.QIconEngineFactoryInterface" Q_DECLARE_INTERFACE(QIconEngineFactoryInterface, QIconEngineFactoryInterface_iid) class Q_WIDGETS_EXPORT QIconEnginePlugin : public QObject, public QIconEngineFactoryInterface @@ -82,7 +82,7 @@ struct Q_WIDGETS_EXPORT QIconEngineFactoryInterfaceV2 : public QFactoryInterface }; #define QIconEngineFactoryInterfaceV2_iid \ - "com.trolltech.Qt.QIconEngineFactoryInterfaceV2" + "org.qt-project.Qt.QIconEngineFactoryInterfaceV2" Q_DECLARE_INTERFACE(QIconEngineFactoryInterfaceV2, QIconEngineFactoryInterfaceV2_iid) class Q_WIDGETS_EXPORT QIconEnginePluginV2 : public QObject, public QIconEngineFactoryInterfaceV2 diff --git a/src/widgets/styles/qstyleplugin.h b/src/widgets/styles/qstyleplugin.h index c9a35caaa4..cddfbb5045 100644 --- a/src/widgets/styles/qstyleplugin.h +++ b/src/widgets/styles/qstyleplugin.h @@ -58,7 +58,7 @@ struct Q_WIDGETS_EXPORT QStyleFactoryInterface : public QFactoryInterface virtual QStyle *create(const QString &key) = 0; }; -#define QStyleFactoryInterface_iid "com.trolltech.Qt.QStyleFactoryInterface" +#define QStyleFactoryInterface_iid "org.qt-project.Qt.QStyleFactoryInterface" Q_DECLARE_INTERFACE(QStyleFactoryInterface, QStyleFactoryInterface_iid) 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 |