From: Tobias Koenig <tobias.koenig@kdab.com>
Date: Fri, 2 Nov 2012 14:38:53 +0000 (+0100)
Subject: Remove modules from #include statements to be ready for Qt5
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=574844be2d3fd157ce9e1ad9166d021fbeb96182;p=web%2Fkonrad%2FDeclarativeWidgets.git

Remove modules from #include statements to be ready for Qt5
---

diff --git a/lib/declarativewidgetsdocument.cpp b/lib/declarativewidgetsdocument.cpp
index b1a067b..3cf683d 100644
--- a/lib/declarativewidgetsdocument.cpp
+++ b/lib/declarativewidgetsdocument.cpp
@@ -75,11 +75,11 @@
 #include "declarativewebview_p.h"
 #include "declarativewidget_p.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtDeclarative/QDeclarativeComponent>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDeclarativeComponent>
+#include <QDeclarativeContext>
+#include <QDeclarativeEngine>
 
 class DeclarativeWidgetsDocument::Private
 {
diff --git a/lib/declarativewidgetsdocument.h b/lib/declarativewidgetsdocument.h
index 8e7f3ea..2bb48fa 100644
--- a/lib/declarativewidgetsdocument.h
+++ b/lib/declarativewidgetsdocument.h
@@ -21,8 +21,8 @@
 #ifndef DECLARATIVEWIDGETSDOCUMENT_H
 #define DECLARATIVEWIDGETSDOCUMENT_H
 
-#include <QtCore/QObject>
-#include <QtCore/QUrl>
+#include <QObject>
+#include <QUrl>
 
 class QDeclarativeEngine;
 
diff --git a/lib/objectadaptors_p.h b/lib/objectadaptors_p.h
index e830ae9..13a65b5 100644
--- a/lib/objectadaptors_p.h
+++ b/lib/objectadaptors_p.h
@@ -21,16 +21,16 @@
 #ifndef OBJECTADAPTORS_P_H
 #define OBJECTADAPTORS_P_H
 
-#include <QtGui/QAction>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QColumnView>
-#include <QtGui/QFileDialog>
-#include <QtGui/QInputDialog>
-#include <QtGui/QListView>
-#include <QtGui/QStackedLayout>
-#include <QtGui/QTableView>
-#include <QtGui/QTextEdit>
-#include <QtGui/QTreeView>
+#include <QAction>
+#include <QButtonGroup>
+#include <QColumnView>
+#include <QFileDialog>
+#include <QInputDialog>
+#include <QListView>
+#include <QStackedLayout>
+#include <QTableView>
+#include <QTextEdit>
+#include <QTreeView>
 
 class ActionItem : public QObject
 {
diff --git a/lib/qmetaobjectbuilder_p.h b/lib/qmetaobjectbuilder_p.h
index 1e85353..1ab2bb8 100644
--- a/lib/qmetaobjectbuilder_p.h
+++ b/lib/qmetaobjectbuilder_p.h
@@ -53,12 +53,10 @@
 // We mean it.
 //
 
-#include <QtCore/qobject.h>
-#include <QtCore/qmetaobject.h>
-#include <QtCore/qdatastream.h>
-#include <QtCore/qmap.h>
-
-//#include <private/qdeclarativeglobal_p.h>
+#include <qobject.h>
+#include <qmetaobject.h>
+#include <qdatastream.h>
+#include <qmap.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/main.cpp b/main.cpp
index f8efb19..5531d0e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -20,14 +20,14 @@
 
 #include "declarativewidgetsdocument.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTimer>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtGui/QApplication>
-#include <QtGui/QFileSystemModel>
-#include <QtGui/QWidget>
+#include <QApplication>
 #include <QDebug>
+#include <QDeclarativeEngine>
+#include <QDir>
+#include <QFileInfo>
+#include <QFileSystemModel>
+#include <QTimer>
+#include <QWidget>
 
 int main(int argc, char **argv)
 {