status-im
/
snorenotify
mirror of https://github.com/status-im/snorenotify.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed include dir

This commit is contained in:
Patrick von Reth 2015-03-16 11:50:08 +01:00
parent f95c50111b
commit fe1c1af7e1
75 changed files with 236 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -22,7 +22,6 @@ include(ECMPackageConfigHelpers)
include(GenerateExportHeader) include(GenerateExportHeader)
####################################################################### #######################################################################
option(WITH_FRONTENDS "Build frontends currently only useful if WITH_SNORE_DAEMON=ON" OFF) 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) 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_MAJOR 0)
set(SNORE_VERSION_MINOR 5) set(SNORE_VERSION_MINOR 5)
set(SNORE_VERSION_PATCH 90) set(SNORE_VERSION_PATCH 91)
set(SNORE_SUFFIX "-qt5") set(SNORE_SUFFIX "-qt5")
set(SNORE_CamelCase_SUFFIX "Qt5") set(SNORE_CamelCase_SUFFIX "Qt5")

4
src/CMakeLists.txt
View File

@ -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(daemon)
add_subdirectory(settings) add_subdirectory(settings)
add_subdirectory(plugins) add_subdirectory(plugins)

4
src/daemon/main.cpp
View File

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

2
src/daemon/snorenotify.cpp
View File

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

8
src/daemon/trayicon.cpp
View File

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

2
src/daemon/trayicon.h
View File

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

11
src/core/CMakeLists.txt → src/libsnore/CMakeLists.txt
View File

