[Telepathy-commits] [telepathy-qt4/master] TelepathyQt4: fix code generation scaffolding for Account, AccountManager
Simon McVittie
simon.mcvittie at collabora.co.uk
Tue Dec 2 02:52:46 PST 2008
---
TelepathyQt4/Client/AccountManager | 11 +------
TelepathyQt4/Makefile.am | 6 ++++
TelepathyQt4/cli-account-manager.cpp | 25 +++++++++++++++++
TelepathyQt4/cli-account-manager.h | 50 ++++++++++++++++++++++++++++++++++
TelepathyQt4/cli-account.cpp | 25 +++++++++++++++++
TelepathyQt4/cli-account.h | 45 ++++++++++++++++++++++++++++++
6 files changed, 153 insertions(+), 9 deletions(-)
create mode 100644 TelepathyQt4/cli-account-manager.cpp
create mode 100644 TelepathyQt4/cli-account-manager.h
create mode 100644 TelepathyQt4/cli-account.cpp
create mode 100644 TelepathyQt4/cli-account.h
diff --git a/TelepathyQt4/Client/AccountManager b/TelepathyQt4/Client/AccountManager
index c515b7a..ae99e7f 100644
--- a/TelepathyQt4/Client/AccountManager
+++ b/TelepathyQt4/Client/AccountManager
@@ -1,16 +1,9 @@
#ifndef _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
#define _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
-#include "TelepathyQt4/_gen/cli-account.h"
+#include "TelepathyQt4/cli-account.h"
-#include "TelepathyQt4/_gen/cli-account-manager.h"
-
-#if 0
-#include "TelepathyQt4/_gen/cli-account-interface-avatar.h"
-
-#include "TelepathyQt4/_gen/cli-account-manager-interface-creation.h"
-#include "TelepathyQt4/_gen/cli-account-manager-interface-query.h"
-#endif
+#include "TelepathyQt4/cli-account-manager.h"
#endif
// vim:set ft=cpp:
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index 93363fc..fd305e6 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -35,6 +35,8 @@ libtelepathy_qt4_la_LIBADD = $(ALL_LIBS)
libtelepathy_qt4_la_DEPENDENCIES = Makefile.am
libtelepathy_qt4_la_SOURCES = \
+ cli-account.cpp \
+ cli-account-manager.cpp \
cli-channel.cpp \
cli-connection.cpp \
cli-connection-manager.cpp \
@@ -50,7 +52,9 @@ libtelepathy_qt4_la_SOURCES = \
nodist_libtelepathy_qt4_la_SOURCES = \
_gen/cli-account-body.hpp \
+ _gen/cli-account.moc.hpp \
_gen/cli-account-manager-body.hpp \
+ _gen/cli-account-manager.moc.hpp \
_gen/cli-channel-body.hpp \
_gen/cli-channel.moc.hpp \
_gen/cli-connection-body.hpp \
@@ -73,6 +77,8 @@ tpqt4include_HEADERS = \
Constants \
Debug \
Types \
+ cli-account.h \
+ cli-account-manager.h \
cli-channel.h \
cli-connection.h \
cli-connection-manager.h \
diff --git a/TelepathyQt4/cli-account-manager.cpp b/TelepathyQt4/cli-account-manager.cpp
new file mode 100644
index 0000000..04150fb
--- /dev/null
+++ b/TelepathyQt4/cli-account-manager.cpp
@@ -0,0 +1,25 @@
+/*
+ * 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 "cli-account-manager.h"
+
+#include <TelepathyQt4/_gen/cli-account-manager.moc.hpp>
+#include <TelepathyQt4/_gen/cli-account-manager-body.hpp>
diff --git a/TelepathyQt4/cli-account-manager.h b/TelepathyQt4/cli-account-manager.h
new file mode 100644
index 0000000..ff5fe85
--- /dev/null
+++ b/TelepathyQt4/cli-account-manager.h
@@ -0,0 +1,50 @@
+/*
+ * 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_cli_account_manager_h_HEADER_GUARD_
+#define _TelepathyQt4_cli_account_manager_h_HEADER_GUARD_
+
+/**
+ * \addtogroup clientsideproxies Client-side proxies
+ *
+ * Proxy objects representing remote service objects accessed via D-Bus.
+ *
+ * In addition to providing direct access to methods, signals and properties
+ * exported by the remote objects, some of these proxies offer features like
+ * automatic inspection of remote object capabilities, property tracking,
+ * backwards compatibility helpers for older services and other utilities.
+ */
+
+/**
+ * \defgroup clientaccount Account and Account Manager proxies
+ * \ingroup clientsideproxies
+ *
+ * ...
+ */
+
+#include "TelepathyQt4/_gen/cli-account-manager.h"
+
+#if 0
+#include "TelepathyQt4/_gen/cli-account-manager-interface-creation.h"
+#include "TelepathyQt4/_gen/cli-account-manager-interface-query.h"
+#endif
+
+#endif
diff --git a/TelepathyQt4/cli-account.cpp b/TelepathyQt4/cli-account.cpp
new file mode 100644
index 0000000..08adfe3
--- /dev/null
+++ b/TelepathyQt4/cli-account.cpp
@@ -0,0 +1,25 @@
+/*
+ * 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 "cli-account.h"
+
+#include <TelepathyQt4/_gen/cli-account-body.hpp>
+#include <TelepathyQt4/_gen/cli-account.moc.hpp>
diff --git a/TelepathyQt4/cli-account.h b/TelepathyQt4/cli-account.h
new file mode 100644
index 0000000..a39733b
--- /dev/null
+++ b/TelepathyQt4/cli-account.h
@@ -0,0 +1,45 @@
+/*
+ * 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_cli_account_h_HEADER_GUARD_
+#define _TelepathyQt4_cli_account_h_HEADER_GUARD_
+
+/**
+ * \addtogroup clientsideproxies Client-side proxies
+ *
+ * Proxy objects representing remote service objects accessed via D-Bus.
+ *
+ * In addition to providing direct access to methods, signals and properties
+ * exported by the remote objects, some of these proxies offer features like
+ * automatic inspection of remote object capabilities, property tracking,
+ * backwards compatibility helpers for older services and other utilities.
+ */
+
+/* See cli-account-manager.h for doxygen */
+
+#include "TelepathyQt4/_gen/cli-account.h"
+
+#if 0
+#include "TelepathyQt4/_gen/cli-account-interface-avatar.h"
+#endif
+
+#endif
+
--
1.5.6.5
More information about the Telepathy-commits
mailing list