tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Interfaces no longer depend on kdelibs4support

Browse source 
Also since fileitemactionplugin was using them (and inhering
kdelibs4support) not we have tu explicitly link against it in there.
This commit is contained in:
Àlex Fiestas 2014-09-22 00:16:39 +02:00
parent 101c741266
commit 02fd748f41
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fileitemactionplugin/CMakeLists.txt
View file

@ -2,6 +2,6 @@ add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-fileitemaction")
include_directories(${CMAKE_SOURCE_DIR})
add_library(kdeconnectfiletiemaction MODULE sendfileitemaction.cpp)
target_link_libraries(kdeconnectfiletiemaction KF5::KIOWidgets kdeconnectinterfaces)
target_link_libraries(kdeconnectfiletiemaction KF5::KIOWidgets KF5::I18n KF5::KDELibs4Support kdeconnectinterfaces)
install(TARGETS kdeconnectfiletiemaction DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES kdeconnectsendfile.desktop DESTINATION ${SERVICES_INSTALL_DIR})

3
interfaces/CMakeLists.txt
View file

@ -71,7 +71,8 @@ add_dependencies(kdeconnectinterfaces
target_link_libraries(kdeconnectinterfaces
Qt5::Core
Qt5::DBus
KF5::KDELibs4Support
Qt5::Gui
KF5::ConfigCore
)
configure_file(KDEConnectConfig.cmake.in ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfig.cmake @ONLY)

10
interfaces/devicesmodel.cpp
View file

@ -19,18 +19,20 @@
*/
#include "devicesmodel.h"
#include "interfaces_debug.h"
#include <QDebug>
#include <QDBusInterface>
#include <KSharedConfig>
#include <KConfigGroup>
#include <QIcon>
#include <core/kdebugnamespace.h>
#include "dbusinterfaces.h"
// #include "modeltest.h"
Q_LOGGING_CATEGORY(KDECONNECT_INTERFACES, "kdeconnect.interfaces");
DevicesModel::DevicesModel(QObject *parent)
: QAbstractListModel(parent)
, m_dbusInterface(new DaemonDbusInterface(this))
@ -106,7 +108,7 @@ void DevicesModel::refreshDeviceList()
}
if (!m_dbusInterface->isValid()) {
kDebug(debugArea()) << "dbus interface not valid";
qCDebug(KDECONNECT_INTERFACES) << "dbus interface not valid";
return;
}
@ -116,7 +118,7 @@ void DevicesModel::refreshDeviceList()
QDBusPendingReply<QStringList> pendingDeviceIds = m_dbusInterface->devices(onlyReachable, onlyPaired);
pendingDeviceIds.waitForFinished();
if (pendingDeviceIds.isError()) {
kDebug(debugArea()) << pendingDeviceIds.error();
qCDebug(KDECONNECT_INTERFACES) << pendingDeviceIds.error();
return;
}

9
interfaces/notificationsmodel.cpp
View file

@ -19,18 +19,17 @@
*/
#include "notificationsmodel.h"
#include "interfaces_debug.h"
#include <QDebug>
#include <QDBusInterface>
#include <KSharedConfig>
#include <KConfigGroup>
#include <QIcon>
#include <core/kdebugnamespace.h>
//#include "modeltest.h"
NotificationsModel::NotificationsModel(QObject* parent)
: QAbstractListModel(parent)
, m_dbusInterface(0)
@ -112,14 +111,14 @@ void NotificationsModel::refreshNotificationList()
}
if (!m_dbusInterface->isValid()) {
kDebug(debugArea()) << "dbus interface not valid";
qCDebug(KDECONNECT_INTERFACES) << "dbus interface not valid";
return;
}
QDBusPendingReply<QStringList> pendingNotificationIds = m_dbusInterface->activeNotifications();
pendingNotificationIds.waitForFinished();
if (pendingNotificationIds.isError()) {
kDebug(debugArea()) << pendingNotificationIds.error();
qCDebug(KDECONNECT_INTERFACES) << pendingNotificationIds.error();
return;
}
const QStringList& notificationIds = pendingNotificationIds.value();