diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-02-15 10:42:41 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-02-15 16:24:46 +0100 |
| commit | 3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8 (patch) | |
| tree | e31dbd1b4605530e59c9864166f155b4edabc721 /src/libs/aggregation | |
| parent | 9a9ba12028ab0a6b1a248be612d5c576d39f69d6 (diff) | |
Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/libs/aggregation')
| -rw-r--r-- | src/libs/aggregation/aggregate.cpp | 4 | ||||
| -rw-r--r-- | src/libs/aggregation/aggregate.h | 10 | ||||
| -rw-r--r-- | src/libs/aggregation/aggregation_global.h | 2 | ||||
| -rw-r--r-- | src/libs/aggregation/examples/text/main.cpp | 2 | ||||
| -rw-r--r-- | src/libs/aggregation/examples/text/main.h | 2 | ||||
| -rw-r--r-- | src/libs/aggregation/examples/text/myinterfaces.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp index 0bd0a6cc5b..4f28f2577b 100644 --- a/src/libs/aggregation/aggregate.cpp +++ b/src/libs/aggregation/aggregate.cpp @@ -32,8 +32,8 @@ #include "aggregate.h" -#include <QtCore/QWriteLocker> -#include <QtCore/QDebug> +#include <QWriteLocker> +#include <QDebug> /*! \namespace Aggregation diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h index 46d36afa16..ec9d158cc2 100644 --- a/src/libs/aggregation/aggregate.h +++ b/src/libs/aggregation/aggregate.h @@ -35,11 +35,11 @@ #include "aggregation_global.h" -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QHash> -#include <QtCore/QReadWriteLock> -#include <QtCore/QReadLocker> +#include <QObject> +#include <QList> +#include <QHash> +#include <QReadWriteLock> +#include <QReadLocker> namespace Aggregation { diff --git a/src/libs/aggregation/aggregation_global.h b/src/libs/aggregation/aggregation_global.h index f331f798ec..c65a4adc71 100644 --- a/src/libs/aggregation/aggregation_global.h +++ b/src/libs/aggregation/aggregation_global.h @@ -33,7 +33,7 @@ #ifndef AGGREGATION_GLOBAL_H #define AGGREGATION_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(AGGREGATION_LIBRARY) # define AGGREGATION_EXPORT Q_DECL_EXPORT diff --git a/src/libs/aggregation/examples/text/main.cpp b/src/libs/aggregation/examples/text/main.cpp index fda5deef10..ba50af8340 100644 --- a/src/libs/aggregation/examples/text/main.cpp +++ b/src/libs/aggregation/examples/text/main.cpp @@ -32,7 +32,7 @@ #include "main.h" -#include <QtGui/QApplication> +#include <QApplication> MyMain::MyMain(QWidget *parent, Qt::WFlags flags) : QWidget(parent, flags) diff --git a/src/libs/aggregation/examples/text/main.h b/src/libs/aggregation/examples/text/main.h index d6290e941a..09ab264a73 100644 --- a/src/libs/aggregation/examples/text/main.h +++ b/src/libs/aggregation/examples/text/main.h @@ -38,7 +38,7 @@ #include <aggregate.h> -#include <QtGui/QWidget> +#include <QWidget> class MyMain : public QWidget { diff --git a/src/libs/aggregation/examples/text/myinterfaces.h b/src/libs/aggregation/examples/text/myinterfaces.h index 686f997218..c01ffa9ab9 100644 --- a/src/libs/aggregation/examples/text/myinterfaces.h +++ b/src/libs/aggregation/examples/text/myinterfaces.h @@ -35,7 +35,7 @@ #include <aggregate.h> -#include <QtCore/QString> +#include <QString> class IComboEntry : public QObject { |