[telepathy-qt4/master] Reanemed ClientHandler module to Client.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Mon May 11 18:55:46 PDT 2009
The client module will contain all client interfaces (Observer, Approver,
Handler).
---
TelepathyQt4/Client | 13 +++++++++++++
TelepathyQt4/ClientHandler | 13 -------------
TelepathyQt4/ClientHandlerInterface | 2 +-
TelepathyQt4/ClientInterface | 13 +++++++++++++
TelepathyQt4/ClientInterfaceRequestsInterface | 2 +-
TelepathyQt4/Makefile.am | 23 ++++++++++++-----------
TelepathyQt4/{client-handler.cpp => client.cpp} | 6 +++---
TelepathyQt4/{client-handler.h => client.h} | 6 +++---
TelepathyQt4/{client-handler.xml => client.xml} | 3 ++-
TelepathyQt4/stable-interfaces.xml | 2 +-
10 files changed, 49 insertions(+), 34 deletions(-)
create mode 100644 TelepathyQt4/Client
delete mode 100644 TelepathyQt4/ClientHandler
create mode 100644 TelepathyQt4/ClientInterface
rename TelepathyQt4/{client-handler.cpp => client.cpp} (85%)
rename TelepathyQt4/{client-handler.h => client.h} (85%)
rename TelepathyQt4/{client-handler.xml => client.xml} (76%)
diff --git a/TelepathyQt4/Client b/TelepathyQt4/Client
new file mode 100644
index 0000000..df1577c
--- /dev/null
+++ b/TelepathyQt4/Client
@@ -0,0 +1,13 @@
+#ifndef _TelepathyQt4_Client_Client_HEADER_GUARD_
+#define _TelepathyQt4_Client_Client_HEADER_GUARD_
+
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
+#endif
+
+#include <TelepathyQt4/client.h>
+
+#undef IN_TELEPATHY_QT4_HEADER
+
+#endif
+// vim:set ft=cpp:
diff --git a/TelepathyQt4/ClientHandler b/TelepathyQt4/ClientHandler
deleted file mode 100644
index 6f31703..0000000
--- a/TelepathyQt4/ClientHandler
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _TelepathyQt4_Client_ClientHandler_HEADER_GUARD_
-#define _TelepathyQt4_Client_ClientHandler_HEADER_GUARD_
-
-#ifndef IN_TELEPATHY_QT4_HEADER
-#define IN_TELEPATHY_QT4_HEADER
-#endif
-
-#include <TelepathyQt4/client-handler.h>
-
-#undef IN_TELEPATHY_QT4_HEADER
-
-#endif
-// vim:set ft=cpp:
diff --git a/TelepathyQt4/ClientHandlerInterface b/TelepathyQt4/ClientHandlerInterface
index 635c714..cc62506 100644
--- a/TelepathyQt4/ClientHandlerInterface
+++ b/TelepathyQt4/ClientHandlerInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/client-handler.h>
+#include <TelepathyQt4/client.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ClientInterface b/TelepathyQt4/ClientInterface
new file mode 100644
index 0000000..966b5e5
--- /dev/null
+++ b/TelepathyQt4/ClientInterface
@@ -0,0 +1,13 @@
+#ifndef _TelepathyQt4_Client_ClientInterface_HEADER_GUARD_
+#define _TelepathyQt4_Client_ClientInterface_HEADER_GUARD_
+
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
+#endif
+
+#include <TelepathyQt4/client.h>
+
+#undef IN_TELEPATHY_QT4_HEADER
+
+#endif
+// vim:set ft=cpp:
diff --git a/TelepathyQt4/ClientInterfaceRequestsInterface b/TelepathyQt4/ClientInterfaceRequestsInterface
index 78b7c76..bc18d4b 100644
--- a/TelepathyQt4/ClientInterfaceRequestsInterface
+++ b/TelepathyQt4/ClientInterfaceRequestsInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/client-handler.h>
+#include <TelepathyQt4/client.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index 920de10..9633212 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -51,7 +51,7 @@ libtelepathy_qt4_la_SOURCES = \
account-manager.cpp \
channel.cpp \
channel-request.cpp \
- client-handler.cpp \
+ client.cpp \
client-registrar.cpp \
client-registrar-internal.h \
connection.cpp \
@@ -100,8 +100,8 @@ nodist_libtelepathy_qt4_la_SOURCES = \
_gen/cli-channel.moc.hpp \
_gen/cli-channel-request-body.hpp \
_gen/cli-channel-request.moc.hpp \
- _gen/cli-client-handler-body.hpp \
- _gen/cli-client-handler.moc.hpp \
+ _gen/cli-client-body.hpp \
+ _gen/cli-client.moc.hpp \
_gen/cli-connection-body.hpp \
_gen/cli-connection.moc.hpp \
_gen/cli-connection-manager-body.hpp \
@@ -120,7 +120,7 @@ nodist_libtelepathy_qt4_la_SOURCES = \
_gen/account-manager.moc.hpp \
_gen/channel.moc.hpp \
_gen/channel-request.moc.hpp \
- _gen/client-handler.moc.hpp \
+ _gen/client.moc.hpp \
_gen/client-registrar.moc.hpp \
_gen/client-registrar-internal.moc.hpp \
_gen/connection.moc.hpp \
@@ -155,7 +155,7 @@ tpqt4include_HEADERS = \
AccountManager \
Channel \
ChannelRequest \
- ClientHandler \
+ Client \
ClientRegistrar \
Connection \
ConnectionManager \
@@ -218,6 +218,7 @@ tpqt4include_HEADERS = \
ChannelTypeTextInterface \
ChannelTypeTubesInterface \
ClientHandlerInterface \
+ ClientInterface \
ClientInterfaceRequestsInterface \
ConnectionInterface \
ConnectionInterfaceAliasingInterface \
@@ -241,7 +242,7 @@ tpqt4include_HEADERS = \
account-manager.h \
channel.h \
channel-request.h \
- client-handler.h \
+ client.h \
client-registrar.h \
connection.h \
connection-manager.h \
@@ -285,7 +286,7 @@ nodist_geninclude_HEADERS = \
_gen/cli-account-manager.h \
_gen/cli-channel.h \
_gen/cli-channel-request.h \
- _gen/cli-client-handler.h \
+ _gen/cli-client.h \
_gen/cli-connection.h \
_gen/cli-connection-manager.h \
_gen/cli-dbus.h \
@@ -388,10 +389,10 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
group='clientchannelrequest'; \
prettyinclude='ChannelRequest'; \
mainiface='--mainiface=Tp::Client::ChannelRequestInterface';; \
- client-handler) \
- group='clientclienthandler'; \
- prettyinclude='ClientHandler'; \
- mainiface='--mainiface=Tp::Client::ClientHandlerInterface';; \
+ client) \
+ group='clientclient'; \
+ prettyinclude='Client'; \
+ mainiface='--mainiface=Tp::Client::ClientInterface';; \
account) \
group='clientaccount'; \
prettyinclude='AccountManager'; \
diff --git a/TelepathyQt4/client-handler.cpp b/TelepathyQt4/client.cpp
similarity index 85%
rename from TelepathyQt4/client-handler.cpp
rename to TelepathyQt4/client.cpp
index eb8a082..2d59c65 100644
--- a/TelepathyQt4/client-handler.cpp
+++ b/TelepathyQt4/client.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/ClientHandler>
+#include <TelepathyQt4/Client>
-#include "TelepathyQt4/_gen/cli-client-handler-body.hpp"
-#include "TelepathyQt4/_gen/cli-client-handler.moc.hpp"
+#include "TelepathyQt4/_gen/cli-client-body.hpp"
+#include "TelepathyQt4/_gen/cli-client.moc.hpp"
diff --git a/TelepathyQt4/client-handler.h b/TelepathyQt4/client.h
similarity index 85%
rename from TelepathyQt4/client-handler.h
rename to TelepathyQt4/client.h
index 1177b6b..221acc0 100644
--- a/TelepathyQt4/client-handler.h
+++ b/TelepathyQt4/client.h
@@ -19,13 +19,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_client_handler_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_client_handler_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_cli_client_h_HEADER_GUARD_
+#define _TelepathyQt4_cli_client_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/_gen/cli-client-handler.h>
+#include <TelepathyQt4/_gen/cli-client.h>
#endif
diff --git a/TelepathyQt4/client-handler.xml b/TelepathyQt4/client.xml
similarity index 76%
rename from TelepathyQt4/client-handler.xml
rename to TelepathyQt4/client.xml
index c191ef3..2e4344e 100644
--- a/TelepathyQt4/client-handler.xml
+++ b/TelepathyQt4/client.xml
@@ -2,8 +2,9 @@
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
xmlns:xi="http://www.w3.org/2001/XInclude">
-<tp:title>Client Handler interfaces</tp:title>
+<tp:title>Client interfaces</tp:title>
+<xi:include href="../spec/Client.xml"/>
<xi:include href="../spec/Client_Handler.xml"/>
<xi:include href="../spec/Client_Interface_Requests.xml"/>
diff --git a/TelepathyQt4/stable-interfaces.xml b/TelepathyQt4/stable-interfaces.xml
index fbef8f8..4904149 100644
--- a/TelepathyQt4/stable-interfaces.xml
+++ b/TelepathyQt4/stable-interfaces.xml
@@ -15,7 +15,7 @@
<xi:include href="properties.xml"/>
<xi:include href="account-manager.xml"/>
<xi:include href="account.xml"/>
-<xi:include href="client-handler.xml"/>
+<xi:include href="client.xml"/>
<xi:include href="../spec/generic-types.xml"/>
<xi:include href="../spec/errors.xml"/>
--
1.5.6.5
More information about the telepathy-commits
mailing list