Rename the QtMacExtras namespace to QtMac

Change-Id: If6a01685a9fc5ff59dd02dbeeef7e8682cefae39
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>

10 files changed, 29 insertions, 29 deletions

diff --git a/examples/macfunctions/main.cpp b/examples/macfunctions/main.cpp
index 43856fe..de77b08 100644
--- a/examples/macfunctions/main.cpp
+++ b/examples/macfunctions/main.cpp
@@ -57,12 +57,12 @@ int main(int argc, char **argv)
     QMenu menu;
     menu.addAction("Item 1");
     menu.addAction("Item 2");
-    QtMacExtras::setDockMenu(&menu);
+    QtMac::setDockMenu(&menu);
 
     // Pixmap <-> CGImage conversion
     QPixmap pixmap(":qtlogo.png");
-    CGImageRef cgImage = QtMacExtras::toCGImageRef(pixmap);
-    QPixmap pixmap2 = QtMacExtras::fromCGImageRef(cgImage);
+    CGImageRef cgImage = QtMac::toCGImageRef(pixmap);
+    QPixmap pixmap2 = QtMac::fromCGImageRef(cgImage);
 
     return app.exec();
 }
diff --git a/examples/macunifiedtoolbar/preferenceswindow.cpp b/examples/macunifiedtoolbar/preferenceswindow.cpp
index 488ef5f..4991023 100644
--- a/examples/macunifiedtoolbar/preferenceswindow.cpp
+++ b/examples/macunifiedtoolbar/preferenceswindow.cpp
@@ -55,7 +55,7 @@ PreferencesWindow::PreferencesWindow(QWidget *parent) :
         items->addAction(action);
 
     // This single line of code is all that's needed to transform a QToolBar into a native toolbar!
-    QtMacExtras::setNativeToolBar(ui->toolBar, ui->useNativeToolbarCheckBox->isChecked());
+    QtMac::setNativeToolBar(ui->toolBar, ui->useNativeToolbarCheckBox->isChecked());
 
     QTimer::singleShot(0, this, SLOT(pack()));
 }
@@ -91,7 +91,7 @@ void PreferencesWindow::toolbarItemTriggered()
 
 void PreferencesWindow::useNativeToolBarToggled(bool on)
 {
-    QtMacExtras::setNativeToolBar(ui->toolBar, on);
+    QtMac::setNativeToolBar(ui->toolBar, on);
     QTimer::singleShot(0, this, SLOT(pack()));
 }
 
diff --git a/src/macextras/qmacfunctions.h b/src/macextras/qmacfunctions.h
index d5972d1..2f794a9 100644
--- a/src/macextras/qmacfunctions.h
+++ b/src/macextras/qmacfunctions.h
@@ -68,7 +68,7 @@ class QUrl;
 class QWidget;
 class QWindow;
 
-namespace QtMacExtras
+namespace QtMac
 {
 Q_MACEXTRAS_EXPORT NSString* toNSString(const QString &string);
 Q_MACEXTRAS_EXPORT QString fromNSString(const NSString *string);
@@ -102,7 +102,7 @@ Q_MACEXTRAS_EXPORT bool isMainWindow(QWidget *widget);
 
 #ifndef Q_OS_IOS
 // ### Qt 4 compatibility; remove in Qt 6
-inline void qt_mac_set_dock_menu(QMenu *menu) { QtMacExtras::setDockMenu(menu); }
+inline void qt_mac_set_dock_menu(QMenu *menu) { QtMac::setDockMenu(menu); }
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/macextras/qmacfunctions.mm b/src/macextras/qmacfunctions.mm
index 3d36c0f..d5a6dd8 100644
--- a/src/macextras/qmacfunctions.mm
+++ b/src/macextras/qmacfunctions.mm
@@ -51,7 +51,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QtMacExtras
+namespace QtMac
 {
 
 NSString *toNSString(const QString &string)
@@ -141,6 +141,6 @@ QPixmap fromCGImageRef(CGImageRef image)
 #endif
 }
 
-} // namespace QtMacExtras
+} // namespace QtMac
 
 QT_END_NAMESPACE
diff --git a/src/macextras/qmacfunctions_ios.mm b/src/macextras/qmacfunctions_ios.mm
index ae09e1f..2ea718f 100644
--- a/src/macextras/qmacfunctions_ios.mm
+++ b/src/macextras/qmacfunctions_ios.mm
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QtMacExtras
+namespace QtMac
 {
 
 CGContextRef currentCGContext()
@@ -53,6 +53,6 @@ CGContextRef currentCGContext()
     return UIGraphicsGetCurrentContext();
 }
 
