[Telepathy-commits] [telepathy-qt4/master] Move Client/*.moc.hpp into Client/_gen

[Simon McVittie]

This moves them out of the way so tab completion works better :-)
---
 TelepathyQt4/Client/channel.cpp            |    3 +--
 TelepathyQt4/Client/connection-manager.cpp |    5 ++---
 TelepathyQt4/Client/connection.cpp         |    3 +--
 TelepathyQt4/Client/dbus-proxy.cpp         |    2 +-
 TelepathyQt4/Client/pending-channel.cpp    |    2 +-
 TelepathyQt4/Client/pending-operation.cpp  |    4 ++--
 TelepathyQt4/Makefile.am                   |   26 +++++++++++++-------------
 7 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/TelepathyQt4/Client/channel.cpp b/TelepathyQt4/Client/channel.cpp
index 8d8e6ed..c77ceec 100644
--- a/TelepathyQt4/Client/channel.cpp
+++ b/TelepathyQt4/Client/channel.cpp
@@ -21,10 +21,9 @@
 
 #include <TelepathyQt4/Client/Channel>
 
-#include "channel.moc.hpp"
-
 #include "TelepathyQt4/_gen/cli-channel-body.hpp"
 #include "TelepathyQt4/_gen/cli-channel.moc.hpp"
+#include "TelepathyQt4/Client/_gen/channel.moc.hpp"
 #include "TelepathyQt4/debug-internal.h"
 
 #include <TelepathyQt4/Client/Connection>
diff --git a/TelepathyQt4/Client/connection-manager.cpp b/TelepathyQt4/Client/connection-manager.cpp
index dd1b0c9..78a1281 100644
--- a/TelepathyQt4/Client/connection-manager.cpp
+++ b/TelepathyQt4/Client/connection-manager.cpp
@@ -22,11 +22,10 @@
 #include <TelepathyQt4/Client/ConnectionManager>
 #include "connection-manager-internal.h"
 
-#include "connection-manager.moc.hpp"
-#include "connection-manager-internal.moc.hpp"
-
 #include "TelepathyQt4/_gen/cli-connection-manager-body.hpp"
 #include "TelepathyQt4/_gen/cli-connection-manager.moc.hpp"
+#include "TelepathyQt4/Client/_gen/connection-manager.moc.hpp"
+#include "TelepathyQt4/Client/_gen/connection-manager-internal.moc.hpp"
 #include "TelepathyQt4/debug-internal.h"
 
 #include <TelepathyQt4/Client/DBus>
diff --git a/TelepathyQt4/Client/connection.cpp b/TelepathyQt4/Client/connection.cpp
index ed3b4a8..73f91c6 100644
--- a/TelepathyQt4/Client/connection.cpp
+++ b/TelepathyQt4/Client/connection.cpp
@@ -21,10 +21,9 @@
 
 #include <TelepathyQt4/Client/Connection>
 
-#include "connection.moc.hpp"
-
 #include "TelepathyQt4/_gen/cli-connection-body.hpp"
 #include "TelepathyQt4/_gen/cli-connection.moc.hpp"
+#include "TelepathyQt4/Client/_gen/connection.moc.hpp"
 #include "TelepathyQt4/debug-internal.h"
 
 #include <TelepathyQt4/Client/PendingChannel>
diff --git a/TelepathyQt4/Client/dbus-proxy.cpp b/TelepathyQt4/Client/dbus-proxy.cpp
index c7eeb2e..844040a 100644
--- a/TelepathyQt4/Client/dbus-proxy.cpp
+++ b/TelepathyQt4/Client/dbus-proxy.cpp
@@ -21,7 +21,7 @@
 
 #include <TelepathyQt4/Client/DBusProxy>
 
-#include "dbus-proxy.moc.hpp"
+#include "TelepathyQt4/Client/_gen/dbus-proxy.moc.hpp"
 
 #include "TelepathyQt4/debug-internal.h"
 
diff --git a/TelepathyQt4/Client/pending-channel.cpp b/TelepathyQt4/Client/pending-channel.cpp
index 81c6b64..16221d3 100644
--- a/TelepathyQt4/Client/pending-channel.cpp
+++ b/TelepathyQt4/Client/pending-channel.cpp
@@ -21,7 +21,7 @@
 
 #include <TelepathyQt4/Client/PendingChannel>
 
-#include "pending-channel.moc.hpp"
+#include "TelepathyQt4/Client/_gen/pending-channel.moc.hpp"
 #include "TelepathyQt4/debug-internal.h"
 
 #include <TelepathyQt4/Client/Channel>
diff --git a/TelepathyQt4/Client/pending-operation.cpp b/TelepathyQt4/Client/pending-operation.cpp
index 6fc47d1..cf59827 100644
--- a/TelepathyQt4/Client/pending-operation.cpp
+++ b/TelepathyQt4/Client/pending-operation.cpp
@@ -25,8 +25,8 @@
 #include "simple-pending-operations.h"
 #undef IN_TELEPATHY_QT4_HEADER
 
-#include "pending-operation.moc.hpp"
-#include "simple-pending-operations.moc.hpp"
+#include "TelepathyQt4/Client/_gen/pending-operation.moc.hpp"
+#include "TelepathyQt4/Client/_gen/simple-pending-operations.moc.hpp"
 
 #include "TelepathyQt4/debug-internal.h"
 
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index 03e2097..1809ed7 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -76,17 +76,17 @@ nodist_libtelepathy_qt4_la_SOURCES = \
     _gen/cli-properties-body.hpp \
     _gen/cli-properties.moc.hpp \
     _gen/types-body.hpp \
-    Client/account-manager.moc.hpp \
-    Client/account-manager-internal.moc.hpp \
-    Client/channel.moc.hpp \
-    Client/connection.moc.hpp \
-    Client/connection-manager.moc.hpp \
-    Client/connection-manager-internal.moc.hpp \
-    Client/dbus-proxy.moc.hpp \
-    Client/pending-channel.moc.hpp \
-    Client/pending-operation.moc.hpp \
-    Client/pending-string-list.moc.hpp \
-    Client/simple-pending-operations.moc.hpp
+    Client/_gen/account-manager.moc.hpp \
+    Client/_gen/account-manager-internal.moc.hpp \
+    Client/_gen/channel.moc.hpp \
+    Client/_gen/connection.moc.hpp \
+    Client/_gen/connection-manager.moc.hpp \
+    Client/_gen/connection-manager-internal.moc.hpp \
+    Client/_gen/dbus-proxy.moc.hpp \
+    Client/_gen/pending-channel.moc.hpp \
+    Client/_gen/pending-operation.moc.hpp \
+    Client/_gen/pending-string-list.moc.hpp \
+    Client/_gen/simple-pending-operations.moc.hpp
 
 tpqt4include_HEADERS = \
     Constants \
@@ -314,8 +314,8 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
 		--must-define='IN_TELEPATHY_QT4_HEADER' \
 		$$mainiface
 
-Client/%.moc.hpp: $(srcdir)/Client/%.h _gen/constants.h _gen/types.h
-	$(mkdir_p) Client
+Client/_gen/%.moc.hpp: $(srcdir)/Client/%.h _gen/constants.h _gen/types.h
+	$(mkdir_p) Client/_gen
 	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
 
 _gen/%.moc.hpp: _gen/%.h _gen/constants.h _gen/types.h
-- 
1.5.6.5