Rename Qt namespace to QtMacExtras

In-line with the common naming pattern for the platform
"extras".

Change-Id: I0335b62ebec090ecf3a387333ade13486b260299
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

5 files changed, 16 insertions, 15 deletions

diff --git a/examples/macfunctions/main.cpp b/examples/macfunctions/main.cpp
index 77f16a1..e95c1bc 100644
--- a/examples/macfunctions/main.cpp
+++ b/examples/macfunctions/main.cpp
@@ -61,8 +61,8 @@ int main(int argc, char **argv)
 
     // Pixmap <-> CGImage conversion
     QPixmap pixmap(":qtlogo.png");
-    CGImageRef cgImage = Qt::toMacCGImageRef(pixmap);
-    QPixmap pixmap2 = Qt::fromMacCGImageRef(cgImage);
+    CGImageRef cgImage = QtMacExtras::toMacCGImageRef(pixmap);
+    QPixmap pixmap2 = QtMacExtras::fromMacCGImageRef(cgImage);
 
     return app.exec();
 }
diff --git a/src/macextras/qtmacfunctions.h b/src/macextras/qmacfunctions.h
index cf8bcb8..6d2a72b 100644
--- a/src/macextras/qtmacfunctions.h
+++ b/src/macextras/qmacfunctions.h
@@ -71,7 +71,7 @@ class QString;
 Q_MACEXTRAS_EXPORT void qt_mac_set_dock_menu(QMenu *menu);
 #endif
 
-namespace Qt
+namespace QtMacExtras
 {
 Q_MACEXTRAS_EXPORT NSString* toNSString(const QString &string);
 Q_MACEXTRAS_EXPORT QString fromNSString(const NSString *string);
@@ -81,6 +81,7 @@ Q_MACEXTRAS_EXPORT QPixmap fromMacCGImageRef(CGImageRef image);
 #ifndef Q_OS_IOS
 Q_MACEXTRAS_EXPORT NSMenu* toNSMenu(QMenu *menu);
 Q_MACEXTRAS_EXPORT NSImage* toMacNSImage(const QPixmap &pixmap);
+Q_MACEXTRAS_EXPORT NSImage* toMacNSImage(const QPixmap &pixmap);
 #endif
 }
 
diff --git a/src/macextras/qtmacfunctions.mm b/src/macextras/qmacfunctions.mm
index 451e97b..2faa322 100644
--- a/src/macextras/qtmacfunctions.mm
+++ b/src/macextras/qmacfunctions.mm
@@ -98,7 +98,7 @@ NSMenu *toNSMenu(QMenu *menu)
 
 #endif
 
-namespace Qt
+namespace QtMacExtras
 {
 
 NSString *toNSString(const QString &string)
@@ -176,6 +176,6 @@ QPixmap fromMacCGImageRef(CGImageRef image)
 #endif
 }
 
-} // namespace Qt
+} // namespace QtMacExtras
 
 QT_END_NAMESPACE
diff --git a/src/macextras/qtmactoolbardelegate.mm b/src/macextras/qtmactoolbardelegate.mm
index 78ff9c2..d89341d 100644
--- a/src/macextras/qtmactoolbardelegate.mm
+++ b/src/macextras/qtmactoolbardelegate.mm
@@ -49,7 +49,7 @@ NSArray *toNSArray(const QList<QString> &stringList)
 {
     NSMutableArray *array = [[NSMutableArray alloc] init];
     foreach (const QString &string, stringList) {
-        [array addObject : Qt::toNSString(string)];
+        [array addObject : QtMacExtras::toNSString(string)];
     }
     return array;
 }
