[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=e6625aa

The following commit has been merged in the master branch:
commit e6625aa417270e6eb8c5c6e87122efb90697ad8b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jan 1 15:04:53 2012 +0000

    Fix rebase and namespace
---
 lib/CMakeLists.txt              | 2 +-
 lib/chat-widget.cpp             | 7 -------
 lib/conversation-target.cpp     | 6 ++----
 lib/conversation.cpp            | 2 +-
 lib/messages-model.cpp          | 2 +-
 lib/telepathy-text-observer.cpp | 6 +++---
 6 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 7bd555a..25991b3 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -113,7 +113,7 @@ target_link_libraries(declarativeplugins
 	${QT_QTSCRIPT_LIBRARY}
 	${QT_QTDECLARATIVE_LIBRARY}
 	${TELEPATHY_QT4_LIBRARIES}
-	ktelepathy_chat_lib
+	ktpchat
 )
 
 install(TARGETS declarativeplugins DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/telepathy/declarativeplugins)
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 2cdf01d..5494b7a 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -855,13 +855,6 @@ void ChatWidget::onFormatColorReleased()
     d->ui.sendMessageBox->setTextColor(color);
 }
 
-
-KIcon ChatWidget::iconForPresence(Tp::ConnectionPresenceType presence)
-{
-
-    return KIcon(iconSourceForPresence(presence));
-}
-
 bool ChatWidget::isUserTyping() const
 {
     return d->remoteContactIsTyping;
diff --git a/lib/conversation-target.cpp b/lib/conversation-target.cpp
index 9316243..94ca84b 100644
--- a/lib/conversation-target.cpp
+++ b/lib/conversation-target.cpp
@@ -16,11 +16,9 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "kdetelepathychat_export.h"
-
 #include "conversation-target.h"
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/Presence>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/Presence>
 #include <KDebug>
 #include <KIconLoader>
 
diff --git a/lib/conversation.cpp b/lib/conversation.cpp
index 45284da..54373cf 100644
--- a/lib/conversation.cpp
+++ b/lib/conversation.cpp
@@ -20,7 +20,7 @@
 #include "conversation.h"
 #include "messages-model.h"
 
-#include <TelepathyQt4/TextChannel>
+#include <TelepathyQt/TextChannel>
 #include <KDebug>
 #include "conversation-target.h"
 
diff --git a/lib/messages-model.cpp b/lib/messages-model.cpp
index b636f90..6bb515e 100644
--- a/lib/messages-model.cpp
+++ b/lib/messages-model.cpp
@@ -20,7 +20,7 @@
 #include "messages-model.h"
 
 #include <KDebug>
-#include <TelepathyQt4/ReceivedMessage>
+#include <TelepathyQt/ReceivedMessage>
 
 class MessageItem {
 public:
diff --git a/lib/telepathy-text-observer.cpp b/lib/telepathy-text-observer.cpp
index 3354905..7224dcf 100644
--- a/lib/telepathy-text-observer.cpp
+++ b/lib/telepathy-text-observer.cpp
@@ -22,9 +22,9 @@
 
 #include <KDebug>
 
-#include <TelepathyQt4/ChannelClassSpec>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/ClientRegistrar>
+#include <TelepathyQt/ChannelClassSpec>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/ClientRegistrar>
 
 
 static inline Tp::ChannelClassSpecList channelClassList()

-- 
ktp-text-ui packaging