[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [akonadi/dev/binary-protocol] src/private: Reduce #includes in protocol_p.h
From:       Dan_Vrátil <dvratil () redhat ! com>
Date:       2015-05-31 22:59:49
Message-ID: E1YzCCr-0002ss-M5 () scm ! kde ! org
[Download RAW message or body]

Git commit 4c98e81e2fed1a4e77137a5c382c634489ea8901 by Dan Vr=C3=A1til.
Committed on 31/05/2015 at 22:07.
Pushed by dvratil into branch 'dev/binary-protocol'.

Reduce #includes in protocol_p.h

The file is big as it is, no need to include things we can forward-declare =
now that
we use PIMPL.

M  +4    -0    src/private/protocol.cpp
M  +16   -9    src/private/protocol_p.h
M  +1    -1    src/private/tristate_p.h

http://commits.kde.org/akonadi/4c98e81e2fed1a4e77137a5c382c634489ea8901

diff --git a/src/private/protocol.cpp b/src/private/protocol.cpp
index 5698ef7..bedeaa1 100644
--- a/src/private/protocol.cpp
+++ b/src/private/protocol.cpp
@@ -18,12 +18,16 @@
  */
 =

 #include "protocol_p.h"
+#include "scope_p.h"
+#include "imapset_p.h"
 =

 #include <type_traits>
 =

 #include <QDataStream>
 #include <QGlobalStatic>
 #include <QHash>
+#include <QMap>
+#include <QDateTime>
 =

 using namespace Akonadi;
 using namespace Akonadi::Protocol;
diff --git a/src/private/protocol_p.h b/src/private/protocol_p.h
index 37d2f81..cec388e 100644
--- a/src/private/protocol_p.h
+++ b/src/private/protocol_p.h
@@ -23,18 +23,23 @@
 =

 #include "akonadiprivate_export.h"
 =

-#include "scope_p.h"
-#include "tristate_p.h"
 =

 #include <QtCore/QFlags>
-#include <QtCore/QMap>
-#include <QtCore/QSet>
-#include <QtCore/QByteArray>
-#include <QtCore/QString>
-#include <QtCore/QDateTime>
 #include <QtCore/QSharedDataPointer>
 =

+#include "tristate_p.h"
+
 class QDataStream;
+class QString;
+class QByteArray;
+template<typename T1, typename T2> class QMap;
+template<typename T1> class QSet;
+class QDateTime;
+
+namespace Akonadi
+{
+class Scope;
+}
 =

 /**
   @file protocol_p.h Shared constants used in the communication protocol b=
etween
@@ -57,8 +62,10 @@ class QDataStream;
 #define AKONADI_DBUS_STORAGEJANITOR_PATH "/Janitor"
 =

 =

-namespace Akonadi {
-namespace Protocol {
+namespace Akonadi
+{
+namespace Protocol
+{
 class Command;
 class Response;
 class Factory;
diff --git a/src/private/tristate_p.h b/src/private/tristate_p.h
index 69664d7..1ca3882 100644
--- a/src/private/tristate_p.h
+++ b/src/private/tristate_p.h
@@ -20,7 +20,7 @@
 #ifndef AKONADI_PRIVATE_TRISTATE_P_H_
 #define AKONADI_PRIVATE_TRISTATE_P_H_
 =

-#include <QMetaType>
+#include <QtCore/QMetaType>
 =

 namespace Akonadi
 {

[prev in list] [next in list] [prev in thread] [next in thread]