From 99e38118a414c82337211e2d821f35d9be1ab3a3 Mon Sep 17 00:00:00 2001
From: arcan1s <darkarcanis@mail.ru>
Date: Thu, 22 Oct 2015 05:22:02 +0300
Subject: [PATCH] drop unused declarations, update qt5.5 patch

---
 packages/qt5.5-qstringlist-and-qinfo.patch    | 29 +++++++++++++++++++
 packages/qt5.5-qstringlist-declaration.patch  | 12 --------
 sources/awesome-widget/plugin/CMakeLists.txt  |  2 --
 .../awesome-widget/plugin/awconfighelper.cpp  |  1 -
 sources/awesomewidgets/CMakeLists.txt         |  2 --
 sources/desktop-panel/plugin/CMakeLists.txt   |  2 --
 sources/extsysmon/CMakeLists.txt              |  2 --
 7 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 packages/qt5.5-qstringlist-and-qinfo.patch
 delete mode 100644 packages/qt5.5-qstringlist-declaration.patch

diff --git a/packages/qt5.5-qstringlist-and-qinfo.patch b/packages/qt5.5-qstringlist-and-qinfo.patch
new file mode 100644
index 0000000..626e498
--- /dev/null
+++ b/packages/qt5.5-qstringlist-and-qinfo.patch
@@ -0,0 +1,29 @@
+diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
+index f808d03..a056b3f 100644
+--- a/sources/awesome-widget/plugin/awkeysaggregator.h
++++ b/sources/awesome-widget/plugin/awkeysaggregator.h
+@@ -21,6 +21,7 @@
+ 
+ #include <QHash>
+ #include <QObject>
++#include <QStringList>
+ 
+ #include "version.h"
+ 
+diff --git a/sources/awdebug.h b/sources/awdebug.h
+index 48dc580..530c0d6 100644
+--- a/sources/awdebug.h
++++ b/sources/awdebug.h
+@@ -23,9 +23,9 @@
+ 
+ #ifndef LOG_FORMAT
+ #define LOG_FORMAT                                                             \
+-    "[%{time process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%{if-"         \
+-    "warning}WW%{endif}%{if-critical}CC%{endif}%{if-fatal}FF%{endif}][%{"      \
+-    "category}][%{function}] %{message}"
++    "[%{time process}][%{if-debug}DD%{endif}%{if-warning}WW%{endif}%{if-"      \
++    "critical}CC%{endif}%{if-fatal}FF%{endif}][%{category}][%{function}] "     \
++    "%{message}"
+ #endif /* LOG_FORMAT */
+ 
+ // redefine info because it doesn't log properly
diff --git a/packages/qt5.5-qstringlist-declaration.patch b/packages/qt5.5-qstringlist-declaration.patch
deleted file mode 100644
index 695d3dd..0000000
--- a/packages/qt5.5-qstringlist-declaration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
-index f808d03..a056b3f 100644
---- a/sources/awesome-widget/plugin/awkeysaggregator.h
-+++ b/sources/awesome-widget/plugin/awkeysaggregator.h
-@@ -21,6 +21,7 @@
- 
- #include <QHash>
- #include <QObject>
-+#include <QStringList>
- 
- #include "version.h"
- 
diff --git a/sources/awesome-widget/plugin/CMakeLists.txt b/sources/awesome-widget/plugin/CMakeLists.txt
index 2c936b6..381937f 100644
--- a/sources/awesome-widget/plugin/CMakeLists.txt
+++ b/sources/awesome-widget/plugin/CMakeLists.txt
@@ -4,8 +4,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidge
 include_directories(
         ${CMAKE_SOURCE_DIR}
         ${CMAKE_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}/../
         ${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/
         ${PROJECT_TRDPARTY_DIR}
         ${Qt_INCLUDE}
diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp
index 5901fc8..6263b30 100644
--- a/sources/awesome-widget/plugin/awconfighelper.cpp
+++ b/sources/awesome-widget/plugin/awconfighelper.cpp
@@ -20,7 +20,6 @@
 #include <KI18n/KLocalizedString>
 
 #include <QDir>
-#include <QMessageBox>
 #include <QQmlPropertyMap>
 #include <QSettings>
 #include <QTextCodec>
diff --git a/sources/awesomewidgets/CMakeLists.txt b/sources/awesomewidgets/CMakeLists.txt
index c6bff53..fe9dfc0 100644
--- a/sources/awesomewidgets/CMakeLists.txt
+++ b/sources/awesomewidgets/CMakeLists.txt
@@ -5,8 +5,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidge
 include_directories(
         ${CMAKE_SOURCE_DIR}
         ${CMAKE_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}/../
         ${PROJECT_TRDPARTY_DIR}
         ${Qt_INCLUDE}
         ${Kf5_INCLUDE}
diff --git a/sources/desktop-panel/plugin/CMakeLists.txt b/sources/desktop-panel/plugin/CMakeLists.txt
index 96de365..34d3aad 100644
--- a/sources/desktop-panel/plugin/CMakeLists.txt
+++ b/sources/desktop-panel/plugin/CMakeLists.txt
@@ -4,8 +4,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.desktoppanel
 include_directories(
         ${CMAKE_SOURCE_DIR}
         ${CMAKE_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}/../
         ${PROJECT_TRDPARTY_DIR}
         ${Qt_INCLUDE}
         ${Kf5_INCLUDE}
diff --git a/sources/extsysmon/CMakeLists.txt b/sources/extsysmon/CMakeLists.txt
index 54a68fd..f7ca636 100644
--- a/sources/extsysmon/CMakeLists.txt
+++ b/sources/extsysmon/CMakeLists.txt
@@ -5,8 +5,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidge
 include_directories(
         ${CMAKE_SOURCE_DIR}
         ${CMAKE_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}/../
         ${CMAKE_CURRENT_SOURCE_DIR}/../${PROJECT_LIBRARY}/
         ${PROJECT_TRDPARTY_DIR}
         ${Qt_INCLUDE}