[Telepathy-commits] [telepathy-qt4/master] Add PendingHandles pretty-include header and ensure that it and the one for ReferencedHandles is always used

[Olli Salli]

---
 TelepathyQt4/Client/PendingHandles         |   13 +++++++++++++
 TelepathyQt4/Client/ReferencedHandles      |    6 ++++++
 TelepathyQt4/Client/pending-handles.cpp    |    2 +-
 TelepathyQt4/Client/pending-handles.h      |    4 ++++
 TelepathyQt4/Client/referenced-handles.cpp |    4 +++-
 TelepathyQt4/Client/referenced-handles.h   |    6 +++++-
 6 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 TelepathyQt4/Client/PendingHandles

diff --git a/TelepathyQt4/Client/PendingHandles b/TelepathyQt4/Client/PendingHandles
new file mode 100644
index 0000000..3b24823
--- /dev/null
+++ b/TelepathyQt4/Client/PendingHandles
@@ -0,0 +1,13 @@
+#ifndef _TelepathyQt4_Client_PendingHandles_HEADER_GUARD_
+#define _TelepathyQt4_Client_PendingHandles_HEADER_GUARD_
+
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
+#endif
+
+#include <TelepathyQt4/Client/pending-handles.h>
+
+#undef IN_TELEPATHY_QT4_HEADER
+
+#endif
+// vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ReferencedHandles b/TelepathyQt4/Client/ReferencedHandles
index 091d782..e222a56 100644
--- a/TelepathyQt4/Client/ReferencedHandles
+++ b/TelepathyQt4/Client/ReferencedHandles
@@ -1,6 +1,12 @@
 #ifndef _TelepathyQt4_Client_ReferencedHandles_HEADER_GUARD_
 #define _TelepathyQt4_Client_ReferencedHandles_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
+#endif
+
 #include <TelepathyQt4/Client/referenced-handles.h>
 
+#undef IN_TELEPATHY_QT4_HEADER
+
 #endif
diff --git a/TelepathyQt4/Client/pending-handles.cpp b/TelepathyQt4/Client/pending-handles.cpp
index 9550b4f..2ba663c 100644
--- a/TelepathyQt4/Client/pending-handles.cpp
+++ b/TelepathyQt4/Client/pending-handles.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "pending-handles.h"
+#include <TelepathyQt4/Client/PendingHandles>
 #include "_gen/pending-handles.moc.hpp"
 
 #include "../debug-internal.h"
diff --git a/TelepathyQt4/Client/pending-handles.h b/TelepathyQt4/Client/pending-handles.h
index c51a4e0..5e05f8c 100644
--- a/TelepathyQt4/Client/pending-handles.h
+++ b/TelepathyQt4/Client/pending-handles.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_pending_handles_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_pending_handles_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/referenced-handles.cpp b/TelepathyQt4/Client/referenced-handles.cpp
index 1795801..d9a2c00 100644
--- a/TelepathyQt4/Client/referenced-handles.cpp
+++ b/TelepathyQt4/Client/referenced-handles.cpp
@@ -19,11 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "referenced-handles.h"
+#include <TelepathyQt4/Client/ReferencedHandles>
 
 #include <QPointer>
 #include <QSharedData>
 
+#include <TelepathyQt4/Client/Connection>
+
 #include "../debug-internal.h"
 
 namespace Telepathy
diff --git a/TelepathyQt4/Client/referenced-handles.h b/TelepathyQt4/Client/referenced-handles.h
index 8926235..6d064be 100644
--- a/TelepathyQt4/Client/referenced-handles.h
+++ b/TelepathyQt4/Client/referenced-handles.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_referenced_handles_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_referenced_handles_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
@@ -51,7 +55,6 @@ class ReferencedHandles;
 
 #include <TelepathyQt4/Constants>
 #include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/Connection>
 
 #include <QSharedDataPointer>
 #include <QList>
@@ -60,6 +63,7 @@ namespace Telepathy
 {
 namespace Client
 {
+class Connection;
 
 /**
  * \class ReferencedHandles
-- 
1.5.6.5