[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=907a688

The following commit has been merged in the master branch:
commit 907a6881de5c012b067208776e136d9418d481be
Author: Lasath Fernando <kde at lasath.org>
Date:   Sun Jan 15 15:29:26 2012 +1100

    Rename TelepathyTextObserver::d to TelepathyTextObserver::observer
---
 KTp/Declarative/telepathy-text-observer.cpp | 9 ++++++---
 KTp/Declarative/telepathy-text-observer.h   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/KTp/Declarative/telepathy-text-observer.cpp b/KTp/Declarative/telepathy-text-observer.cpp
index 0dc9ced..29dc808 100644
--- a/KTp/Declarative/telepathy-text-observer.cpp
+++ b/KTp/Declarative/telepathy-text-observer.cpp
@@ -76,7 +76,7 @@ public:
 };
 
 TelepathyTextObserver::TelepathyTextObserver() :
-    d(new ConversationClientObserver(this))
+    observer(new ConversationClientObserver(this))
 {
     kDebug();
     Tp::registerTypes();
@@ -108,9 +108,12 @@ TelepathyTextObserver::TelepathyTextObserver() :
     );
 
     //TODO: check these to make sure I'm only requesting features I actually use.
-    d->registrar = Tp::ClientRegistrar::create(accountFactory, connectionFactory,
+    observer
+->registrar = Tp::ClientRegistrar::create(accountFactory, connectionFactory,
                                             channelFactory, contactFactory);
-    d->registrar->registerClient(d, QLatin1String("KDE.TextUi.ConversationWatcher"));
+    observer
+->registrar->registerClient(observer
+, QLatin1String("KDE.TextUi.ConversationWatcher"));
 }
 
 TelepathyTextObserver::~TelepathyTextObserver()
diff --git a/KTp/Declarative/telepathy-text-observer.h b/KTp/Declarative/telepathy-text-observer.h
index 0815750..5368875 100644
--- a/KTp/Declarative/telepathy-text-observer.h
+++ b/KTp/Declarative/telepathy-text-observer.h
@@ -38,7 +38,7 @@ Q_SIGNALS:
 	void newConversation(Conversation *con);
 private:
 	class ConversationClientObserver;
-	Tp::SharedPtr<ConversationClientObserver> d /*= Tp::SharedPtr<ConversationClientObserver>()*/;
+	Tp::SharedPtr<ConversationClientObserver> observer;
 };
 
 #endif // CONVERSATION_WATCHER_H

-- 
ktp-common-internals packaging