-} // namespace QtMacExtras
+} // namespace QtMac
 
 QT_END_NAMESPACE
diff --git a/src/macextras/qmacfunctions_mac.mm b/src/macextras/qmacfunctions_mac.mm
index 62949d3..bdb1cae 100644
--- a/src/macextras/qmacfunctions_mac.mm
+++ b/src/macextras/qmacfunctions_mac.mm
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QtMacExtras
+namespace QtMac
 {
 
 NSImage* toNSImage(const QPixmap &pixmap)
@@ -142,6 +142,6 @@ CGContextRef currentCGContext()
     return reinterpret_cast<CGContextRef>([[NSGraphicsContext currentContext] graphicsPort]);
 }
 
-} // namespace QtMacExtras
+} // namespace QtMac
 
 QT_END_NAMESPACE
diff --git a/src/macextras/qmacnativetoolbar.h b/src/macextras/qmacnativetoolbar.h
index 1ad9980..4c903cf 100644
--- a/src/macextras/qmacnativetoolbar.h
+++ b/src/macextras/qmacnativetoolbar.h
@@ -59,7 +59,7 @@ class QWidget;
 
 class QMacNativeToolBar;
 
-namespace QtMacExtras
+namespace QtMac
 {
 Q_MACEXTRAS_EXPORT QMacNativeToolBar* setNativeToolBar(QToolBar *toolbar, bool on = true);
 Q_MACEXTRAS_EXPORT QMacNativeToolBar* setNativeToolBar(QToolBar *toolbar, const QString &identifier, bool on = true);
diff --git a/src/macextras/qmacnativetoolbar.mm b/src/macextras/qmacnativetoolbar.mm
index 69fe7fe..f6b9020 100644
--- a/src/macextras/qmacnativetoolbar.mm
+++ b/src/macextras/qmacnativetoolbar.mm
@@ -142,7 +142,7 @@ public:
     QMacNativeToolBarPrivate(QMacNativeToolBar *parent, const QString &identifier = QString())
     {
         qtToolbar = parent;
-        toolbar = [[QtNSToolbar alloc] initWithIdentifier:QtMacExtras::toNSString(identifier.isEmpty() ? QUuid::createUuid().toString() : identifier)];
+        toolbar = [[QtNSToolbar alloc] initWithIdentifier:QtMac::toNSString(identifier.isEmpty() ? QUuid::createUuid().toString() : identifier)];
         [toolbar setAutosavesConfiguration:NO];
 
         delegate = [[QMacToolbarDelegate alloc] init];
@@ -190,12 +190,12 @@ public:
     }
 };
 
-QMacNativeToolBar* QtMacExtras::setNativeToolBar(QToolBar *toolbar, bool on)
+QMacNativeToolBar* QtMac::setNativeToolBar(QToolBar *toolbar, bool on)
 {
-    return QtMacExtras::setNativeToolBar(toolbar, QString(), on);
+    return QtMac::setNativeToolBar(toolbar, QString(), on);
 }
 
