[Telepathy-commits] [telepathy-qt4/master] Clean up inclusions into .cpp files
Simon McVittie
simon.mcvittie at collabora.co.uk
Mon Jan 5 10:39:57 PST 2009
* Use the public headers when testing self-containedness
* Use <> vs "" to indicate which headers will get installed and which
are just internal
---
TelepathyQt4/Client/account-manager.cpp | 7 +++----
TelepathyQt4/Client/account.cpp | 7 +++----
TelepathyQt4/Client/channel.cpp | 7 +++----
TelepathyQt4/Client/connection-manager.cpp | 10 +++++-----
TelepathyQt4/Client/connection.cpp | 10 +++++-----
TelepathyQt4/Client/dbus-proxy.cpp | 6 +++---
TelepathyQt4/Client/dbus.cpp | 7 +++----
TelepathyQt4/Client/media-session-handler.cpp | 7 +++----
TelepathyQt4/Client/media-stream-handler.cpp | 7 +++----
TelepathyQt4/Client/optional-interface-factory.cpp | 5 ++---
TelepathyQt4/Client/pending-channel.cpp | 6 +++---
TelepathyQt4/Client/pending-operation.cpp | 7 +++++--
TelepathyQt4/Client/properties.cpp | 3 +--
13 files changed, 42 insertions(+), 47 deletions(-)
diff --git a/TelepathyQt4/Client/account-manager.cpp b/TelepathyQt4/Client/account-manager.cpp
index 9f665e4..d2901b8 100644
--- a/TelepathyQt4/Client/account-manager.cpp
+++ b/TelepathyQt4/Client/account-manager.cpp
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define IN_TELEPATHY_QT4_HEADER
-#include "account-manager.h"
+#include <TelepathyQt4/Client/AccountManager>
-#include <TelepathyQt4/_gen/cli-account-manager.moc.hpp>
-#include <TelepathyQt4/_gen/cli-account-manager-body.hpp>
+#include "TelepathyQt4/_gen/cli-account-manager.moc.hpp"
+#include "TelepathyQt4/_gen/cli-account-manager-body.hpp"
diff --git a/TelepathyQt4/Client/account.cpp b/TelepathyQt4/Client/account.cpp
index 0b9deba..08ccb17 100644
--- a/TelepathyQt4/Client/account.cpp
+++ b/TelepathyQt4/Client/account.cpp
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define IN_TELEPATHY_QT4_HEADER
-#include "account.h"
+#include <TelepathyQt4/Client/Account>
-#include <TelepathyQt4/_gen/cli-account-body.hpp>
-#include <TelepathyQt4/_gen/cli-account.moc.hpp>
+#include "TelepathyQt4/_gen/cli-account-body.hpp"
+#include "TelepathyQt4/_gen/cli-account.moc.hpp"
diff --git a/TelepathyQt4/Client/channel.cpp b/TelepathyQt4/Client/channel.cpp
index f0e499c..8d8e6ed 100644
--- a/TelepathyQt4/Client/channel.cpp
+++ b/TelepathyQt4/Client/channel.cpp
@@ -23,14 +23,13 @@
#include "channel.moc.hpp"
-#include <TelepathyQt4/_gen/cli-channel-body.hpp>
-#include <TelepathyQt4/_gen/cli-channel.moc.hpp>
+#include "TelepathyQt4/_gen/cli-channel-body.hpp"
+#include "TelepathyQt4/_gen/cli-channel.moc.hpp"
+#include "TelepathyQt4/debug-internal.h"
#include <TelepathyQt4/Client/Connection>
#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/debug-internal.h>
-
#include <QQueue>
namespace Telepathy
diff --git a/TelepathyQt4/Client/connection-manager.cpp b/TelepathyQt4/Client/connection-manager.cpp
index c4868bb..487ac4c 100644
--- a/TelepathyQt4/Client/connection-manager.cpp
+++ b/TelepathyQt4/Client/connection-manager.cpp
@@ -19,19 +19,19 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define IN_TELEPATHY_QT4_HEADER
-#include "connection-manager.h"
+#include <TelepathyQt4/Client/ConnectionManager>
+
#include "connection-manager.moc.hpp"
-#include <TelepathyQt4/_gen/cli-connection-manager-body.hpp>
-#include <TelepathyQt4/_gen/cli-connection-manager.moc.hpp>
+#include "TelepathyQt4/_gen/cli-connection-manager-body.hpp"
+#include "TelepathyQt4/_gen/cli-connection-manager.moc.hpp"
+#include "TelepathyQt4/debug-internal.h"
#include <TelepathyQt4/Client/DBus>
#include <TelepathyQt4/Client/PendingSuccess>
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/ManagerFile>
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/debug-internal.h>
#include <QQueue>
#include <QStringList>
diff --git a/TelepathyQt4/Client/connection.cpp b/TelepathyQt4/Client/connection.cpp
index 8139931..ed3b4a8 100644
--- a/TelepathyQt4/Client/connection.cpp
+++ b/TelepathyQt4/Client/connection.cpp
@@ -19,16 +19,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define IN_TELEPATHY_QT4_HEADER
-#include "connection.h"
+#include <TelepathyQt4/Client/Connection>
+
#include "connection.moc.hpp"
-#include <TelepathyQt4/_gen/cli-connection-body.hpp>
-#include <TelepathyQt4/_gen/cli-connection.moc.hpp>
+#include "TelepathyQt4/_gen/cli-connection-body.hpp"
+#include "TelepathyQt4/_gen/cli-connection.moc.hpp"
+#include "TelepathyQt4/debug-internal.h"
#include <TelepathyQt4/Client/PendingChannel>
#include <TelepathyQt4/Client/PendingVoidMethodCall>
-#include <TelepathyQt4/debug-internal.h>
#include <QMap>
#include <QQueue>
diff --git a/TelepathyQt4/Client/dbus-proxy.cpp b/TelepathyQt4/Client/dbus-proxy.cpp
index 7e02f20..c7eeb2e 100644
--- a/TelepathyQt4/Client/dbus-proxy.cpp
+++ b/TelepathyQt4/Client/dbus-proxy.cpp
@@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define IN_TELEPATHY_QT4_HEADER
-#include "dbus-proxy.h"
+#include <TelepathyQt4/Client/DBusProxy>
+
#include "dbus-proxy.moc.hpp"
-#include <TelepathyQt4/debug-internal.h>
+#include "TelepathyQt4/debug-internal.h"
namespace Telepathy
{
diff --git a/TelepathyQt4/Client/dbus.cpp b/TelepathyQt4/Client/dbus.cpp
index 88ef4ff..1f2c9a0 100644
--- a/TelepathyQt4/Client/dbus.cpp
+++ b/TelepathyQt4/Client/dbus.cpp
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define IN_TELEPATHY_QT4_HEADER
-#include "dbus.h"
+#include <TelepathyQt4/Client/DBus>
-#include <TelepathyQt4/_gen/cli-dbus-body.hpp>
-#include <TelepathyQt4/_gen/cli-dbus.moc.hpp>
+#include "TelepathyQt4/_gen/cli-dbus-body.hpp"
+#include "TelepathyQt4/_gen/cli-dbus.moc.hpp"
diff --git a/TelepathyQt4/Client/media-session-handler.cpp b/TelepathyQt4/Client/media-session-handler.cpp
index dbfa591..5448060 100644
--- a/TelepathyQt4/Client/media-session-handler.cpp
+++ b/TelepathyQt4/Client/media-session-handler.cpp
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define IN_TELEPATHY_QT4_HEADER
-#include "media-session-handler.h"
+#include <TelepathyQt4/Client/MediaSessionHandler>
-#include <TelepathyQt4/_gen/cli-media-session-handler-body.hpp>
-#include <TelepathyQt4/_gen/cli-media-session-handler.moc.hpp>
+#include "TelepathyQt4/_gen/cli-media-session-handler-body.hpp"
+#include "TelepathyQt4/_gen/cli-media-session-handler.moc.hpp"
diff --git a/TelepathyQt4/Client/media-stream-handler.cpp b/TelepathyQt4/Client/media-stream-handler.cpp
index 52b05d2..61eba93 100644
--- a/TelepathyQt4/Client/media-stream-handler.cpp
+++ b/TelepathyQt4/Client/media-stream-handler.cpp
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define IN_TELEPATHY_QT4_HEADER
-#include "media-stream-handler.h"
+#include <TelepathyQt4/Client/MediaStreamHandler>
-#include <TelepathyQt4/_gen/cli-media-stream-handler-body.hpp>
-#include <TelepathyQt4/_gen/cli-media-stream-handler.moc.hpp>
+#include "TelepathyQt4/_gen/cli-media-stream-handler-body.hpp"
+#include "TelepathyQt4/_gen/cli-media-stream-handler.moc.hpp"
diff --git a/TelepathyQt4/Client/optional-interface-factory.cpp b/TelepathyQt4/Client/optional-interface-factory.cpp
index eaaa12c..00958bf 100644
--- a/TelepathyQt4/Client/optional-interface-factory.cpp
+++ b/TelepathyQt4/Client/optional-interface-factory.cpp
@@ -19,10 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define IN_TELEPATHY_QT4_HEADER
-#include "optional-interface-factory.h"
+#include <TelepathyQt4/Client/OptionalInterfaceFactory>
-#include <TelepathyQt4/debug-internal.h>
+#include "TelepathyQt4/debug-internal.h"
#include <QMap>
#include <QString>
diff --git a/TelepathyQt4/Client/pending-channel.cpp b/TelepathyQt4/Client/pending-channel.cpp
index 245a54a..81c6b64 100644
--- a/TelepathyQt4/Client/pending-channel.cpp
+++ b/TelepathyQt4/Client/pending-channel.cpp
@@ -19,13 +19,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define IN_TELEPATHY_QT4_HEADER
-#include "pending-channel.h"
+#include <TelepathyQt4/Client/PendingChannel>
+
#include "pending-channel.moc.hpp"
+#include "TelepathyQt4/debug-internal.h"
#include <TelepathyQt4/Client/Channel>
#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/debug-internal.h>
namespace Telepathy
{
diff --git a/TelepathyQt4/Client/pending-operation.cpp b/TelepathyQt4/Client/pending-operation.cpp
index c40e198..6fc47d1 100644
--- a/TelepathyQt4/Client/pending-operation.cpp
+++ b/TelepathyQt4/Client/pending-operation.cpp
@@ -19,13 +19,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <TelepathyQt4/Client/PendingOperation>
+
#define IN_TELEPATHY_QT4_HEADER
-#include "pending-operation.h"
#include "simple-pending-operations.h"
+#undef IN_TELEPATHY_QT4_HEADER
+
#include "pending-operation.moc.hpp"
#include "simple-pending-operations.moc.hpp"
-#include <TelepathyQt4/debug-internal.h>
+#include "TelepathyQt4/debug-internal.h"
#include <QDBusPendingCall>
#include <QDBusPendingCallWatcher>
diff --git a/TelepathyQt4/Client/properties.cpp b/TelepathyQt4/Client/properties.cpp
index 8249918..6b1cc20 100644
--- a/TelepathyQt4/Client/properties.cpp
+++ b/TelepathyQt4/Client/properties.cpp
@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define IN_TELEPATHY_QT4_HEADER
-#include "properties.h"
+#include <TelepathyQt4/Client/Properties>
#include <TelepathyQt4/_gen/cli-properties-body.hpp>
#include <TelepathyQt4/_gen/cli-properties.moc.hpp>
--
1.5.6.5
More information about the Telepathy-commits
mailing list