changed include dir

CMakeLists.txt

@@ -22,7 +22,6 @@ include(ECMPackageConfigHelpers)
 include(GenerateExportHeader)
 
 
-
 #######################################################################
 option(WITH_FRONTENDS  "Build frontends currently only useful if WITH_SNORE_DAEMON=ON" OFF)
 option(WITH_SNORE_DAEMON "Build the Snore daemon, which redirects notifications" OFF)
@@ -30,7 +29,7 @@ option(WITH_SNORE_DAEMON "Build the Snore daemon, which redirects notifications"
 
 set(SNORE_VERSION_MAJOR 0)
 set(SNORE_VERSION_MINOR 5)
-set(SNORE_VERSION_PATCH 90)
+set(SNORE_VERSION_PATCH 91)
 
 set(SNORE_SUFFIX "-qt5")
 set(SNORE_CamelCase_SUFFIX "Qt5")

src/CMakeLists.txt

@@ -1,6 +1,4 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/core ${CMAKE_CURRENT_BINARY_DIR}/core)
+add_subdirectory(libsnore)
-
-add_subdirectory(core)
 add_subdirectory(daemon)
 add_subdirectory(settings)
 add_subdirectory(plugins)

src/daemon/main.cpp

@@ -1,7 +1,7 @@
 
 #include "snorenotify.h"
-#include "core/log.h"
+#include "libsnore/log.h"
-#include "core/version.h"
+#include "libsnore/version.h"
 
 #include <QApplication>
 

src/daemon/snorenotify.cpp

@@ -18,7 +18,7 @@
 
 #include "snorenotify.h"
 #include "trayicon.h"
-#include "core/snore.h"
+#include "libsnore/snore.h"
 
 #include <iostream>
 #include <stdlib.h>

src/daemon/trayicon.cpp

@@ -17,9 +17,9 @@
 */
 
 #include "trayicon.h"
-#include "core/settingsdialog.h"
+#include "libsnore/settingsdialog.h"
-#include "core/snore.h"
+#include "libsnore/snore.h"
-#include "core/snore_p.h"
+#include "libsnore/snore_p.h"
 
 #include <QAction>
 #include <QApplication>
@@ -28,7 +28,7 @@
 #include <QSystemTrayIcon>
 #include <QTimer>
 
-#include "core/version.h"
+#include "libsnore/version.h"
 
 using namespace Snore;
 

src/daemon/trayicon.h

@@ -20,7 +20,7 @@
 #define TRAYICON_H
 
 #include <QAction>
