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

The following commit has been merged in the master branch:
commit 026380746f04a6879ec14c2ffae2dd07e236ea51
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Oct 30 17:50:03 2014 +0100

    Port away from some deprecated API
---
 adiumxtra-protocol-handler/CMakeLists.txt | 4 +---
 app/chat-window.cpp                       | 5 +++--
 app/invite-contact-dialog.cpp             | 2 +-
 logviewer/CMakeLists.txt                  | 3 ---
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/adiumxtra-protocol-handler/CMakeLists.txt b/adiumxtra-protocol-handler/CMakeLists.txt
index 0e5eaf2..f78a62f 100644
--- a/adiumxtra-protocol-handler/CMakeLists.txt
+++ b/adiumxtra-protocol-handler/CMakeLists.txt
@@ -11,9 +11,7 @@ set(ktp-adiumxtra-protocol-handler_SRCS
 add_executable(ktp-adiumxtra-protocol-handler ${ktp-adiumxtra-protocol-handler_SRCS})
 
 target_link_libraries(ktp-adiumxtra-protocol-handler
-            
-            ${KDE4_KDEUI_LIBS}
-            ${QT_QTWEBKIT_LIBRARY}
+            Qt5::WebKit
             KF5::Emoticons
             Qt5::Xml
             KF5::KIOWidgets
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 81840b0..ef60f9e 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -49,6 +49,7 @@
 #include <KToolInvocation>
 #include <KCModuleProxy>
 #include <KIconLoader>
+#include <KUrl>
 
 #include <QEvent>
 #include <QWidgetAction>
@@ -1188,7 +1189,7 @@ void ChatWindow::offerDocumentToContact(const Tp::AccountPtr& account, const Tp:
 {
     const KUrl url = KFileDialog::getOpenUrl();
     if ( ! url.isEmpty() ) {
-        KTp::Actions::startCollaborativeEditing(account, targetContact, QList<KUrl>() << url, true);
+        KTp::Actions::startCollaborativeEditing(account, targetContact, QList<QUrl>() << url, true);
     }
 }
 
@@ -1196,7 +1197,7 @@ void ChatWindow::offerDocumentToChatroom(const Tp::AccountPtr& account, const QS
 {
    const KUrl url = KFileDialog::getOpenUrl();
     if ( ! url.isEmpty() ) {
-        KTp::Actions::startCollaborativeEditing(account, roomName, QList<KUrl>() << url, true);
+        KTp::Actions::startCollaborativeEditing(account, roomName, QList<QUrl>() << url, true);
     }
 }
 
diff --git a/app/invite-contact-dialog.cpp b/app/invite-contact-dialog.cpp
index ba7b250..6c851bf 100644
--- a/app/invite-contact-dialog.cpp
+++ b/app/invite-contact-dialog.cpp
@@ -49,7 +49,7 @@ InviteContactDialog::InviteContactDialog(const Tp::AccountManagerPtr &accountMan
     m_contactsModel->setAccountManager(accountManager);
 
     m_contactGridWidget = new KTp::ContactGridWidget(m_contactsModel, this);
-    m_contactGridWidget->contactFilterLineEdit()->setClickMessage(i18n("Search in Contacts..."));
+    m_contactGridWidget->contactFilterLineEdit()->setPlaceholderText(i18n("Search in Contacts..."));
     m_contactGridWidget->filter()->setPresenceTypeFilterFlags(KTp::ContactsFilterModel::ShowOnlyConnected);
     m_contactGridWidget->filter()->setAccountFilter(account);
     m_contactGridWidget->setSelectionMode(QAbstractItemView::MultiSelection);
diff --git a/logviewer/CMakeLists.txt b/logviewer/CMakeLists.txt
index a1aa0fc..ac3dde0 100644
--- a/logviewer/CMakeLists.txt
+++ b/logviewer/CMakeLists.txt
@@ -21,10 +21,7 @@ qt5_wrap_ui(ktp-log-viewer_SRCS log-viewer.ui)
 add_executable(ktp-log-viewer ${ktp-log-viewer_SRCS})
 
 target_link_libraries(ktp-log-viewer
-            
-            ${KDE4_KDEUI_LIBS}
             KF5::KIOWidgets
-            ${TELEPATHY_QT4_LIBRARIES}
             KF5::Emoticons
             KF5::KCMUtils
             KF5::WebKit

-- 
ktp-text-ui packaging