diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-01-05 17:57:34 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-01-05 17:57:34 +0000 |
| commit | ec43a5010431dda4f45210d8baec1cf0a7dfe79f (patch) | |
| tree | b94429a807fa61d720ec0121863cf32810a17547 /qt4 | |
| parent | dcf312adebf2ad46985acdf0ee61d0a50caa5f46 (diff) | |
Reduce inclusions into channel.h via forward declarations
channel.h only mentions Connection or QDBusPendingCallWatcher via a
pointer, so it can just forward-declare those classes.
Also compensate for this in channel.cpp and pending-channel.cpp,
remove redundant inclusion of dbus.h in channel.cpp, and check
self-containedness of the public header rather than channel.h.
Diffstat (limited to 'qt4')
| -rw-r--r-- | qt4/TelepathyQt4/Client/channel.cpp | 8 | ||||
| -rw-r--r-- | qt4/TelepathyQt4/Client/channel.h | 6 | ||||
| -rw-r--r-- | qt4/TelepathyQt4/Client/pending-channel.cpp | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/qt4/TelepathyQt4/Client/channel.cpp b/qt4/TelepathyQt4/Client/channel.cpp index 8d26e507f..f0e499c52 100644 --- a/qt4/TelepathyQt4/Client/channel.cpp +++ b/qt4/TelepathyQt4/Client/channel.cpp @@ -19,16 +19,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#define IN_TELEPATHY_QT4_HEADER -#include "channel.h" -#include "channel.moc.hpp" +#include <TelepathyQt4/Client/Channel> -#include "dbus.h" +#include "channel.moc.hpp" #include <TelepathyQt4/_gen/cli-channel-body.hpp> #include <TelepathyQt4/_gen/cli-channel.moc.hpp> +#include <TelepathyQt4/Client/Connection> #include <TelepathyQt4/Constants> + #include <TelepathyQt4/debug-internal.h> #include <QQueue> diff --git a/qt4/TelepathyQt4/Client/channel.h b/qt4/TelepathyQt4/Client/channel.h index 369753a36..9850478c5 100644 --- a/qt4/TelepathyQt4/Client/channel.h +++ b/qt4/TelepathyQt4/Client/channel.h @@ -47,19 +47,21 @@ #include <TelepathyQt4/_gen/cli-channel.h> -#include <TelepathyQt4/Client/Connection> #include <TelepathyQt4/Client/DBus> #include <TelepathyQt4/Client/DBusProxy> #include <TelepathyQt4/Client/OptionalInterfaceFactory> #include <QSet> -#include <QDBusPendingCallWatcher> + +class QDBusPendingCallWatcher; namespace Telepathy { namespace Client { +class Connection; + /** * \class Channel * \ingroup clientchannel diff --git a/qt4/TelepathyQt4/Client/pending-channel.cpp b/qt4/TelepathyQt4/Client/pending-channel.cpp index 2f97080e9..245a54a35 100644 --- a/qt4/TelepathyQt4/Client/pending-channel.cpp +++ b/qt4/TelepathyQt4/Client/pending-channel.cpp @@ -24,6 +24,7 @@ #include "pending-channel.moc.hpp" #include <TelepathyQt4/Client/Channel> +#include <TelepathyQt4/Client/Connection> #include <TelepathyQt4/debug-internal.h> namespace Telepathy |