[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=72e4674

The following commit has been merged in the master branch:
commit 72e4674fbc93450c3a2f196cac7ea340dcaf4645
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Dec 9 00:48:32 2010 +0000

    Updated to compile to latest TpQt4 API changes.
---
 app/mainwindow.cpp     | 18 ++++++++++--------
 app/mainwindow.h       | 13 ++++++-------
 lib/chatconnection.cpp |  2 +-
 lib/chatwindow.cpp     |  3 +++
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index b2ffc4d..321ecd8 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -22,6 +22,9 @@
 
 #include <KColorScheme>
 
+#include <TelepathyQt4/ChannelClassSpecList>
+
+
 inline ChannelClassList channelClassList()
 {
     ChannelClassList filters;
@@ -44,20 +47,19 @@ inline ChannelClassList channelClassList()
 
 MainWindow::MainWindow() :
         KTabWidget(),
-        AbstractClientHandler(channelClassList())
+        AbstractClientHandler(ChannelClassSpecList())
 {
     setTabReorderingEnabled(true);
     connect(this, SIGNAL(currentChanged(int)), SLOT(onCurrentIndexChanged(int)));
 }
 
 void MainWindow::handleChannels(const MethodInvocationContextPtr<> &context,
-                                const AccountPtr & account,
-                                const ConnectionPtr & connection,
-                                const QList< ChannelPtr > & channels,
-                                const QList< ChannelRequestPtr > & ,
-                                const QDateTime & ,
-                                const QVariantMap&
-                               )
+        const AccountPtr &account,
+        const ConnectionPtr &connection,
+        const QList<ChannelPtr> &channels,
+        const QList<ChannelRequestPtr> &requestsSatisfied,
+        const QDateTime &userActionTime,
+        const AbstractClientHandler::HandlerInfo &handlerInfo)
 {
     ChatConnection* chatConnection = new ChatConnection(this, account, connection, channels);
     ChatWindow* newWindow = new ChatWindow(chatConnection, this);
diff --git a/app/mainwindow.h b/app/mainwindow.h
index d9fd7c8..fcb0556 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -44,13 +44,12 @@ public:
     MainWindow();
 
     virtual void handleChannels(const MethodInvocationContextPtr<> &context,
-                                const AccountPtr & account,
-                                const ConnectionPtr & connection,
-                                const QList< ChannelPtr > & channels,
-                                const QList< ChannelRequestPtr > & requestsSatisfied,
-                                const QDateTime &  userActionTime,
-                                const QVariantMap & handlerInfo
-                               );
+            const AccountPtr &account,
+            const ConnectionPtr &connection,
+            const QList<ChannelPtr> &channels,
+            const QList<ChannelRequestPtr> &requestsSatisfied,
+            const QDateTime &userActionTime,
+            const AbstractClientHandler::HandlerInfo &handlerInfo);
 
     bool bypassApproval() const {
         return false;
diff --git a/lib/chatconnection.cpp b/lib/chatconnection.cpp
index c289350..07521fa 100644
--- a/lib/chatconnection.cpp
+++ b/lib/chatconnection.cpp
@@ -51,7 +51,7 @@ void ChatConnection::onChannelReady(Tp::PendingOperation* op)
 {
     qDebug() << "done";
     PendingContacts* p = m_connection->contactManager()->upgradeContacts(QList<ContactPtr>::fromSet(m_channel->groupContacts()),
-                         QSet<Contact::Feature>() << Contact::FeatureAlias
+                         Features() << Contact::FeatureAlias
                          << Contact::FeatureAvatarToken
                          << Contact::FeatureAvatarData
                          << Contact::FeatureCapabilities
diff --git a/lib/chatwindow.cpp b/lib/chatwindow.cpp
index b34af4a..629d7cd 100644
--- a/lib/chatwindow.cpp
+++ b/lib/chatwindow.cpp
@@ -38,6 +38,7 @@
 
 #include <TelepathyQt4/Message>
 #include <TelepathyQt4/Types>
+#include <TelepathyQt4/AvatarData>
 
 class ChatWindowPrivate
 {
@@ -236,6 +237,8 @@ void ChatWindow::onChatStatusChanged(Tp::ContactPtr contact, ChannelChatState st
         break;
     case ChannelChatStateComposing:
         contactIsTyping = true;
+    default:
+        qDebug() << QString("Unknown case %1").arg(state);
     }
 
 

-- 
ktp-text-ui packaging