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

The following commit has been merged in the master branch:
commit cce6ad8e18e5e843ac2c5fbe130f0c2a90965008
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Oct 29 16:21:13 2014 +0100

    Ease porting
    
    Remove public KUrl, KLineEdit usage
    Export Qt5::Widgets as a public dependency of KTp::Widgets
---
 KTp/Widgets/CMakeLists.txt                       | 1 +
 KTp/Widgets/contact-grid-dialog.cpp              | 2 +-
 KTp/Widgets/contact-view-widget.cpp              | 2 +-
 KTp/Widgets/contact-view-widget.h                | 4 ++--
 KTp/actions.h                                    | 3 +--
 kpeople/actionsplugin/kpeople-actions-plugin.cpp | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/KTp/Widgets/CMakeLists.txt b/KTp/Widgets/CMakeLists.txt
index 9dc849c..64642bb 100644
--- a/KTp/Widgets/CMakeLists.txt
+++ b/KTp/Widgets/CMakeLists.txt
@@ -49,6 +49,7 @@ target_link_libraries (KTpWidgets
                     PUBLIC
                        KTp::CommonInternals
                        KF5::KCMUtils # used in settings-kcm-dialog.h
+                       Qt5::Widgets
                     PRIVATE
                        KF5::KDELibs4Support
                        KF5::NotifyConfig
diff --git a/KTp/Widgets/contact-grid-dialog.cpp b/KTp/Widgets/contact-grid-dialog.cpp
index 58a36de..5fc0b21 100644
--- a/KTp/Widgets/contact-grid-dialog.cpp
+++ b/KTp/Widgets/contact-grid-dialog.cpp
@@ -111,7 +111,7 @@ KTp::ContactGridDialog::ContactGridDialog(QWidget *parent) :
 
 
     d->contactGridWidget = new KTp::ContactGridWidget(d->contactsModel, this);
-    d->contactGridWidget->contactFilterLineEdit()->setClickMessage(i18n("Search in Contacts..."));
+    d->contactGridWidget->contactFilterLineEdit()->setPlaceholderText(i18n("Search in Contacts..."));
     d->contactGridWidget->filter()->setPresenceTypeFilterFlags(KTp::ContactsFilterModel::ShowOnlyConnected);
 
     setMainWidget(d->contactGridWidget);
diff --git a/KTp/Widgets/contact-view-widget.cpp b/KTp/Widgets/contact-view-widget.cpp
index 9170f9e..e20e6ac 100644
--- a/KTp/Widgets/contact-view-widget.cpp
+++ b/KTp/Widgets/contact-view-widget.cpp
@@ -279,7 +279,7 @@ KTp::ContactsFilterModel* KTp::ContactViewWidget::filter() const
     return d->filterModel;
 }
 
-KLineEdit* KTp::ContactViewWidget::contactFilterLineEdit() const
+QLineEdit* KTp::ContactViewWidget::contactFilterLineEdit() const
 {
     return d->contactFilterLineEdit;
 }
diff --git a/KTp/Widgets/contact-view-widget.h b/KTp/Widgets/contact-view-widget.h
index 6212687..b1aa550 100644
--- a/KTp/Widgets/contact-view-widget.h
+++ b/KTp/Widgets/contact-view-widget.h
@@ -29,7 +29,7 @@
 #include <KTp/contact.h>
 #include <KTp/ktpcommoninternals_export.h>
 
-class KLineEdit;
+class QLineEdit;
 class QItemSelection;
 class QListView;
 
@@ -69,7 +69,7 @@ public:
     Q_SIGNAL void iconSizeChanged(const QSize &iconSize);
 
     virtual KTp::ContactsFilterModel* filter() const;
-    virtual KLineEdit* contactFilterLineEdit() const;
+    virtual QLineEdit* contactFilterLineEdit() const;
 
     virtual bool hasSelection() const;
     virtual Tp::AccountPtr selectedAccount() const;
diff --git a/KTp/actions.h b/KTp/actions.h
index 7e726c0..29bdafb 100644
--- a/KTp/actions.h
+++ b/KTp/actions.h
@@ -20,7 +20,6 @@
 #define KTP_ACTIONS_H
 
 #include <TelepathyQt/Types>
-#include <KUrl>
 
 #include <KTp/ktpcommoninternals_export.h>
 
@@ -33,7 +32,7 @@ namespace KTp {
 
 namespace Actions {
 
-    typedef QList<KUrl> DocumentList;
+    typedef QList<QUrl> DocumentList;
 
     KTPCOMMONINTERNALS_EXPORT Tp::PendingChannelRequest* startChat(const Tp::AccountPtr &account,
                                                     const QString &contactIdentifier,
diff --git a/kpeople/actionsplugin/kpeople-actions-plugin.cpp b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
index f7df625..cf775b5 100644
--- a/kpeople/actionsplugin/kpeople-actions-plugin.cpp
+++ b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
@@ -213,7 +213,7 @@ void KPeopleActionsPlugin::onActionTriggered()
             KTp::Actions::startAudioVideoCall(account, contact);
             break;
         case FileTransfer: {
-            const QStringList fileNames = KFileDialog::getOpenFileNames(KUrl("kfiledialog:///FileTransferLastDirectory"),
+            const QStringList fileNames = KFileDialog::getOpenFileNames(QUrl(QStringLiteral("kfiledialog:///FileTransferLastDirectory")),
                                                                         QString(),
                                                                         0,
                                                                         i18n("Choose files to send to %1", contact->alias()));
@@ -226,11 +226,11 @@ void KPeopleActionsPlugin::onActionTriggered()
             KTp::Actions::openLogViewer(action->uri());
             break;
         case CollabEditing: {
-            const KUrl file = KUrl(KFileDialog::getOpenFileName(KUrl("kfiledialog:///CollabEditingLastDirectory"),
+            const QUrl file = KFileDialog::getOpenFileName(QUrl(QStringLiteral("kfiledialog:///CollabEditingLastDirectory")),
                                                                 QString(),
                                                                 0,
-                                                                i18n("Choose a file to edit with %1", contact->alias())));
-            KTp::Actions::startCollaborativeEditing(account, contact, QList<KUrl>() << file, true);
+                                                                i18n("Choose a file to edit with %1", contact->alias()));
+            KTp::Actions::startCollaborativeEditing(account, contact, QList<QUrl>() << file, true);
             break;
         }
     }

-- 
ktp-common-internals packaging