Commit a3decd54 authored by Albert Vaca Cintora's avatar Albert Vaca Cintora

Includes cleanup

parent 549f4c08
......@@ -14,6 +14,8 @@ find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test)
find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets DBusAddons KCMUtils IconThemes)
find_package(Qca-qt5 2.1.0 REQUIRED)
include_directories(${CMAKE_SOURCE_DIR})
configure_file(kdeconnect-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/kdeconnect-version.h)
include(KDEInstallDirs)
......@@ -29,6 +31,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_subdirectory(core)
add_subdirectory(kcm)
add_subdirectory(kcmplugin)
add_subdirectory(kio)
add_subdirectory(icon)
add_subdirectory(interfaces)
......
include_directories(${CMAKE_SOURCE_DIR})
add_executable(kdeconnect-cli kdeconnect-cli.cpp)
......
......@@ -18,17 +18,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <interfaces/devicesmodel.h>
#include <interfaces/notificationsmodel.h>
#include <interfaces/dbusinterfaces.h>
#include <QDBusMessage>
#include <QDBusConnection>
#include <QGuiApplication>
#include <QCoreApplication>
#include <QTextStream>
#include <KAboutData>
#include <KLocalizedString>
#include <QTextStream>
#include "../kdeconnect-version.h"
#include "interfaces/devicesmodel.h"
#include "interfaces/notificationsmodel.h"
#include "interfaces/dbusinterfaces.h"
#include "kdeconnect-version.h"
int main(int argc, char** argv)
{
......
......@@ -9,7 +9,9 @@ include_directories(
add_subdirectory(backends/lan)
add_subdirectory(backends/loopback)
set(kded_kdeconnect_SRCS
find_package(KF5Notifications 5.9 REQUIRED)
set(kdeconnectcore_SRCS
${backends_kdeconnect_SRCS}
backends/linkprovider.cpp
......@@ -26,7 +28,7 @@ set(kded_kdeconnect_SRCS
device.cpp
)
add_library(kdeconnectcore SHARED ${kded_kdeconnect_SRCS})
add_library(kdeconnectcore SHARED ${kdeconnectcore_SRCS})
target_link_libraries(kdeconnectcore
PUBLIC
Qt5::Network
......
......@@ -24,7 +24,7 @@
#include <QObject>
#include <QtCrypto>
#include "../networkpackage.h"
#include "core/networkpackage.h"
class NetworkPackage;
class LinkProvider;
......
......@@ -25,7 +25,7 @@
#include <QVector>
#include <QNetworkSession>
#include "../networkpackage.h"
#include "core/networkpackage.h"
class DeviceLink;
......
project(kdeconnectd)
include_directories(${CMAKE_SOURCE_DIR})
add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-daemon")
add_executable(kdeconnectd kdeconnectd.cpp)
......
......@@ -29,8 +29,7 @@
#include <KDBusService>
#include "core/daemon.h"
#include "../kdeconnect-version.h"
#include "kdeconnect-version.h"
static int sigtermfd[2];
const static char deadbeef = 1;
......
......@@ -21,13 +21,14 @@
#include "pingplugin.h"
#include <KNotification>
#include <QIcon>
#include <QDebug>
#include <KLocalizedString>
#include <KPluginFactory>
#include <QDebug>
#include <QDBusConnection>
#include <QLoggingCategory>
#include <core/device.h>
#include <QDBusConnection>
K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< PingPlugin >(); )
......
......@@ -21,20 +21,17 @@
#include "shareplugin.h"
#include "share_debug.h"
#include <QIcon>
#include <KLocalizedString>
#include <QStandardPaths>
#include <KSharedConfig>
#include <KConfigGroup>
#include <KJobTrackerInterface>
#include <KPluginFactory>
#include <qprocess.h>
#include <QProcess>
#include <QDir>
#include <QDesktopServices>
#include <QDBusConnection>
#include <QDebug>
#include <KLocalizedString>
#include <KJobTrackerInterface>
#include <KPluginFactory>
#include <core/filetransferjob.h>
#include "autoclosingqfile.h"
......@@ -188,7 +185,6 @@ void SharePlugin::openDestinationFolder()
void SharePlugin::shareUrl(const QUrl& url)
{
qDebug() << url;
NetworkPackage package(PACKAGE_TYPE_SHARE);
if(url.isLocalFile()) {
QSharedPointer<QIODevice> ioFile(new QFile(url.toLocalFile()));
......
......@@ -22,11 +22,10 @@
#define TELEPHONYPLUGIN_H
#include <QLoggingCategory>
#include <knotification.h>
#include <core/kdeconnectplugin.h>
#include <KNotification>
#include <KStatusNotifierItem>
#include <core/kdeconnectplugin.h>
#define PACKAGE_TYPE_TELEPHONY QLatin1String("kdeconnect.telephony")
......
......@@ -4,10 +4,10 @@ include_directories(
)
set(kdeconnect_libraries
kdeconnectcore
KF5::KIOWidgets
Qt5::Network
Qt5::Test
kdeconnectcore
qca-qt5
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment