[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:08:35 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=9cb25cf
The following commit has been merged in the master branch:
commit 9cb25cf30831ab7acdd043350047ad759b9cee89
Author: Aleix Pol <aleixpol at kde.org>
Date: Mon Dec 15 16:29:45 2014 +0100
Drop KDELibs4Support from KPeople plugin
Reviewed by David Edmundson
---
kpeople/actionsplugin/CMakeLists.txt | 2 +-
kpeople/actionsplugin/kpeople-actions-plugin.cpp | 15 +++++----------
kpeople/datasourceplugin/CMakeLists.txt | 3 +--
{KTp/OTR => kpeople/datasourceplugin}/debug.cpp | 2 +-
{KTp/Models => kpeople/datasourceplugin}/debug.h | 2 +-
kpeople/datasourceplugin/im-persons-data-source.cpp | 8 ++++----
kpeople/uiplugins/CMakeLists.txt | 4 ++--
kpeople/uiplugins/chatplugin/CMakeLists.txt | 2 +-
8 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/kpeople/actionsplugin/CMakeLists.txt b/kpeople/actionsplugin/CMakeLists.txt
index b6f8e57..f8fd47b 100644
--- a/kpeople/actionsplugin/CMakeLists.txt
+++ b/kpeople/actionsplugin/CMakeLists.txt
@@ -4,8 +4,8 @@ add_library (ktp_kpeople_plugin MODULE
target_link_libraries (ktp_kpeople_plugin
KF5::People
+ KF5::I18n
KTp::CommonInternals
- KF5::KDELibs4Support
)
# Install:
diff --git a/kpeople/actionsplugin/kpeople-actions-plugin.cpp b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
index 4159498..aa5d0ce 100644
--- a/kpeople/actionsplugin/kpeople-actions-plugin.cpp
+++ b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
@@ -23,8 +23,7 @@
#include <QIcon>
#include <KLocalizedString>
#include <KPluginFactory>
-#include <KFileDialog>
-#include <kdemacros.h>
+#include <QFileDialog>
#include "KTp/contact.h"
#include "KTp/actions.h"
@@ -213,10 +212,8 @@ void KPeopleActionsPlugin::onActionTriggered()
KTp::Actions::startAudioVideoCall(account, contact);
break;
case FileTransfer: {
- const QStringList fileNames = KFileDialog::getOpenFileNames(QUrl(QStringLiteral("kfiledialog:///FileTransferLastDirectory")),
- QString(),
- 0,
- i18n("Choose files to send to %1", contact->alias()));
+ const QStringList fileNames = QFileDialog::getOpenFileNames(Q_NULLPTR, i18n("Choose files to send to %1", contact->alias()),
+ QStringLiteral("kfiledialog:///FileTransferLastDirectory"));
Q_FOREACH(const QString& file, fileNames) {
KTp::Actions::startFileTransfer(account, contact, file);
}
@@ -226,10 +223,8 @@ void KPeopleActionsPlugin::onActionTriggered()
KTp::Actions::openLogViewer(action->uri());
break;
case CollabEditing: {
- const QUrl file = KFileDialog::getOpenFileName(QUrl(QStringLiteral("kfiledialog:///CollabEditingLastDirectory")),
- QString(),
- 0,
- i18n("Choose a file to edit with %1", contact->alias()));
+ const QUrl file = QFileDialog::getOpenFileName(Q_NULLPTR, i18n("Choose a file to edit with %1", contact->alias()),
+ QStringLiteral("kfiledialog:///CollabEditingLastDirectory"));
KTp::Actions::startCollaborativeEditing(account, contact, QList<QUrl>() << file, true);
break;
}
diff --git a/kpeople/datasourceplugin/CMakeLists.txt b/kpeople/datasourceplugin/CMakeLists.txt
index 7e3872c..3889251 100644
--- a/kpeople/datasourceplugin/CMakeLists.txt
+++ b/kpeople/datasourceplugin/CMakeLists.txt
@@ -1,12 +1,11 @@
find_package(Qt5Sql REQUIRED)
-add_library (im_persons_data_source_plugin MODULE im-persons-data-source.cpp)
+add_library (im_persons_data_source_plugin MODULE im-persons-data-source.cpp debug.cpp)
target_link_libraries (im_persons_data_source_plugin
Qt5::Sql
KF5::People
KF5::Contacts
- KF5::KDELibs4Support
KTp::CommonInternals
)
diff --git a/KTp/OTR/debug.cpp b/kpeople/datasourceplugin/debug.cpp
similarity index 94%
copy from KTp/OTR/debug.cpp
copy to kpeople/datasourceplugin/debug.cpp
index 31bc9e0..5600376 100644
--- a/KTp/OTR/debug.cpp
+++ b/kpeople/datasourceplugin/debug.cpp
@@ -17,4 +17,4 @@
*/
#include "debug.h"
-Q_LOGGING_CATEGORY(KTP_OTR, "ktp-otr")
+Q_LOGGING_CATEGORY(KTP_KPEOPLE, "ktp-people")
diff --git a/KTp/Models/debug.h b/kpeople/datasourceplugin/debug.h
similarity index 96%
copy from KTp/Models/debug.h
copy to kpeople/datasourceplugin/debug.h
index fd4b67a..a36a039 100644
--- a/KTp/Models/debug.h
+++ b/kpeople/datasourceplugin/debug.h
@@ -24,6 +24,6 @@
// include the QDebug here so there doesn't have to
// be two debug includes in the files using qCDebug
#include <QDebug>
-Q_DECLARE_LOGGING_CATEGORY(KTP_MODELS)
+Q_DECLARE_LOGGING_CATEGORY(KTP_KPEOPLE)
#endif
diff --git a/kpeople/datasourceplugin/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
index 62c7609..20d2136 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -31,11 +31,11 @@
#include "KTp/contact-factory.h"
#include "KTp/global-contact-manager.h"
#include "KTp/types.h"
+#include "debug.h"
#include <KPeople/AllContactsMonitor>
#include <KContacts/Addressee>
-#include <KDebug>
#include <KPluginFactory>
#include <KPluginLoader>
@@ -172,13 +172,13 @@ QString KTpAllContacts::createUri(const KTp::ContactPtr &contact) const
void KTpAllContacts::onAccountManagerReady(Tp::PendingOperation *op)
{
if (op->isError()) {
- kWarning() << "Failed to initialize AccountManager:" << op->errorName();
- kWarning() << op->errorMessage();
+ qCWarning(KTP_KPEOPLE) << "Failed to initialize AccountManager:" << op->errorName();
+ qCWarning(KTP_KPEOPLE) << op->errorMessage();
return;
}
- kDebug() << "Account manager ready";
+ qCDebug(KTP_KPEOPLE) << "Account manager ready";
connect(KTp::contactManager(), SIGNAL(allKnownContactsChanged(Tp::Contacts,Tp::Contacts)),
this, SLOT(onAllKnownContactsChanged(Tp::Contacts,Tp::Contacts)));
diff --git a/kpeople/uiplugins/CMakeLists.txt b/kpeople/uiplugins/CMakeLists.txt
index 1bbca93..e9289d7 100644
--- a/kpeople/uiplugins/CMakeLists.txt
+++ b/kpeople/uiplugins/CMakeLists.txt
@@ -3,12 +3,12 @@ include_directories(${KPEOPLE_INCLUDES})
add_library(imdetailswidgetplugin MODULE imdetailswidget.cpp)
target_link_libraries(imdetailswidgetplugin Qt5::Core
Qt5::Gui
- KF5::KDELibs4Support
KF5::PeopleWidgets
+ KF5::I18n
KTp::CommonInternals
)
install(TARGETS imdetailswidgetplugin DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES imdetailswidgetplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-add_subdirectory(chatplugin)
\ No newline at end of file
+add_subdirectory(chatplugin)
diff --git a/kpeople/uiplugins/chatplugin/CMakeLists.txt b/kpeople/uiplugins/chatplugin/CMakeLists.txt
index 04da1c8..ece13d8 100644
--- a/kpeople/uiplugins/chatplugin/CMakeLists.txt
+++ b/kpeople/uiplugins/chatplugin/CMakeLists.txt
@@ -1,9 +1,9 @@
add_library(kpeople_chat_plugin MODULE chatlistviewdelegate.cpp kpeople_chat_plugin.cpp)
target_link_libraries(kpeople_chat_plugin ${QT_QTCORE_LIBRARY}
KF5::PeopleWidgets
+ KF5::I18n
KTp::Logger
KTp::CommonInternals
- KF5::KDELibs4Support
)
install(TARGETS kpeople_chat_plugin DESTINATION ${PLUGIN_INSTALL_DIR})
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list