[Telepathy-commits] [telepathy-qt4/master] Prototype: hook up code generation for ChannelHandlerInterface properly

[Simon McVittie]

---
 TelepathyQt4/Prototype/Makefile.am             |    6 +++++
 TelepathyQt4/Prototype/cli-channel-handler.cpp |   23 ++++++++++++++++++++
 TelepathyQt4/Prototype/cli-channel-handler.h   |   27 ++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 0 deletions(-)
 create mode 100644 TelepathyQt4/Prototype/cli-channel-handler.cpp
 create mode 100644 TelepathyQt4/Prototype/cli-channel-handler.h

diff --git a/TelepathyQt4/Prototype/Makefile.am b/TelepathyQt4/Prototype/Makefile.am
index 6cba64c..b2560d9 100644
--- a/TelepathyQt4/Prototype/Makefile.am
+++ b/TelepathyQt4/Prototype/Makefile.am
@@ -32,6 +32,7 @@ libtpqt4_prototype_la_SOURCES = \
     DBusInterface.cpp \
     PresenceManager.cpp \
     StreamedMediaChannel.cpp \
+    cli-channel-handler.cpp \
     types.cpp
 
 nodist_libtpqt4_prototype_la_SOURCES = \
@@ -48,6 +49,7 @@ nodist_libtpqt4_prototype_la_SOURCES = \
     _gen/PresenceManager.h.moc \
     _gen/StreamedMediaChannel.h.moc \
     _gen/cli-channel-handler-body.hpp \
+    _gen/cli-channel-handler.moc.hpp \
     _gen/types-body.hpp
 
 protoinclude_HEADERS = \
@@ -66,6 +68,7 @@ protoinclude_HEADERS = \
     StreamedMediaChannel.h \
     Types \
     constants.h \
+    cli-channel-handler.h \
     types.h
 
 protoclientinclude_HEADERS = \
@@ -179,3 +182,6 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
 
 _gen/%.moc: % _gen/constants.h _gen/types.h
 	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
+
+_gen/%.moc.hpp: _gen/%.h _gen/constants.h _gen/types.h
+	$(MOC) @QTCORE_CFLAGS@ @QTDBUS_CFLAGS@ -I$(top_builddir) -I$(top_srcdir) -i $< -o $@
diff --git a/TelepathyQt4/Prototype/cli-channel-handler.cpp b/TelepathyQt4/Prototype/cli-channel-handler.cpp
new file mode 100644
index 0000000..a2d753c
--- /dev/null
+++ b/TelepathyQt4/Prototype/cli-channel-handler.cpp
@@ -0,0 +1,23 @@
+/*
+ * This file is part of TelepathyQt4
+ *
+ * Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2008 Nokia Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <TelepathyQt4/Prototype/_gen/cli-channel-handler-body.hpp>
+#include <TelepathyQt4/Prototype/_gen/cli-channel-handler.moc.hpp>
diff --git a/TelepathyQt4/Prototype/cli-channel-handler.h b/TelepathyQt4/Prototype/cli-channel-handler.h
new file mode 100644
index 0000000..0f8575a
--- /dev/null
+++ b/TelepathyQt4/Prototype/cli-channel-handler.h
@@ -0,0 +1,27 @@
+/*
+ * This file is part of TelepathyQt4
+ *
+ * Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2008 Nokia Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _TelepathyQt4_Prototype_cli_channel_handler_h_HEADER_GUARD_
+#define _TelepathyQt4_Prototype_cli_channel_handler_h_HEADER_GUARD_
+
+#include <TelepathyQt4/Prototype/_gen/cli-channel-handler.h>
+
+#endif
-- 
1.5.6.5