@@ -63,7 +63,7 @@ NSMutableArray *itemIdentifiers(const QList<QtMacToolButton *> &items, bool cull
         if (cullUnselectable && item->selectable() == false)
             continue;
         if (item->standardItem() == QtMacToolButton::NoItem) {
-            [array addObject : Qt::toNSString(QString::number(qulonglong(item)))];
+            [array addObject : QtMacExtras::toNSString(QString::number(qulonglong(item)))];
         } else {
             [array addObject : toNSStandardItem(item->standardItem())];
         }
@@ -112,7 +112,7 @@ QString qt_strippedText(QString s)
 - (IBAction)itemClicked:(id)sender
 {
     NSToolbarItem *item = reinterpret_cast<NSToolbarItem *>(sender);
-    QString identifier = Qt::fromNSString([item itemIdentifier]);
+    QString identifier = QtMacExtras::fromNSString([item itemIdentifier]);
     QtMacToolButton *toolButton = reinterpret_cast<QtMacToolButton *>(identifier.toULongLong());
     if (toolButton->m_action) {
         toolButton->m_action->trigger();
@@ -124,17 +124,17 @@ QString qt_strippedText(QString s)
 {
     Q_UNUSED(toolbar);
     Q_UNUSED(willBeInserted);
-    const QString identifier = Qt::fromNSString(itemIdentifier);
+    const QString identifier = QtMacExtras::fromNSString(itemIdentifier);
 
     QtMacToolButton *toolButton = reinterpret_cast<QtMacToolButton *>(identifier.toULongLong()); // string -> unisgned long long -> pointer
     NSToolbarItem *toolbarItem= [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdentifier] autorelease];
-    [toolbarItem setLabel: Qt::toNSString(qt_strippedText(toolButton->m_action->iconText()))];
+    [toolbarItem setLabel: QtMacExtras::toNSString(qt_strippedText(toolButton->m_action->iconText()))];
     [toolbarItem setPaletteLabel:[toolbarItem label]];
-    [toolbarItem setToolTip: Qt::toNSString(toolButton->m_action->toolTip())];
+    [toolbarItem setToolTip: QtMacExtras::toNSString(toolButton->m_action->toolTip())];
 
     QPixmap icon = toolButton->m_action->icon().pixmap(64, 64);
     if (icon.isNull() == false) {
-        [toolbarItem setImage : Qt::toMacNSImage(icon)];
+        [toolbarItem setImage : QtMacExtras::toMacNSImage(icon)];
     }
 
     [toolbarItem setTarget : self];
diff --git a/src/macextras/qtmacunifiedtoolbar.mm b/src/macextras/qtmacunifiedtoolbar.mm
index 3763e0e..a46c742 100644
--- a/src/macextras/qtmacunifiedtoolbar.mm
+++ b/src/macextras/qtmacunifiedtoolbar.mm
@@ -132,7 +132,7 @@ public:
     QtMacUnifiedToolBarPrivate(QtMacUnifiedToolBar *parent, const QString &identifier = QString())
     {
         qtToolbar = parent;
-        toolbar = [[QtNSToolbar alloc] initWithIdentifier:Qt::toNSString(identifier.isEmpty() ? QUuid::createUuid().toString() : identifier)];
+        toolbar = [[QtNSToolbar alloc] initWithIdentifier:QtMacExtras::toNSString(identifier.isEmpty() ? QUuid::createUuid().toString() : identifier)];
         [toolbar setAutosavesConfiguration:NO];
 
         delegate = [[QtMacToolbarDelegate alloc] init];
@@ -279,7 +279,7 @@ QtMacUnifiedToolBar *QtMacUnifiedToolBar::fromQToolBar(const QToolBar *toolBar,
 
 QString QtMacUnifiedToolBar::identifier() const
 {
-    return Qt::fromNSString([d->toolbar identifier]);
+    return QtMacExtras::fromNSString([d->toolbar identifier]);
 }
 
 bool QtMacUnifiedToolBar::isVisible() const
@@ -487,7 +487,7 @@ QAction *QtMacUnifiedToolBar::setSelectedItem(QAction *action)
         {
             if (toolButton->m_action && toolButton->m_action->isChecked())
             {
-                [d->toolbar setSelectedItemIdentifier:Qt::toNSString(QString::number(qulonglong(toolButton)))];
+                [d->toolbar setSelectedItemIdentifier:QtMacExtras::toNSString(QString::number(qulonglong(toolButton)))];
                 break;
             }
             else