@ -6,6 +6,8 @@ if(NOT SNORE_REVISION)
set(SNORE_REVISION "") set(SNORE_REVISION "")
endif() endif()
set(LIBSNORE_INCLUDE_DIR ${KDE_INSTALL_INCLUDEDIR}/libsnore)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/version.cpp") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/version.cpp")
QT5_ADD_RESOURCES(SNORENOTIFY_RCS ${SNORE_RCS}) QT5_ADD_RESOURCES(SNORENOTIFY_RCS ${SNORE_RCS})
@ -64,12 +66,9 @@ generate_export_header(libsnore
EXPORT_MACRO_NAME SNORE_EXPORT EXPORT_MACRO_NAME SNORE_EXPORT
) )
#TODO: drop /core/
target_include_directories(libsnore PUBLIC 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 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(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 install(FILES
${CMAKE_CURRENT_BINARY_DIR}/Libsnore${SNORE_CamelCase_SUFFIX}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/Libsnore${SNORE_CamelCase_SUFFIX}Config.cmake

18
src/core/LibsnoreConfig.cmake.in → src/libsnore/LibsnoreConfig.cmake.in
View File

@ -1,9 +1,9 @@
@PACKAGE_INIT@ @PACKAGE_INIT@
find_dependency(Qt5Core REQUIRED) find_dependency(Qt5Core REQUIRED)
find_dependency(Qt5Network REQUIRED) find_dependency(Qt5Network REQUIRED)
find_dependency(Qt5Widgets REQUIRED) find_dependency(Qt5Widgets REQUIRED)
find_dependency(Qt5Quick REQUIRED) find_dependency(Qt5Quick REQUIRED)
include("${CMAKE_CURRENT_LIST_DIR}/Libsnore@SNORE_CamelCase_SUFFIX@Target.cmake") include("${CMAKE_CURRENT_LIST_DIR}/Libsnore@SNORE_CamelCase_SUFFIX@Target.cmake")

0
src/core/alert.cpp → src/libsnore/alert.cpp
View File

0
src/core/alert.h → src/libsnore/alert.h
View File

0
src/core/alert_p.cpp → src/libsnore/alert_p.cpp
View File

0
src/core/alert_p.h → src/libsnore/alert_p.h
View File

0
src/core/application.cpp → src/libsnore/application.cpp
View File

0
src/core/application.h → src/libsnore/application.h
View File

0
src/core/application_p.cpp → src/libsnore/application_p.cpp
View File

0
src/core/application_p.h → src/libsnore/application_p.h
View File

0
src/core/hint.cpp → src/libsnore/hint.cpp
View File

0
src/core/hint.h → src/libsnore/hint.h
View File

0
src/core/log.cpp → src/libsnore/log.cpp
View File

0
src/core/log.h → src/libsnore/log.h
View File

2
src/core/notification/CMakeLists.txt → src/libsnore/notification/CMakeLists.txt
View File

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

0
src/core/notification/icon.cpp → src/libsnore/notification/icon.cpp
View File

2
src/core/notification/icon.h → src/libsnore/notification/icon.h
View File

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

0
src/core/notification/icon_p.cpp → src/libsnore/notification/icon_p.cpp
View File

0
src/core/notification/icon_p.h → src/libsnore/notification/icon_p.h
View File

0
src/core/notification/notification.cpp → src/libsnore/notification/notification.cpp
View File

6
src/core/notification/notification.h → src/libsnore/notification/notification.h
View File

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

0
src/core/notification/notification_p.cpp → src/libsnore/notification/notification_p.cpp
View File

0
src/core/notification/notification_p.h → src/libsnore/notification/notification_p.h
View File

0
src/core/notification/notificationaction.cpp → src/libsnore/notification/notificationaction.cpp
View File

2
src/core/notification/notificationaction.h → src/libsnore/notification/notificationaction.h
View File

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

2
src/core/plugins/CMakeLists.txt → src/libsnore/plugins/CMakeLists.txt
View File

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

0
src/core/plugins/plugincontainer.cpp → src/libsnore/plugins/plugincontainer.cpp
View File

4
src/core/plugins/plugincontainer.h → src/libsnore/plugins/plugincontainer.h
View File

@ -18,8 +18,8 @@
#ifndef PLUGINCONTAINER_H #ifndef PLUGINCONTAINER_H
#define 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 <QPluginLoader>
#include <QDir> #include <QDir>

0
src/core/plugins/plugins.cpp → src/libsnore/plugins/plugins.cpp
View File

6
src/core/plugins/plugins.h → src/libsnore/plugins/plugins.h
View File

@ -18,10 +18,10 @@
#ifndef SNORE_PLUGINS_H #ifndef SNORE_PLUGINS_H
#define 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 "pluginsettingswidget.h"
#include "../notification/notification.h"
#include <QHash> #include <QHash>

0
src/core/plugins/pluginsettingswidget.cpp → src/libsnore/plugins/pluginsettingswidget.cpp
View File

2
src/core/plugins/pluginsettingswidget.h → src/libsnore/plugins/pluginsettingswidget.h
View File

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

0
src/core/plugins/snorebackend.cpp → src/libsnore/plugins/snorebackend.cpp
View File

8
src/core/plugins/snorebackend.h → src/libsnore/plugins/snorebackend.h
View File

@ -18,10 +18,10 @@
#ifndef SNORE_BACKEND_H #ifndef SNORE_BACKEND_H
#define 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 namespace Snore
{ {

0
src/core/plugins/snorefrontend.cpp → src/libsnore/plugins/snorefrontend.cpp
View File

0
src/core/plugins/snorefrontend.h → src/libsnore/plugins/snorefrontend.h
View File

0
src/core/settingsdialog.cpp → src/libsnore/settingsdialog.cpp
View File

0
src/core/settingsdialog.h → src/libsnore/settingsdialog.h
View File

250
src/core/settingsdialog.ui → src/libsnore/settingsdialog.ui
View File

@ -1,125 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>SettingsDialog</class> <class>SettingsDialog</class>
<widget class="QWidget" name="SettingsDialog"> <widget class="QWidget" name="SettingsDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>979</width> <width>979</width>
<height>300</height> <height>300</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../data/snore.qrc"> <iconset resource="../../data/snore.qrc">
<normaloff>:/root/snore.png</normaloff>:/root/snore.png</iconset> <normaloff>:/root/snore.png</normaloff>:/root/snore.png</iconset>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="tabPosition"> <property name="tabPosition">
<enum>QTabWidget::North</enum> <enum>QTabWidget::North</enum>
</property> </property>
<property name="tabShape"> <property name="tabShape">
<enum>QTabWidget::Rounded</enum> <enum>QTabWidget::Rounded</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
<string>General</string> <string>General</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="primaryBackendLabel"> <widget class="QLabel" name="primaryBackendLabel">
<property name="text"> <property name="text">
<string>Primary Backend</string> <string>Primary Backend</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="primaryBackendComboBox"/> <widget class="QComboBox" name="primaryBackendComboBox"/>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="timeoutLabel"> <widget class="QLabel" name="timeoutLabel">
<property name="text"> <property name="text">
<string>Timeout</string> <string>Timeout</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="timeoutSpinBox"> <widget class="QSpinBox" name="timeoutSpinBox">
<property name="suffix"> <property name="suffix">
<string>s</string> <string>s</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_backends"> <widget class="QWidget" name="tab_backends">
<attribute name="title"> <attribute name="title">
<string>Primary Backends</string> <string>Primary Backends</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QTabWidget" name="tabWidget_backends"/> <widget class="QTabWidget" name="tabWidget_backends"/>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_secondaryBackends"> <widget class="QWidget" name="tab_secondaryBackends">
<attribute name="title"> <attribute name="title">
<string>Secondary Bckends</string> <string>Secondary Bckends</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QTabWidget" name="tabWidget_secondary_backends"/> <widget class="QTabWidget" name="tabWidget_secondary_backends"/>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_frontends"> <widget class="QWidget" name="tab_frontends">
<attribute name="title"> <attribute name="title">
<string>Frontends</string> <string>Frontends</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<widget class="QTabWidget" name="tabWidget_frontends"/> <widget class="QTabWidget" name="tabWidget_frontends"/>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_plugins"> <widget class="QWidget" name="tab_plugins">
<attribute name="title"> <attribute name="title">
<string>Plugins</string> <string>Plugins</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
<widget class="QTabWidget" name="tabWidget_plugins"/> <widget class="QTabWidget" name="tabWidget_plugins"/>
</item> </item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton"> <widget class="QPushButton" name="pushButton">
<property name="text"> <property name="text">
<string>Display Test Notification</string> <string>Display Test Notification</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../data/snore.qrc"/> <include location="../../data/snore.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

0
src/core/snore.cpp → src/libsnore/snore.cpp
View File

0
src/core/snore.h → src/libsnore/snore.h
View File

0
src/core/snore_p.cpp → src/libsnore/snore_p.cpp
View File

0
src/core/snore_p.h → src/libsnore/snore_p.h
View File

0
src/core/snoreglobals.h → src/libsnore/snoreglobals.h
View File

60
src/core/version.cpp.in → src/libsnore/version.cpp.in
View File

@ -1,30 +1,30 @@
#include "version.h" #include "version.h"
namespace Snore{ namespace Snore{
const QString Version::version() const QString Version::version()
{ {
return QLatin1String("${SNORE_VERSION_MAJOR}.${SNORE_VERSION_MINOR}.${SNORE_VERSION_PATCH}"); return QLatin1String("${SNORE_VERSION_MAJOR}.${SNORE_VERSION_MINOR}.${SNORE_VERSION_PATCH}");
} }
const QString Version::major(){ const QString Version::major(){
return QLatin1String("${SNORE_VERSION_MAJOR}"); return QLatin1String("${SNORE_VERSION_MAJOR}");
} }
const QString Version::minor(){ const QString Version::minor(){
return QLatin1String("${SNORE_VERSION_MINOR}"); return QLatin1String("${SNORE_VERSION_MINOR}");
} }
const QString Version::patch(){ const QString Version::patch(){
return QLatin1String("${SNORE_VERSION_PATCH}"); return QLatin1String("${SNORE_VERSION_PATCH}");
} }
const QString Version::revision(){ const QString Version::revision(){
return QLatin1String("${SNORE_REVISION}"); return QLatin1String("${SNORE_REVISION}");
} }
const QString Version::buildTime(){ const QString Version::buildTime(){
return QLatin1String(__TIMESTAMP__); return QLatin1String(__TIMESTAMP__);
} }
} }

0
src/core/version.h → src/libsnore/version.h
View File

2
src/plugins/backends/freedesktop/fredesktopnotification.h
View File

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

4
src/plugins/backends/growl/growlbackend.cpp
View File

@ -19,8 +19,8 @@
#include "growlbackend.h" #include "growlbackend.h"
#include "growlsettings.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; using namespace Snore;

2
src/plugins/backends/growl/growlbackend.h
View File

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

10
src/plugins/backends/snarl/snarl.cpp
View File

@ -19,11 +19,11 @@
#include "snarl.h" #include "snarl.h"
#include "snarlsettings.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> #include <QWidget>

2
src/plugins/backends/snarl/snarl.h
View File

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

2
src/plugins/backends/snore/notifywidget.cpp
View File

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

2
src/plugins/backends/snore/notifywidget.h
View File

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

4
src/plugins/backends/snore/snorenotifier.cpp
View File

@ -19,8 +19,8 @@
#include "snorenotifier.h" #include "snorenotifier.h"
#include "notifywidget.h" #include "notifywidget.h"
#include "snorenotifiersettings.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> #include <QThread>

2
src/plugins/backends/snore/snorenotifier.h
View File

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

8
src/plugins/backends/snoretoast/snoretoast.cpp
View File

@ -1,8 +1,8 @@
#include "snoretoast.h" #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 <QDir>
#include <QApplication> #include <QApplication>

2
src/plugins/backends/snoretoast/snoretoast.h
View File

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

4
src/plugins/backends/trayicon/trayiconnotifer.cpp
View File

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

2
src/plugins/backends/trayicon/trayiconnotifer.h
View File

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

6
src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp
View File

@ -20,9 +20,9 @@
#include "notificationsadaptor.h" #include "notificationsadaptor.h"
#include "plugins/backends/freedesktop/fredesktopnotification.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 <QImage>
#include <QIcon> #include <QIcon>

4
src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h
View File

@ -18,8 +18,8 @@
#ifndef FREEDESKTOPNOTIFICATION_FRONTEND_H #ifndef FREEDESKTOPNOTIFICATION_FRONTEND_H
#define 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; class NotificationsAdaptor;

6
src/plugins/frontends/snarlnetwork/parser.cpp
View File

@ -19,9 +19,9 @@
#include "parser.h" #include "parser.h"
#include "snarlnetwork.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 <QObject>
#include <QTcpSocket> #include <QTcpSocket>

2
src/plugins/frontends/snarlnetwork/parser.h
View File

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

2
src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
View File

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

4
src/plugins/frontends/snarlnetwork/snarlnetwork.h
View File

@ -18,8 +18,8 @@
#ifndef SNARLNETWORK_H #ifndef SNARLNETWORK_H
#define 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 "parser.h"
#include <QTcpSocket> #include <QTcpSocket>

2
src/plugins/secondary_backends/sound/sound.h
View File

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

2
src/plugins/secondary_backends/toasty/toasty.h
View File

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

4
src/settings/main.cpp
View File

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

2
src/settings/settingswindow.ui
View File

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