diff options
author | Jonathan Liu <net147@gmail.com> | 2012-12-28 20:42:13 +1100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-12-29 20:20:47 +0100 |
commit | 534707f5288181af50a5f560a0a26601fdd01531 (patch) | |
tree | a51f2be5403280469424e8d8556ff0812a6e7d05 /qtsingleapplication | |
parent | 59cd338c351d444cf727ae59372121abebbbec4e (diff) |
Remove module prefix from includes
The module prefix is not needed and removing it adds compatibility
with Qt 5 which has classes moved into different modules.
Change-Id: I20823be670d78ba6cc8eb0e5de1f4f3b6fa2edb6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'qtsingleapplication')
-rw-r--r-- | qtsingleapplication/examples/console/main.cpp | 2 | ||||
-rw-r--r-- | qtsingleapplication/examples/loader/main.cpp | 14 | ||||
-rw-r--r-- | qtsingleapplication/examples/trivial/main.cpp | 2 | ||||
-rw-r--r-- | qtsingleapplication/src/qtlocalpeer.cpp | 8 | ||||
-rw-r--r-- | qtsingleapplication/src/qtlocalpeer.h | 6 | ||||
-rw-r--r-- | qtsingleapplication/src/qtlockedfile.h | 4 | ||||
-rw-r--r-- | qtsingleapplication/src/qtlockedfile_win.cpp | 2 | ||||
-rw-r--r-- | qtsingleapplication/src/qtsingleapplication.cpp | 2 | ||||
-rw-r--r-- | qtsingleapplication/src/qtsingleapplication.h | 2 | ||||
-rw-r--r-- | qtsingleapplication/src/qtsinglecoreapplication.h | 2 |
10 files changed, 22 insertions, 22 deletions
diff --git a/qtsingleapplication/examples/console/main.cpp b/qtsingleapplication/examples/console/main.cpp index 36a8494..cdeaa8f 100644 --- a/qtsingleapplication/examples/console/main.cpp +++ b/qtsingleapplication/examples/console/main.cpp @@ -40,7 +40,7 @@ #include "qtsinglecoreapplication.h" -#include <QtCore/QDebug> +#include <QDebug> void report(const QString& msg) diff --git a/qtsingleapplication/examples/loader/main.cpp b/qtsingleapplication/examples/loader/main.cpp index 9686f21..6103abf 100644 --- a/qtsingleapplication/examples/loader/main.cpp +++ b/qtsingleapplication/examples/loader/main.cpp @@ -39,13 +39,13 @@ ****************************************************************************/ #include <qtsingleapplication.h> -#include <QtCore/QFile> -#include <QtGui/QMainWindow> -#include <QtGui/QPrinter> -#include <QtGui/QPainter> -#include <QtGui/QTextEdit> -#include <QtGui/QMdiArea> -#include <QtCore/QTextStream> +#include <QFile> +#include <QMainWindow> +#include <QPrinter> +#include <QPainter> +#include <QTextEdit> +#include <QMdiArea> +#include <QTextStream> class MainWindow : public QMainWindow { diff --git a/qtsingleapplication/examples/trivial/main.cpp b/qtsingleapplication/examples/trivial/main.cpp index 4b6b00f..47a9c09 100644 --- a/qtsingleapplication/examples/trivial/main.cpp +++ b/qtsingleapplication/examples/trivial/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include <qtsingleapplication.h> -#include <QtGui/QTextEdit> +#include <QTextEdit> class TextEdit : public QTextEdit { diff --git a/qtsingleapplication/src/qtlocalpeer.cpp b/qtsingleapplication/src/qtlocalpeer.cpp index a2e8383..7fbe804 100644 --- a/qtsingleapplication/src/qtlocalpeer.cpp +++ b/qtsingleapplication/src/qtlocalpeer.cpp @@ -40,12 +40,12 @@ #include "qtlocalpeer.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QTime> +#include <QCoreApplication> +#include <QTime> #if defined(Q_OS_WIN) -#include <QtCore/QLibrary> -#include <QtCore/qt_windows.h> +#include <QLibrary> +#include <qt_windows.h> typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*); static PProcessIdToSessionId pProcessIdToSessionId = 0; #endif diff --git a/qtsingleapplication/src/qtlocalpeer.h b/qtsingleapplication/src/qtlocalpeer.h index 2d95a95..e601f82 100644 --- a/qtsingleapplication/src/qtlocalpeer.h +++ b/qtsingleapplication/src/qtlocalpeer.h @@ -41,9 +41,9 @@ #ifndef QTLOCALPEER_H #define QTLOCALPEER_H -#include <QtNetwork/QLocalServer> -#include <QtNetwork/QLocalSocket> -#include <QtCore/QDir> +#include <QLocalServer> +#include <QLocalSocket> +#include <QDir> #include "qtlockedfile.h" diff --git a/qtsingleapplication/src/qtlockedfile.h b/qtsingleapplication/src/qtlockedfile.h index 3fe9f43..9c4b9e2 100644 --- a/qtsingleapplication/src/qtlockedfile.h +++ b/qtsingleapplication/src/qtlockedfile.h @@ -41,9 +41,9 @@ #ifndef QTLOCKEDFILE_H #define QTLOCKEDFILE_H -#include <QtCore/QFile> +#include <QFile> #ifdef Q_OS_WIN -#include <QtCore/QVector> +#include <QVector> #endif #if defined(Q_WS_WIN) diff --git a/qtsingleapplication/src/qtlockedfile_win.cpp b/qtsingleapplication/src/qtlockedfile_win.cpp index b527eef..d9bcd44 100644 --- a/qtsingleapplication/src/qtlockedfile_win.cpp +++ b/qtsingleapplication/src/qtlockedfile_win.cpp @@ -40,7 +40,7 @@ #include "qtlockedfile.h" #include <qt_windows.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> #define MUTEX_PREFIX "QtLockedFile mutex " // Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS diff --git a/qtsingleapplication/src/qtsingleapplication.cpp b/qtsingleapplication/src/qtsingleapplication.cpp index 4a9a1e6..b5cfc2a 100644 --- a/qtsingleapplication/src/qtsingleapplication.cpp +++ b/qtsingleapplication/src/qtsingleapplication.cpp @@ -41,7 +41,7 @@ #include "qtsingleapplication.h" #include "qtlocalpeer.h" -#include <QtGui/QWidget> +#include <QWidget> /*! diff --git a/qtsingleapplication/src/qtsingleapplication.h b/qtsingleapplication/src/qtsingleapplication.h index 8980076..9ae0543 100644 --- a/qtsingleapplication/src/qtsingleapplication.h +++ b/qtsingleapplication/src/qtsingleapplication.h @@ -41,7 +41,7 @@ #ifndef QTSINGLEAPPLICATION_H #define QTSINGLEAPPLICATION_H -#include <QtGui/QApplication> +#include <QApplication> class QtLocalPeer; diff --git a/qtsingleapplication/src/qtsinglecoreapplication.h b/qtsingleapplication/src/qtsinglecoreapplication.h index c305c47..a9dc5b2 100644 --- a/qtsingleapplication/src/qtsinglecoreapplication.h +++ b/qtsingleapplication/src/qtsinglecoreapplication.h @@ -41,7 +41,7 @@ #ifndef QTSINGLECOREAPPLICATION_H #define QTSINGLECOREAPPLICATION_H -#include <QtCore/QCoreApplication> +#include <QCoreApplication> class QtLocalPeer; |