-#include "core/snore.h"
+#include "libsnore/snore.h"
 
 namespace Snore
 {

src/libsnore/CMakeLists.txt

@@ -6,6 +6,8 @@ if(NOT SNORE_REVISION)
     set(SNORE_REVISION "")
 endif()
 
+set(LIBSNORE_INCLUDE_DIR ${KDE_INSTALL_INCLUDEDIR}/libsnore)
+
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/version.cpp")
 
 QT5_ADD_RESOURCES(SNORENOTIFY_RCS ${SNORE_RCS})
@@ -64,12 +66,9 @@ generate_export_header(libsnore
   EXPORT_MACRO_NAME SNORE_EXPORT
 )
 
-#TODO: drop /core/
 target_include_directories(libsnore PUBLIC
-$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/>
-$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>)
-$<INSTALL_INTERFACE:include>
-$<INSTALL_INTERFACE:include/snore/core>)
 
 
 ecm_setup_version("${SNORE_VERSION_MAJOR}.${SNORE_VERSION_MINOR}.${SNORE_VERSION_PATCH}" VARIABLE_PREFIX SOLID
@@ -85,7 +84,7 @@ install(TARGETS libsnore EXPORT Libsnore${SNORE_CamelCase_SUFFIX}Target ${KDE_IN
 
 install(EXPORT Libsnore${SNORE_CamelCase_SUFFIX}Target DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/libsnore${SNORE_CamelCase_SUFFIX} NAMESPACE Snore::)
 
-install(FILES ${SnoreNotify_HDR} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/snore/core)
+install(FILES ${SnoreNotify_HDR} DESTINATION ${LIBSNORE_INCLUDE_DIR})
 
 install(FILES
         ${CMAKE_CURRENT_BINARY_DIR}/Libsnore${SNORE_CamelCase_SUFFIX}Config.cmake

src/libsnore/notification/CMakeLists.txt

@@ -13,4 +13,4 @@ set(SnoreNotify_HDR
         icon.h
         )
 
-install(FILES ${SnoreNotify_HDR} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/snore/core/notification)
+install(FILES ${SnoreNotify_HDR} DESTINATION ${LIBSNORE_INCLUDE_DIR}/notification)

src/libsnore/notification/icon.h

@@ -18,7 +18,7 @@
 
 #ifndef NOTIFICATION_ICON_H
 #define NOTIFICATION_ICON_H
-#include "snore_exports.h"
+#include "libsnore/snore_exports.h"
 
 #include <QSharedData>
 #include <QDebug>

src/libsnore/notification/notification.h

@@ -18,11 +18,11 @@
 
 #ifndef NOTIFICATION_H
 #define NOTIFICATION_H
-#include "snore_exports.h"
+#include "libsnore/snore_exports.h"
 #include "icon.h"
 #include "notificationaction.h"
-#include "../hint.h"
+#include "libsnore/hint.h"
-#include "../application.h"
+#include "libsnore/application.h"
 
 #include <QDebug>
 

src/libsnore/notification/notificationaction.h

@@ -19,7 +19,7 @@
 #ifndef NOTIFICATIONACTION_H
 #define NOTIFICATIONACTION_H
 
-#include "snore_exports.h"
+#include "libsnore/snore_exports.h"
 
 #include <QDataStream>
 

src/libsnore/plugins/CMakeLists.txt

@@ -13,4 +13,4 @@ set(SnoreNotify_HDR
         pluginsettingswidget.h)
 
 
-install(FILES ${SnoreNotify_HDR} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/snore/core/plugins)
+install(FILES ${SnoreNotify_HDR} DESTINATION ${LIBSNORE_INCLUDE_DIR}/plugins)

src/libsnore/plugins/plugincontainer.h

@@ -18,8 +18,8 @@
 
 #ifndef PLUGINCONTAINER_H
 #define PLUGINCONTAINER_H
-#include "snore_exports.h"
+#include "libsnore/snore_exports.h"
-#include "../snore_p.h"
+#include "libsnore/snore_p.h"
 
 #include <QPluginLoader>
 #include <QDir>

src/libsnore/plugins/plugins.h

@@ -18,10 +18,10 @@
 
 #ifndef SNORE_PLUGINS_H
 #define SNORE_PLUGINS_H
-#include "snore_exports.h"
+#include "libsnore/snore_exports.h"
-#include "snoreglobals.h"
+#include "libsnore/snoreglobals.h"
+#include "libsnore/notification/notification.h"
 #include "pluginsettingswidget.h"
-#include "../notification/notification.h"
 
 #include <QHash>
 

src/libsnore/plugins/pluginsettingswidget.h

@@ -18,7 +18,7 @@
 #ifndef PLUGINSETTINGSWIDGET_H
 #define PLUGINSETTINGSWIDGET_H
 
-#include "snore_exports.h"
+#include "libsnore/snore_exports.h"
 
 #include <QWidget>
 #include <QFormLayout>

src/libsnore/plugins/snorebackend.h

@@ -18,10 +18,10 @@
 
 #ifndef SNORE_BACKEND_H
 #define SNORE_BACKEND_H
-#include "snore_exports.h"
+#include "libsnore/snore_exports.h"
-#include "plugins.h"
+#include "libsnore/plugins/plugins.h"
-#include "../notification/notification.h"
+#include "libsnore/notification/notification.h"
-#include "../snore.h"
+#include "libsnore/snore.h"
 
 namespace Snore
 {

src/plugins/backends/freedesktop/fredesktopnotification.h

@@ -19,7 +19,7 @@
 #ifndef FreedesktopNotification_H
 #define FreedesktopNotification_H
 
-#include "core/notification/notification.h"
+#include "libsnore/notification/notification.h"
 
 #include <QMetaType>
 #include <QDBusArgument>

src/plugins/backends/growl/growlbackend.cpp

@@ -19,8 +19,8 @@
 #include "growlbackend.h"
 #include "growlsettings.h"
 
-#include "core/snore.h"
+#include "libsnore/snore.h"
-#include "core/snore_p.h"
+#include "libsnore/snore_p.h"
 
 using namespace Snore;
 

src/plugins/backends/growl/growlbackend.h

@@ -18,7 +18,7 @@
 
 #ifndef GROWL_BACKEND_H
 #define GROWL_BACKEND_H
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 
 #include "growl.hpp"
 #include <string>

src/plugins/backends/snarl/snarl.cpp

@@ -19,11 +19,11 @@
 #include "snarl.h"
 #include "snarlsettings.h"
 
-#include "core/snore.h"
+#include "libsnore/snore.h"
-#include "core/snore_p.h"
+#include "libsnore/snore_p.h"
-#include "core/plugins/plugins.h"
+#include "libsnore/plugins/plugins.h"
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
-#include "core/notification/notification_p.h"
+#include "libsnore/notification/notification_p.h"
 
 #include <QWidget>
 

src/plugins/backends/snarl/snarl.h

@@ -18,7 +18,7 @@
 
 #ifndef SNARL_BACKEND_H
 #define SNARL_BACKEND_H
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 #include "SnarlInterface.h"
 
 class SnarlBackend: public Snore::SnoreBackend

src/plugins/backends/snore/notifywidget.cpp

@@ -18,7 +18,7 @@
 
 #include "notifywidget.h"
 #include "snorenotifier.h"
-#include "core/log.h"
+#include "libsnore/log.h"
 
 using namespace Snore;
 

src/plugins/backends/snore/notifywidget.h

@@ -20,7 +20,7 @@
 #define NOTIFYWIDGET_H
 
 #include <QSharedMemory>
-#include "core/notification/notification.h"
+#include "libsnore/notification/notification.h"
 
 #include <QtQuick/QtQuick>
 

src/plugins/backends/snore/snorenotifier.cpp

@@ -19,8 +19,8 @@
 #include "snorenotifier.h"
 #include "notifywidget.h"
 #include "snorenotifiersettings.h"
-#include "core/notification/notification_p.h"
+#include "libsnore/notification/notification_p.h"
-#include "core/snore_p.h"
+#include "libsnore/snore_p.h"
 
 #include <QThread>
 

src/plugins/backends/snore/snorenotifier.h

@@ -19,7 +19,7 @@
 #ifndef SNORENOTIFIER_H
 #define SNORENOTIFIER_H
 
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 
 #include "notifywidget.h"
 

src/plugins/backends/snoretoast/snoretoast.cpp

@@ -1,8 +1,8 @@
 #include "snoretoast.h"
-#include "core/snore.h"
+#include "libsnore/snore.h"
-#include "core/snore_p.h"
+#include "libsnore/snore_p.h"
-#include "core/plugins/plugins.h"
+#include "libsnore/plugins/plugins.h"
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 
 #include <QDir>
 #include <QApplication>

src/plugins/backends/snoretoast/snoretoast.h

@@ -1,7 +1,7 @@
 #ifndef TOASTER_H
 #define TOASTER_H
 
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 #include <QProcess>
 
 class SnoreToast : public Snore::SnoreBackend

src/plugins/backends/trayicon/trayiconnotifer.cpp

@@ -1,6 +1,6 @@
 #include "trayiconnotifer.h"
-#include "core/snore.h"
+#include "libsnore/snore.h"
-#include "core/snore_p.h"
+#include "libsnore/snore_p.h"
 
 #include <QSystemTrayIcon>
 using namespace Snore;

src/plugins/backends/trayicon/trayiconnotifer.h

@@ -1,7 +1,7 @@
 #ifndef TRAYICONNOTIFER_H
 #define TRAYICONNOTIFER_H
 
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 
 namespace Snore
 {

src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp

@@ -20,9 +20,9 @@
 #include "notificationsadaptor.h"
 
 #include "plugins/backends/freedesktop/fredesktopnotification.h"
-#include "core/snore.h"
+#include "libsnore/snore.h"
-#include "core/version.h"
+#include "libsnore/version.h"
-#include "core/notification/notification_p.h"
+#include "libsnore/notification/notification_p.h"
 
 #include <QImage>
 #include <QIcon>

src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h

@@ -18,8 +18,8 @@
 
 #ifndef FREEDESKTOPNOTIFICATION_FRONTEND_H
 #define FREEDESKTOPNOTIFICATION_FRONTEND_H
-#include "core/plugins/snorefrontend.h"
+#include "libsnore/plugins/snorefrontend.h"
-#include "core/application.h"
+#include "libsnore/application.h"
 
 class NotificationsAdaptor;
 

src/plugins/frontends/snarlnetwork/parser.cpp

@@ -19,9 +19,9 @@
 #include "parser.h"
 #include "snarlnetwork.h"
 
-#include "core/snore.h"
+#include "libsnore/snore.h"
-#include "core/notification/notification.h"
+#include "libsnore/notification/notification.h"
-#include "core/notification/notification_p.h"
+#include "libsnore/notification/notification_p.h"
 
 #include <QObject>
 #include <QTcpSocket>

src/plugins/frontends/snarlnetwork/parser.h

@@ -20,7 +20,7 @@
 #define PARSER_H
 #include <QString>
 #include <QHash>
-#include "core/notification/notification.h"
+#include "libsnore/notification/notification.h"
 #include <QSharedPointer>
 #include <QObject>
 

src/plugins/frontends/snarlnetwork/snarlnetwork.cpp

@@ -17,7 +17,7 @@
 */
 
 #include "snarlnetwork.h"
-#include "core/snore.h"
+#include "libsnore/snore.h"
 
 #include <QTcpServer>
 #include <QTcpSocket>

src/plugins/frontends/snarlnetwork/snarlnetwork.h

@@ -18,8 +18,8 @@
 
 #ifndef SNARLNETWORK_H
 #define SNARLNETWORK_H
-#include "core/plugins/snorefrontend.h"
+#include "libsnore/plugins/snorefrontend.h"
-#include "core/log.h"
+#include "libsnore/log.h"
 #include "parser.h"
 
 #include <QTcpSocket>

src/plugins/secondary_backends/sound/sound.h

@@ -18,7 +18,7 @@
 #ifndef SOUND_H
 #define SOUND_H
 
-#include "plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 
 class Sound : public Snore::SnoreSecondaryBackend
 {

src/plugins/secondary_backends/toasty/toasty.h

@@ -18,7 +18,7 @@
 #ifndef TOASTY_H
 #define TOASTY_H
 
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 
 #include <QNetworkAccessManager>
 

src/settings/main.cpp

@@ -1,6 +1,6 @@
 
-#include "core/snore.h"
+#include "libsnore/snore.h"
-#include "core/version.h"
+#include "libsnore/version.h"
 #include "settingswindow.h"
 
 #include <QApplication>

src/settings/settingswindow.ui

@@ -49,7 +49,7 @@
   <customwidget>
    <class>Snore::SettingsDialog</class>
    <extends>QWidget</extends>
-   <header location="global">core/settingsdialog.h</header>
+   <header location="global">libsnore/settingsdialog.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>