Rename QtMacFunctions -> QMacFunctions

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

3 files changed, 10 insertions, 95 deletions

diff --git a/tests/auto/macfunctions/macfunctions.pro b/tests/auto/macfunctions/macfunctions.pro
index eee725f..78b094f 100644
--- a/tests/auto/macfunctions/macfunctions.pro
+++ b/tests/auto/macfunctions/macfunctions.pro
@@ -1,6 +1,6 @@
 CONFIG += testcase console
 CONFIG -= app_bundle
-TARGET = tst_qtmacfunctions
+TARGET = tst_qmacfunctions
 QT += macextras widgets testlib
-OBJECTIVE_SOURCES += tst_qtmacfunctions.mm
+OBJECTIVE_SOURCES += tst_qmacfunctions.mm
 LIBS *= -framework AppKit
diff --git a/tests/auto/macfunctions/tst_qmacfunctions.mm b/tests/auto/macfunctions/tst_qmacfunctions.mm
index eab6683..12b9327 100644
--- a/tests/auto/macfunctions/tst_qmacfunctions.mm
+++ b/tests/auto/macfunctions/tst_qmacfunctions.mm
@@ -45,26 +45,26 @@
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QMenuBar>
 #include <QtWidgets/QMainWindow>
-#include <qtmacfunctions.h>
+#include <qmacfunctions.h>
 
 #import <AppKit/AppKit.h>
 
-class tst_QtMacFunctions : public QObject
+class tst_QMacFunctions : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QtMacFunctions();
+    tst_QMacFunctions();
 
 private slots:
     void testQMenuToNSMenu();
 };
 
-tst_QtMacFunctions::tst_QtMacFunctions()
+tst_QMacFunctions::tst_QMacFunctions()
 {
 }
 
-void tst_QtMacFunctions::testQMenuToNSMenu()
+void tst_QMacFunctions::testQMenuToNSMenu()
 {
     QMainWindow window;
     QMenu *qMenu = new QMenu("Menu", &window);
@@ -72,7 +72,7 @@ void tst_QtMacFunctions::testQMenuToNSMenu()
     qMenu->addAction(action);
     window.menuBar()->addMenu(qMenu);
 
-    NSMenu *nsMenu = toNSMenu(qMenu);
+    NSMenu *nsMenu = QtMacExtras::toNSMenu(qMenu);
     QVERIFY(nsMenu != NULL);
     QCOMPARE([[nsMenu title] UTF8String], "Menu");
 
@@ -80,6 +80,6 @@ void tst_QtMacFunctions::testQMenuToNSMenu()
     QCOMPARE([[item title] UTF8String], "Item");
 }
 
-QTEST_MAIN(tst_QtMacFunctions)
+QTEST_MAIN(tst_QMacFunctions)
 
-#include "tst_qtmacfunctions.moc"
+#include "tst_qmacfunctions.moc"
diff --git a/tests/auto/macfunctions/tst_qtmacfunctions.mm b/tests/auto/macfunctions/tst_qtmacfunctions.mm
deleted file mode 100644
index eab6683..0000000
--- a/tests/auto/macfunctions/tst_qtmacfunctions.mm
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 froglogic GmbH and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtMacExtras module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QString>
-#include <QtTest>
-#include <QCoreApplication>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QMainWindow>
-#include <qtmacfunctions.h>
-
-#import <AppKit/AppKit.h>
-
-class tst_QtMacFunctions : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_QtMacFunctions();
-
-private slots:
-    void testQMenuToNSMenu();
-};
-
-tst_QtMacFunctions::tst_QtMacFunctions()
-{
-}
-
-void tst_QtMacFunctions::testQMenuToNSMenu()
-{
-    QMainWindow window;
-    QMenu *qMenu = new QMenu("Menu", &window);
-    QAction *action = new QAction("&Item", &window);
-    qMenu->addAction(action);
-    window.menuBar()->addMenu(qMenu);
-
-    NSMenu *nsMenu = toNSMenu(qMenu);
-    QVERIFY(nsMenu != NULL);
-    QCOMPARE([[nsMenu title] UTF8String], "Menu");
-
-    NSMenuItem *item = [nsMenu itemAtIndex:0];
-    QCOMPARE([[item title] UTF8String], "Item");
-}
-
-QTEST_MAIN(tst_QtMacFunctions)
-
-#include "tst_qtmacfunctions.moc"