From 6463881156d05b0e39bbca91f2d0c5892b0a9368 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Fri, 1 Feb 2013 09:34:41 +0100
Subject: QtDBus-tools: Remove module includes.

Change-Id: I4b6754c7bd513a2c479c52a0428bd7eee857c6ca
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
 src/qdbus/qdbus/qdbus.cpp             | 8 +++++++-
 src/qdbus/qdbusviewer/qdbusmodel.cpp  | 6 +++++-
 src/qdbus/qdbusviewer/qdbusmodel.h    | 3 ++-
 src/qdbus/qdbusviewer/qdbusviewer.cpp | 5 ++++-
 src/qdbus/qdbusviewer/qdbusviewer.h   | 2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/qdbus/qdbus/qdbus.cpp b/src/qdbus/qdbus/qdbus.cpp
index b92cb92b8..0349c6008 100644
--- a/src/qdbus/qdbus/qdbus.cpp
+++ b/src/qdbus/qdbus/qdbus.cpp
@@ -47,7 +47,13 @@
 #include <QtCore/qmetaobject.h>
 #include <QtXml/QDomDocument>
 #include <QtXml/QDomElement>
-#include <QtDBus/QtDBus>
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusConnectionInterface>
+#include <QtDBus/QDBusVariant>
+#include <QtDBus/QDBusArgument>
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusReply>
 #include <private/qdbusutil_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/qdbus/qdbusviewer/qdbusmodel.cpp b/src/qdbus/qdbusviewer/qdbusmodel.cpp
index 8fe0fed3e..558effd61 100644
--- a/src/qdbus/qdbusviewer/qdbusmodel.cpp
+++ b/src/qdbus/qdbusviewer/qdbusmodel.cpp
@@ -42,7 +42,11 @@
 #include "qdbusmodel.h"
 
 #include <QtCore/qvector.h>
-#include <QtXml/QtXml>
+#include <QtCore/QDebug>
+#include <QtXml/QDomDocument>
+#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusReply>
 
 struct QDBusItem
 {
diff --git a/src/qdbus/qdbusviewer/qdbusmodel.h b/src/qdbus/qdbusviewer/qdbusmodel.h
index a00dffaa3..9a3472366 100644
--- a/src/qdbus/qdbusviewer/qdbusmodel.h
+++ b/src/qdbus/qdbusviewer/qdbusmodel.h
@@ -43,12 +43,13 @@
 #define QDBUSMODEL_H
 
 #include <QtCore/qabstractitemmodel.h>
-#include <QtDBus/QtDBus>
+#include <QtDBus/QDBusConnection>
 
 struct QDBusItem;
 
 QT_FORWARD_DECLARE_CLASS(QDomDocument);
 QT_FORWARD_DECLARE_CLASS(QDomElement);
+QT_FORWARD_DECLARE_CLASS(QDBusObjectPath)
 
 
 class QDBusModel: public QAbstractItemModel
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp
index 8a38d25e0..403e954d7 100644
--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -43,11 +43,11 @@
 #include "qdbusmodel.h"
 #include "propertydialog.h"
 
-#include <QtXml/QtXml>
 
 #include <QtWidgets/QTreeWidget>
 #include <QtCore/QStringListModel>
 #include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QMetaProperty>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QListView>
 #include <QtWidgets/QTextBrowser>
@@ -58,6 +58,9 @@
 #include <QtWidgets/QInputDialog>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QMenu>
+#include <QtDBus/QDBusConnectionInterface>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusMetaType>
 
 #include <private/qdbusutil_p.h>
 
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.h b/src/qdbus/qdbusviewer/qdbusviewer.h
index f77f84cfe..92523cce3 100644
--- a/src/qdbus/qdbusviewer/qdbusviewer.h
+++ b/src/qdbus/qdbusviewer/qdbusviewer.h
@@ -43,7 +43,7 @@
 #define QDBUSVIEWER_H
 
 #include <QtWidgets/QWidget>
-#include <QtDBus/QtDBus>
+#include <QtDBus/QDBusConnection>
 
 QT_FORWARD_DECLARE_CLASS(QTreeView)
 QT_FORWARD_DECLARE_CLASS(QTreeWidget)
-- 
cgit v1.2.3