-QMacNativeToolBar* QtMacExtras::setNativeToolBar(QToolBar *toolbar, const QString &identifier, bool on)
+QMacNativeToolBar* QtMac::setNativeToolBar(QToolBar *toolbar, const QString &identifier, bool on)
 {
     if (!toolbar)
     {
@@ -271,7 +271,7 @@ QMacNativeToolBar *QMacNativeToolBar::fromQToolBar(const QToolBar *toolBar, cons
 
 QString QMacNativeToolBar::identifier() const
 {
-    return QtMacExtras::fromNSString([d->toolbar identifier]);
+    return QtMac::fromNSString([d->toolbar identifier]);
 }
 
 bool QMacNativeToolBar::isVisible() const
@@ -479,7 +479,7 @@ QAction *QMacNativeToolBar::setSelectedItem(QAction *action)
         {
             if (toolButton->m_action && toolButton->m_action->isChecked())
             {
-                [d->toolbar setSelectedItemIdentifier:QtMacExtras::toNSString(QString::number(qulonglong(toolButton)))];
+                [d->toolbar setSelectedItemIdentifier:QtMac::toNSString(QString::number(qulonglong(toolButton)))];
                 break;
             }
             else
diff --git a/src/macextras/qmactoolbardelegate.mm b/src/macextras/qmactoolbardelegate.mm
index 43fcfe8..2a76e00 100644
--- a/src/macextras/qmactoolbardelegate.mm
+++ b/src/macextras/qmactoolbardelegate.mm
@@ -51,7 +51,7 @@ NSArray *toNSArray(const QList<QString> &stringList)
 {
     NSMutableArray *array = [[NSMutableArray alloc] init];
     foreach (const QString &string, stringList) {
-        [array addObject : QtMacExtras::toNSString(string)];
+        [array addObject : QtMac::toNSString(string)];
     }
     return array;
 }
@@ -65,7 +65,7 @@ NSMutableArray *itemIdentifiers(const QList<QMacToolButton *> &items, bool cullU
         if (cullUnselectable && item->selectable() == false)
             continue;
         if (item->standardItem() == QMacToolButton::NoItem) {
-            [array addObject : QtMacExtras::toNSString(QString::number(qulonglong(item)))];
+            [array addObject : QtMac::toNSString(QString::number(qulonglong(item)))];
         } else {
             [array addObject : toNSStandardItem(item->standardItem())];
         }
@@ -114,7 +114,7 @@ QString qt_strippedText(QString s)
 - (IBAction)itemClicked:(id)sender
 {
     NSToolbarItem *item = reinterpret_cast<NSToolbarItem *>(sender);
-    QString identifier = QtMacExtras::fromNSString([item itemIdentifier]);
+    QString identifier = QtMac::fromNSString([item itemIdentifier]);
     QMacToolButton *toolButton = reinterpret_cast<QMacToolButton *>(identifier.toULongLong());
     if (toolButton->m_action) {
         toolButton->m_action->trigger();
@@ -126,17 +126,17 @@ QString qt_strippedText(QString s)
 {
     Q_UNUSED(toolbar);
     Q_UNUSED(willBeInserted);
-    const QString identifier = QtMacExtras::fromNSString(itemIdentifier);
+    const QString identifier = QtMac::fromNSString(itemIdentifier);
 
     QMacToolButton *toolButton = reinterpret_cast<QMacToolButton *>(identifier.toULongLong()); // string -> unisgned long long -> pointer
     NSToolbarItem *toolbarItem= [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdentifier] autorelease];
-    [toolbarItem setLabel: QtMacExtras::toNSString(qt_strippedText(toolButton->m_action->iconText()))];
+    [toolbarItem setLabel: QtMac::toNSString(qt_strippedText(toolButton->m_action->iconText()))];
     [toolbarItem setPaletteLabel:[toolbarItem label]];
-    [toolbarItem setToolTip: QtMacExtras::toNSString(toolButton->m_action->toolTip())];
+    [toolbarItem setToolTip: QtMac::toNSString(toolButton->m_action->toolTip())];
 
     QPixmap icon = toolButton->m_action->icon().pixmap(64, 64);
     if (icon.isNull() == false) {
-        [toolbarItem setImage : QtMacExtras::toNSImage(icon)];
+        [toolbarItem setImage : QtMac::toNSImage(icon)];
     }
 
     [toolbarItem setTarget : self];
diff --git a/tests/auto/macfunctions/tst_qmacfunctions.mm b/tests/auto/macfunctions/tst_qmacfunctions.mm
index e7a36e5..f34ed25 100644
--- a/tests/auto/macfunctions/tst_qmacfunctions.mm
+++ b/tests/auto/macfunctions/tst_qmacfunctions.mm
@@ -72,7 +72,7 @@ void tst_QMacFunctions::testToNSMenu()
     qMenu->addAction(action);
     window.menuBar()->addMenu(qMenu);
 
-    NSMenu *nsMenu = QtMacExtras::toNSMenu(qMenu);
+    NSMenu *nsMenu = QtMac::toNSMenu(qMenu);
     QVERIFY(nsMenu != NULL);
     QCOMPARE([[nsMenu title] UTF8String], "Menu");
 
@@ -80,7 +80,7 @@ void tst_QMacFunctions::testToNSMenu()
     QCOMPARE([[item title] UTF8String], "Item");
 
     // get NSMenu from QMenuBar
-    nsMenu = QtMacExtras::toNSMenu(window.menuBar());
+    nsMenu = QtMac::toNSMenu(window.menuBar());
     QVERIFY(nsMenu != NULL);
 
     // the first item should be our menu