aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2013-04-10 09:52:51 +0200
committerMorten Johan Sørvig <morten.sorvig@digia.com>2013-04-11 08:14:02 +0200
commitb6b8c79dd96d9ec8795062e757b7cb0b491b481a (patch)
tree892100cfecade61b7829e5b31e7963df785a0f5a
parentb661907f9afdbb10b95fc00e58581817a94b22e5 (diff)
Rename files: qtfoo -> qfoo
Change-Id: I9951164716550fe6a656af32c79be3e9812625bf Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
-rw-r--r--examples/macunifiedtoolbar/preferenceswindow.cpp2
-rw-r--r--examples/macunifiedtoolbar/window.cpp2
-rw-r--r--examples/macunifiedtoolbar/window.h2
-rw-r--r--examples/qtmacnativewidget/main.mm2
-rw-r--r--src/macextras/macextras-lib.pri26
-rw-r--r--src/macextras/qmaccocoaviewcontainer.h (renamed from src/macextras/qtmaccocoaviewcontainer.h)6
-rw-r--r--src/macextras/qmaccocoaviewcontainer.mm (renamed from src/macextras/qtmaccocoaviewcontainer.mm)2
-rw-r--r--src/macextras/qmacfunctions.h6
-rw-r--r--src/macextras/qmacnativewidget.h (renamed from src/macextras/qtmacnativewidget.h)6
-rw-r--r--src/macextras/qmacnativewidget.mm (renamed from src/macextras/qtmacnativewidget.mm)2
-rw-r--r--src/macextras/qmactoolbardelegate.h (renamed from src/macextras/qtmactoolbardelegate.h)6
-rw-r--r--src/macextras/qmactoolbardelegate.mm (renamed from src/macextras/qtmactoolbardelegate.mm)2
-rw-r--r--src/macextras/qmactoolbutton.h (renamed from src/macextras/qtmactoolbutton.h)4
-rw-r--r--src/macextras/qmactoolbutton.mm (renamed from src/macextras/qtmactoolbutton.mm)2
-rw-r--r--src/macextras/qmacunifiedtoolbar.cpp (renamed from src/macextras/qtmacunifiedtoolbar.cpp)0
-rw-r--r--src/macextras/qmacunifiedtoolbar.h (renamed from src/macextras/qtmacunifiedtoolbar.h)6
-rw-r--r--src/macextras/qmacunifiedtoolbar.mm (renamed from src/macextras/qtmacunifiedtoolbar.mm)6
-rw-r--r--src/macextras/qnstoolbar.h (renamed from src/macextras/qtnstoolbar.h)6
-rw-r--r--src/macextras/qnstoolbar.mm (renamed from src/macextras/qtnstoolbar.mm)2
19 files changed, 45 insertions, 45 deletions
diff --git a/examples/macunifiedtoolbar/preferenceswindow.cpp b/examples/macunifiedtoolbar/preferenceswindow.cpp
index 3cce517..28bd7d0 100644
--- a/examples/macunifiedtoolbar/preferenceswindow.cpp
+++ b/examples/macunifiedtoolbar/preferenceswindow.cpp
@@ -41,7 +41,7 @@
#include "preferenceswindow.h"
#include "ui_preferenceswindow.h"
-#include "qtmacunifiedtoolbar.h"
+#include "qmacunifiedtoolbar.h"
#include <QTimer>
PreferencesWindow::PreferencesWindow(QWidget *parent) :
diff --git a/examples/macunifiedtoolbar/window.cpp b/examples/macunifiedtoolbar/window.cpp
index 3f8243e..da33cdb 100644
--- a/examples/macunifiedtoolbar/window.cpp
+++ b/examples/macunifiedtoolbar/window.cpp
@@ -42,7 +42,7 @@
#include "window.h"
#include "ui_window.h"
#include "preferenceswindow.h"
-#include "qtmacunifiedtoolbar.h"
+#include "qmacunifiedtoolbar.h"
#include <QDesktopWidget>
#include <QMenuBar>
#include <QTimer>
diff --git a/examples/macunifiedtoolbar/window.h b/examples/macunifiedtoolbar/window.h
index 30f547a..bb0a249 100644
--- a/examples/macunifiedtoolbar/window.h
+++ b/examples/macunifiedtoolbar/window.h
@@ -43,7 +43,7 @@
#define WINDOW_H
#include <QWidget>
-#include "qtmactoolbutton.h"
+#include "qmactoolbutton.h"
namespace Ui {
class Window;
diff --git a/examples/qtmacnativewidget/main.mm b/examples/qtmacnativewidget/main.mm
index 621e306..22d0957 100644
--- a/examples/qtmacnativewidget/main.mm
+++ b/examples/qtmacnativewidget/main.mm
@@ -48,7 +48,7 @@
#include <QVBoxLayout>
#include <QWidget>
#include <Cocoa/Cocoa.h>
-#include <qtmacnativewidget.h>
+#include <qmacnativewidget.h>
class RedWidget : public QWidget
{
diff --git a/src/macextras/macextras-lib.pri b/src/macextras/macextras-lib.pri
index 7994039..2c2f5ef 100644
--- a/src/macextras/macextras-lib.pri
+++ b/src/macextras/macextras-lib.pri
@@ -7,22 +7,22 @@ mac {
macx:!ios {
PUBLIC_HEADERS += \
- $$PWD/qtmaccocoaviewcontainer.h \
- $$PWD/qtmacnativewidget.h \
- $$PWD/qtmactoolbutton.h \
- $$PWD/qtmacunifiedtoolbar.h
+ $$PWD/qmaccocoaviewcontainer.h \
+ $$PWD/qmacnativewidget.h \
+ $$PWD/qmactoolbutton.h \
+ $$PWD/qmacunifiedtoolbar.h
PRIVATE_HEADERS += \
- $$PWD/qtmactoolbardelegate.h \
- $$PWD/qtnstoolbar.h
+ $$PWD/qmactoolbardelegate.h \
+ $$PWD/qnstoolbar.h
OBJECTIVE_SOURCES += \
- $$PWD/qtmaccocoaviewcontainer.mm \
- $$PWD/qtmacnativewidget.mm \
- $$PWD/qtmactoolbardelegate.mm \
- $$PWD/qtmactoolbutton.mm \
- $$PWD/qtmacunifiedtoolbar.mm \
- $$PWD/qtnstoolbar.mm
+ $$PWD/qmaccocoaviewcontainer.mm \
+ $$PWD/qmacnativewidget.mm \
+ $$PWD/qmactoolbardelegate.mm \
+ $$PWD/qmactoolbutton.mm \
+ $$PWD/qmacunifiedtoolbar.mm \
+ $$PWD/qnstoolbar.mm
greaterThan(QT_MAJOR_VERSION, 4) {
PUBLIC_HEADERS += $$PWD/qmacpasteboardmime.h
@@ -31,7 +31,7 @@ macx:!ios {
LIBS *= -framework AppKit
} else {
- SOURCES += $$PWD/qtmacunifiedtoolbar.cpp
+ SOURCES += $$PWD/qmacunifiedtoolbar.cpp
}
HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
diff --git a/src/macextras/qtmaccocoaviewcontainer.h b/src/macextras/qmaccocoaviewcontainer.h
index 42a3055..a9c3301 100644
--- a/src/macextras/qtmaccocoaviewcontainer.h
+++ b/src/macextras/qmaccocoaviewcontainer.h
@@ -38,8 +38,8 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#ifndef QTMACCOCOAVIEWCONTAINER_H
-#define QTMACCOCOAVIEWCONTAINER_H
+#ifndef QMACCOCOAVIEWCONTAINER_H
+#define QMACCOCOAVIEWCONTAINER_H
#include "qmacextrasglobal.h"
@@ -74,5 +74,5 @@ QT_END_NAMESPACE
QT_END_HEADER
-#endif // QTMACCOCOAVIEWCONTAINER_H
+#endif // QMACCOCOAVIEWCONTAINER_H
diff --git a/src/macextras/qtmaccocoaviewcontainer.mm b/src/macextras/qmaccocoaviewcontainer.mm
index 7dcd3c1..dd685d4 100644
--- a/src/macextras/qtmaccocoaviewcontainer.mm
+++ b/src/macextras/qmaccocoaviewcontainer.mm
@@ -41,7 +41,7 @@
#import <Cocoa/Cocoa.h>
-#include "qtmaccocoaviewcontainer.h"
+#include "qmaccocoaviewcontainer.h"
#include <qpa/qplatformnativeinterface.h>
#include <QtGui/QWindow>
diff --git a/src/macextras/qmacfunctions.h b/src/macextras/qmacfunctions.h
index 6d2a72b..7b3bd51 100644
--- a/src/macextras/qmacfunctions.h
+++ b/src/macextras/qmacfunctions.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QTMACFUNCTIONS_H
-#define QTMACFUNCTIONS_H
+#ifndef QMACFUNCTIONS_H
+#define QMACFUNCTIONS_H
#if 0
#pragma qt_class(QtMacFunctions)
@@ -87,4 +87,4 @@ Q_MACEXTRAS_EXPORT NSImage* toMacNSImage(const QPixmap &pixmap);
QT_END_NAMESPACE
-#endif //QTMACFUNCTIONS
+#endif //QMACFUNCTIONS
diff --git a/src/macextras/qtmacnativewidget.h b/src/macextras/qmacnativewidget.h
index 61d9314..d28a8d3 100644
--- a/src/macextras/qtmacnativewidget.h
+++ b/src/macextras/qmacnativewidget.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QTMACNATIVEWIDGET_H
-#define QTMACNATIVEWIDGET_H
+#ifndef QMACNATIVEWIDGET_H
+#define QMACNATIVEWIDGET_H
#include "qmacextrasglobal.h"
@@ -78,4 +78,4 @@ QT_END_NAMESPACE
QT_END_HEADER
-#endif // QTMACNATIVEWIDGET_H
+#endif // QMACNATIVEWIDGET_H
diff --git a/src/macextras/qtmacnativewidget.mm b/src/macextras/qmacnativewidget.mm
index c1cabb4..2723b68 100644
--- a/src/macextras/qtmacnativewidget.mm
+++ b/src/macextras/qmacnativewidget.mm
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qtmacnativewidget.h"
+#include "qmacnativewidget.h"
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <QtGui/QWindow>
#include <QtGui/QGuiApplication>
diff --git a/src/macextras/qtmactoolbardelegate.h b/src/macextras/qmactoolbardelegate.h
index 9b872b2..f6ce541 100644
--- a/src/macextras/qtmactoolbardelegate.h
+++ b/src/macextras/qmactoolbardelegate.h
@@ -39,11 +39,11 @@
**
****************************************************************************/
-#ifndef QTMACTOOLBARDELEGATE_H
-#define QTMACTOOLBARDELEGATE_H
+#ifndef QMACTOOLBARDELEGATE_H
+#define QMACTOOLBARDELEGATE_H
#import <AppKit/AppKit.h>
-#include "qtmactoolbutton.h"
+#include "qmactoolbutton.h"
//#include <QString>
//#include <QHash>
diff --git a/src/macextras/qtmactoolbardelegate.mm b/src/macextras/qmactoolbardelegate.mm
index 183e5f6..4a5d712 100644
--- a/src/macextras/qtmactoolbardelegate.mm
+++ b/src/macextras/qmactoolbardelegate.mm
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qmacfunctions.h"
-#include "qtmactoolbardelegate.h"
+#include "qmactoolbardelegate.h"
#include <QAction>
#include <QImage>
#include <QPixmap>
diff --git a/src/macextras/qtmactoolbutton.h b/src/macextras/qmactoolbutton.h
index 363df38..d08263e 100644
--- a/src/macextras/qtmactoolbutton.h
+++ b/src/macextras/qmactoolbutton.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QTMACTOOLBUTTON_H
-#define QTMACTOOLBUTTON_H
+#ifndef QMACTOOLBUTTON_H
+#define QMACTOOLBUTTON_H
#include <QObject>
diff --git a/src/macextras/qtmactoolbutton.mm b/src/macextras/qmactoolbutton.mm
index 6b013e7..c1db1c8 100644
--- a/src/macextras/qtmactoolbutton.mm
+++ b/src/macextras/qmactoolbutton.mm
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qtmactoolbutton.h"
+#include "qmactoolbutton.h"
#include <QAction>
QMacToolButton::QMacToolButton()
diff --git a/src/macextras/qtmacunifiedtoolbar.cpp b/src/macextras/qmacunifiedtoolbar.cpp
index 06b815a..06b815a 100644
--- a/src/macextras/qtmacunifiedtoolbar.cpp
+++ b/src/macextras/qmacunifiedtoolbar.cpp
diff --git a/src/macextras/qtmacunifiedtoolbar.h b/src/macextras/qmacunifiedtoolbar.h
index 37bc540..9eaf77a 100644
--- a/src/macextras/qtmacunifiedtoolbar.h
+++ b/src/macextras/qmacunifiedtoolbar.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QTMACTOOLBAR_H
-#define QTMACTOOLBAR_H
+#ifndef QMACTOOLBAR_H
+#define QMACTOOLBAR_H
#include "qmacextrasglobal.h"
@@ -53,7 +53,7 @@ class QMacUnifiedToolBar;
Q_MACEXTRAS_EXPORT QMacUnifiedToolBar* setUnifiedTitleAndToolBarOnMac(QToolBar *toolbar, bool on = true);
Q_MACEXTRAS_EXPORT QMacUnifiedToolBar* setUnifiedTitleAndToolBarOnMac(QToolBar *toolbar, const QString &identifier, bool on = true);
-#include "qtmactoolbutton.h"
+#include "qmactoolbutton.h"
#include <QObject>
#include <QIcon>
#include <QVariant>
diff --git a/src/macextras/qtmacunifiedtoolbar.mm b/src/macextras/qmacunifiedtoolbar.mm
index 79e9b76..38e09d8 100644
--- a/src/macextras/qtmacunifiedtoolbar.mm
+++ b/src/macextras/qmacunifiedtoolbar.mm
@@ -40,9 +40,9 @@
****************************************************************************/
#include "qmacfunctions.h"
-#include "qtmacunifiedtoolbar.h"
-#include "qtmactoolbardelegate.h"
-#include "qtnstoolbar.h"
+#include "qmacunifiedtoolbar.h"
+#include "qmactoolbardelegate.h"
+#include "qnstoolbar.h"
#include <QAction>
#include <QApplication>
#include <QDebug>
diff --git a/src/macextras/qtnstoolbar.h b/src/macextras/qnstoolbar.h
index 3bf3f10..b27202c 100644
--- a/src/macextras/qtnstoolbar.h
+++ b/src/macextras/qnstoolbar.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QTNSTOOLBAR_H
-#define QTNSTOOLBAR_H
+#ifndef QNSTOOLBAR_H
+#define QNSTOOLBAR_H
#include <AppKit/NSToolbar.h>
@@ -54,4 +54,4 @@ extern NSString *QtNSToolbarVisibilityChangedNotification;
@end
-#endif // QTNSTOOLBAR_H
+#endif // QNSTOOLBAR_H
diff --git a/src/macextras/qtnstoolbar.mm b/src/macextras/qnstoolbar.mm
index 15c45e4..dc6ef64 100644
--- a/src/macextras/qtnstoolbar.mm
+++ b/src/macextras/qnstoolbar.mm
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#import "qtnstoolbar.h"
+#import "qnstoolbar.h"
NSString *QtNSToolbarDisplayModeChangedNotification = @"QtNSToolbarDisplayModeChangedNotification";
NSString *QtNSToolbarShowsBaselineSeparatorChangedNotification = @"QtNSToolbarShowsBaselineSeparatorChangedNotification";