[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:15:49 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=5539662
The following commit has been merged in the master branch:
commit 55396626794432ca708e8495110d63c153a8150d
Author: Hrvoje Senjan <hrvoje.senjan at gmail.com>
Date: Sat Oct 25 00:34:07 2014 +0200
Initial port to Frameworks
TODO: port away from KDELibs4Support, and make tests build
REVIEW: 120791
---
CMakeLists.txt | 49 +++++++++++-----------
autoaway.cpp | 1 +
autoconnect.cpp | 1 +
config/CMakeLists.txt | 12 +++---
config/nowplaying-listwidget.cpp | 2 +
config/telepathy-kded-config.cpp | 6 ++-
contact-request-handler.cpp | 2 +
contactnotify.cpp | 6 +--
error-handler.cpp | 5 +--
...thy.Client.KTp.KdedIntegrationModule.service.in | 2 +-
screensaveraway.cpp | 1 +
11 files changed, 47 insertions(+), 40 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5317b4..fef3f0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,19 +2,22 @@ project(ktp-kded-integration-module)
set(KTP_CONTACT_LIST_VERSION "0.8.80")
-set (CMAKE_MODULE_PATH
- "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
- ${CMAKE_MODULE_PATH}
-)
cmake_policy(SET CMP0002 OLD)
set(IS_KTP_INTERNAL_MODULE TRUE)
-find_package (KDE4 REQUIRED)
-find_package (TelepathyQt4 0.8.9 REQUIRED)
-find_package (KTp REQUIRED)
-# set some default settings
-include (KDE4Defaults)
+find_package(ECM 1.3.0 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH})
+
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
+include(FeatureSummary)
+
+find_package (Qt5 REQUIRED COMPONENTS Concurrent Widgets Sql)
+find_package (KF5 REQUIRED COMPONENTS DBusAddons Config I18n Notifications ConfigWidgets IdleTime KDELibs4Support)
+
+find_package (KTp REQUIRED)
# Add an option for building tests
option(ENABLE_TESTS "Enable compilation of tests" FALSE)
@@ -22,16 +25,12 @@ option(ENABLE_TESTS "Enable compilation of tests" FALSE)
# make some more macros available
include (MacroLibrary)
-add_definitions (${KDE4_DEFINITIONS}
- -DQT_NO_CAST_FROM_ASCII
+add_definitions (-DQT_NO_CAST_FROM_ASCII
-DQT_NO_KEYWORDS
)
-include_directories (${KDE4_INCLUDES}
- ${CMAKE_CURRENT_BINARY_DIR}
+include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${TELEPATHY_QT4_INCLUDE_DIR}
- ${KTP_INCLUDE_DIR}
)
set (kded_ktp_integration_module_SRCS
@@ -48,18 +47,20 @@ set (kded_ktp_integration_module_SRCS
screensaveraway.cpp
)
-kde4_add_plugin (kded_ktp_integration_module
- ${kded_ktp_integration_module_SRCS}
+add_library (kded_ktp_integration_module MODULE ${kded_ktp_integration_module_SRCS}
)
target_link_libraries (kded_ktp_integration_module
- ${KDE4_KDECORE_LIBS}
- ${TELEPATHY_QT4_LIBRARIES}
- ${KTP_LIBRARIES}
- ${KDE4_KDEUI_LIBS}
- ${KDE4_KIDLETIME_LIBRARY}
- ${KDE4_SOLID_LIBS}
- ${QT_QTSQL_LIBRARIES}
+ KF5::DBusAddons
+ KF5::ConfigGui
+ KF5::I18n
+ KF5::Notifications
+ KF5::IdleTime
+ KF5::KDELibs4Support
+ ${TELEPATHY_QT5_LIBRARIES}
+ KTp::CommonInternals
+ Qt5::Concurrent
+ Qt5::Sql
)
install (TARGETS kded_ktp_integration_module
diff --git a/autoaway.cpp b/autoaway.cpp
index 13b71a5..8250731 100644
--- a/autoaway.cpp
+++ b/autoaway.cpp
@@ -24,6 +24,7 @@
#include <KDebug>
#include <KIdleTime>
#include <KConfig>
+#include <KSharedConfig>
#include <KConfigGroup>
AutoAway::AutoAway(KTp::GlobalPresence *globalPresence, QObject *parent)
diff --git a/autoconnect.cpp b/autoconnect.cpp
index dd36493..99512b2 100644
--- a/autoconnect.cpp
+++ b/autoconnect.cpp
@@ -24,6 +24,7 @@
#include <TelepathyQt/AccountManager>
+#include <KSharedConfig>
#include <KConfig>
AutoConnect::AutoConnect(QObject *parent)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 2f5905a..a357e87 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories (${TELEPATHY_QT5_INCLUDE_DIR})
+
set(kcm_ktp_integration_module_SRCS
column-resizer.cpp
telepathy-kded-config.cpp
@@ -9,15 +11,11 @@ set(kcm_ktp_integration_module_UI
telepathy-kded-config.ui
)
-kde4_add_ui_files(kcm_ktp_integration_module_SRCS ${kcm_ktp_integration_module_UI})
+ki18n_wrap_ui(kcm_ktp_integration_module_SRCS ${kcm_ktp_integration_module_UI})
-kde4_add_plugin(kcm_ktp_integration_module
- ${kcm_ktp_integration_module_SRCS})
+add_library(kcm_ktp_integration_module MODULE ${kcm_ktp_integration_module_SRCS})
-target_link_libraries(kcm_ktp_integration_module ${KDE4_KDECORE_LIBS}
- ${KDE4_KDEUI_LIBS}
- ${KDE4_KIO_LIBS}
-)
+target_link_libraries(kcm_ktp_integration_module Qt5::Widgets KF5::I18n KF5::ConfigWidgets KF5::KDELibs4Support)
install(TARGETS kcm_ktp_integration_module
diff --git a/config/nowplaying-listwidget.cpp b/config/nowplaying-listwidget.cpp
index 2fa0695..27c110f 100644
--- a/config/nowplaying-listwidget.cpp
+++ b/config/nowplaying-listwidget.cpp
@@ -21,6 +21,8 @@
#include <KIcon>
#include <KIconLoader>
#include <QScrollBar>
+#include <QDrag>
+#include <QMimeData>
NowPlayingListWidget::NowPlayingListWidget(QWidget *parent)
: QListWidget(parent)
diff --git a/config/telepathy-kded-config.cpp b/config/telepathy-kded-config.cpp
index a4b890c..9c686d1 100644
--- a/config/telepathy-kded-config.cpp
+++ b/config/telepathy-kded-config.cpp
@@ -25,6 +25,7 @@
#include <KPluginFactory>
#include <KSharedConfig>
#include <KLocalizedString>
+#include <KUrl>
#include <QDBusMessage>
#include <QDBusConnection>
@@ -33,11 +34,10 @@
#include "autoconnect.h"
K_PLUGIN_FACTORY(KCMTelepathyKDEDModuleConfigFactory, registerPlugin<TelepathyKDEDConfig>();)
-K_EXPORT_PLUGIN(KCMTelepathyKDEDModuleConfigFactory("kcm_ktp_integration_module", "kded_ktp_integration_module"))
TelepathyKDEDConfig::TelepathyKDEDConfig(QWidget *parent, const QVariantList& args)
- : KCModule(KCMTelepathyKDEDModuleConfigFactory::componentData(), parent, args),
+ : KCModule(parent, args),
ui(new Ui::TelepathyKDEDUi())
{
ui->setupUi(this);
@@ -398,3 +398,5 @@ void TelepathyKDEDConfig::downloadUrlCheckBoxChanged(bool checked)
ui->m_downloadUrlRequester->setEnabled(!checked);
Q_EMIT changed(true);
}
+
+#include "telepathy-kded-config.moc"
\ No newline at end of file
diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index b3a3c1d..2d3239e 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -37,9 +37,11 @@
#include <KAboutData>
#include <KMenu>
#include <KAction>
+#include <KIcon>
#include <KStatusNotifierItem>
#include <QtCore/QFutureWatcher>
+#include <QtConcurrentFilter>
Q_DECLARE_METATYPE(Tp::ContactPtr)
diff --git a/contactnotify.cpp b/contactnotify.cpp
index 2ce6a8a..fdd25b0 100644
--- a/contactnotify.cpp
+++ b/contactnotify.cpp
@@ -26,8 +26,9 @@
#include <TelepathyQt/AccountManager>
#include <TelepathyQt/Contact>
-#include <KAboutData>
+#include <KSharedConfig>
#include <KConfigGroup>
+#include <KLocalizedString>
#include <KDebug>
#include <KNotification>
@@ -78,8 +79,7 @@ void ContactNotify::sendNotification(const QString &text, const QPixmap &pixmap,
KNotification *notification;
notification = new KNotification(QLatin1String("contactInfo"), KNotification::CloseOnTimeout);
- KAboutData aboutData("ktelepathy", 0, KLocalizedString(), 0);
- notification->setComponentData(KComponentData(aboutData));
+ notification->setComponentName(QStringLiteral("ktelepathy"));
notification->setPixmap(pixmap);
notification->setText(text);
diff --git a/error-handler.cpp b/error-handler.cpp
index afd5af9..cb0fbb6 100644
--- a/error-handler.cpp
+++ b/error-handler.cpp
@@ -27,8 +27,8 @@
#include <TelepathyQt/AccountManager>
#include <TelepathyQt/Connection>
+#include <KLocalizedString>
#include <KNotification>
-#include <KAboutData>
#include <KDebug>
#include <Solid/Networking>
@@ -208,8 +208,7 @@ void ErrorHandler::showMessageToUser(const QString &text, const ErrorHandler::Sy
notification = new KNotification(QLatin1String("telepathyInfo"), KNotification::CloseOnTimeout);
}
- KAboutData aboutData("ktelepathy",0,KLocalizedString(),0);
- notification->setComponentData(KComponentData(aboutData));
+ notification->setComponentName(QStringLiteral("ktelepathy"));
notification->setText(text);
notification->sendEvent();
diff --git a/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service.in b/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service.in
index d864d1c..80f0b3d 100644
--- a/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service.in
+++ b/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule
-Exec=@DBUS_SEND_PATH@ --session --type=method_call --dest=org.kde.kded /kded org.kde.kded.loadModule string:"kded_ktp_integration_module"
+Exec=@DBUS_SEND_PATH@ --session --type=method_call --dest=org.kde.kded5 /kded org.kde.kded5.loadModule string:"kded_ktp_integration_module"
diff --git a/screensaveraway.cpp b/screensaveraway.cpp
index e01e067..b6a0268 100644
--- a/screensaveraway.cpp
+++ b/screensaveraway.cpp
@@ -22,6 +22,7 @@
#include <KTp/global-presence.h>
#include <KDebug>
+#include <KSharedConfig>
#include <KConfig>
#include <KConfigGroup>
--
ktp-kded-integration-module packaging
More information about the pkg-kde-commits
mailing list