From 16662f697b478356c510d1e6211e8e2c19c82515 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Wed, 20 Aug 2014 22:16:06 +0400 Subject: [PATCH] cleanup! (remove symlinks) --- sources/{gui/src => 3rdparty/about}/about.ui | 0 sources/{gui/src => 3rdparty/language}/language.cpp | 0 sources/{gui/src => 3rdparty/language}/language.h | 0 sources/CMakeLists.txt | 1 + sources/dataengine/CMakeLists.txt | 11 ++++++++--- sources/dataengine/netctl.cpp | 7 ++++--- sources/dataengine/pdebug.h | 1 - sources/dataengine/task.h | 1 - sources/dataengine/taskadds.cpp | 1 - sources/dataengine/taskadds.h | 1 - sources/gui/src/CMakeLists.txt | 11 +++++++---- sources/gui/src/aboutwindow.cpp | 3 ++- sources/gui/src/dbusoperation.cpp | 2 +- sources/gui/src/errorwindow.cpp | 2 +- sources/gui/src/main.cpp | 3 ++- sources/gui/src/mainprivateslots.cpp | 3 ++- sources/gui/src/mainpublicslots.cpp | 7 ++++--- sources/gui/src/mainwindow.cpp | 5 +++-- sources/gui/src/netctlautowindow.cpp | 2 +- sources/gui/src/pdebug.h | 1 - sources/gui/src/settingswindow.cpp | 5 +++-- sources/gui/src/task.h | 1 - sources/gui/src/taskadds.cpp | 1 - sources/gui/src/taskadds.h | 1 - sources/gui/src/trayicon.cpp | 3 ++- sources/helper/src/CMakeLists.txt | 9 ++++++--- sources/helper/src/language.cpp | 1 - sources/helper/src/language.h | 1 - sources/helper/src/main.cpp | 3 ++- sources/helper/src/netctlhelper.cpp | 2 +- sources/helper/src/pdebug.h | 1 - sources/netctlgui/src/CMakeLists.txt | 8 +++++--- sources/netctlgui/src/main.cpp | 2 +- sources/netctlgui/src/netctlgui.h | 1 - sources/netctlgui/src/netctlinteract.cpp | 6 +++--- sources/netctlgui/src/netctlinteract.h | 1 - sources/netctlgui/src/netctlprofile.cpp | 6 +++--- sources/netctlgui/src/netctlprofile.h | 1 - sources/netctlgui/src/pdebug.h | 1 - sources/netctlgui/src/task.h | 1 - sources/netctlgui/src/taskadds.cpp | 1 - sources/netctlgui/src/taskadds.h | 1 - sources/netctlgui/src/wpasupinteract.cpp | 6 +++--- sources/netctlgui/src/wpasupinteract.h | 1 - sources/plasmoid/CMakeLists.txt | 9 +++++++-- sources/plasmoid/about.ui | 1 - sources/plasmoid/netctl.cpp | 3 ++- sources/plasmoid/pdebug.h | 1 - 48 files changed, 74 insertions(+), 66 deletions(-) rename sources/{gui/src => 3rdparty/about}/about.ui (100%) rename sources/{gui/src => 3rdparty/language}/language.cpp (100%) rename sources/{gui/src => 3rdparty/language}/language.h (100%) delete mode 120000 sources/dataengine/pdebug.h delete mode 120000 sources/dataengine/task.h delete mode 120000 sources/dataengine/taskadds.cpp delete mode 120000 sources/dataengine/taskadds.h delete mode 120000 sources/gui/src/pdebug.h delete mode 120000 sources/gui/src/task.h delete mode 120000 sources/gui/src/taskadds.cpp delete mode 120000 sources/gui/src/taskadds.h delete mode 120000 sources/helper/src/language.cpp delete mode 120000 sources/helper/src/language.h delete mode 120000 sources/helper/src/pdebug.h delete mode 120000 sources/netctlgui/src/netctlgui.h delete mode 120000 sources/netctlgui/src/netctlinteract.h delete mode 120000 sources/netctlgui/src/netctlprofile.h delete mode 120000 sources/netctlgui/src/pdebug.h delete mode 120000 sources/netctlgui/src/task.h delete mode 120000 sources/netctlgui/src/taskadds.cpp delete mode 120000 sources/netctlgui/src/taskadds.h delete mode 120000 sources/netctlgui/src/wpasupinteract.h delete mode 120000 sources/plasmoid/about.ui delete mode 120000 sources/plasmoid/pdebug.h diff --git a/sources/gui/src/about.ui b/sources/3rdparty/about/about.ui similarity index 100% rename from sources/gui/src/about.ui rename to sources/3rdparty/about/about.ui diff --git a/sources/gui/src/language.cpp b/sources/3rdparty/language/language.cpp similarity index 100% rename from sources/gui/src/language.cpp rename to sources/3rdparty/language/language.cpp diff --git a/sources/gui/src/language.h b/sources/3rdparty/language/language.h similarity index 100% rename from sources/gui/src/language.h rename to sources/3rdparty/language/language.h diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 00da206..5a4317a 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -61,6 +61,7 @@ endif () configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) # resources +set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) set (PROJECT_LIBRARY netctlgui) set (PROJECT_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources) add_subdirectory (${PROJECT_RESOURCE_DIR}) diff --git a/sources/dataengine/CMakeLists.txt b/sources/dataengine/CMakeLists.txt index a92a70c..8712186 100644 --- a/sources/dataengine/CMakeLists.txt +++ b/sources/dataengine/CMakeLists.txt @@ -7,13 +7,18 @@ find_package (KDE4 REQUIRED) include (KDE4Defaults) add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../) +include_directories (${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${KDE4_INCLUDES} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/../ + ${PROJECT_TRDPARTY_DIR}) set (PLUGIN_NAME ${SUBPROJECT}) file (GLOB SUBPROJECT_DESKTOP_IN *.desktop) file (RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN}) -file (GLOB SUBPROJECT_SOURCE *.cpp) -set (TASK_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/task.h) +file (GLOB_RECURSE SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/task/*.cpp) +set (TASK_HEADER ${PROJECT_TRDPARTY_DIR}/task/task.h) file (GLOB SUBPROJECT_CONF *.conf) # prepare diff --git a/sources/dataengine/netctl.cpp b/sources/dataengine/netctl.cpp index b04703c..fbef2b1 100644 --- a/sources/dataengine/netctl.cpp +++ b/sources/dataengine/netctl.cpp @@ -15,6 +15,8 @@ * along with netctl-gui. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ +#include "netctl.h" + #include #include #include @@ -25,9 +27,8 @@ #include #include -#include "netctl.h" -#include "pdebug.h" -#include "taskadds.h" +#include +#include Netctl::Netctl(QObject *parent, const QVariantList &args) diff --git a/sources/dataengine/pdebug.h b/sources/dataengine/pdebug.h deleted file mode 120000 index bddbe27..0000000 --- a/sources/dataengine/pdebug.h +++ /dev/null @@ -1 +0,0 @@ -../3rdparty/pdebug/pdebug.h \ No newline at end of file diff --git a/sources/dataengine/task.h b/sources/dataengine/task.h deleted file mode 120000 index 254b484..0000000 --- a/sources/dataengine/task.h +++ /dev/null @@ -1 +0,0 @@ -../3rdparty/task/task.h \ No newline at end of file diff --git a/sources/dataengine/taskadds.cpp b/sources/dataengine/taskadds.cpp deleted file mode 120000 index 97b06b2..0000000 --- a/sources/dataengine/taskadds.cpp +++ /dev/null @@ -1 +0,0 @@ -../3rdparty/task/taskadds.cpp \ No newline at end of file diff --git a/sources/dataengine/taskadds.h b/sources/dataengine/taskadds.h deleted file mode 120000 index 55b2cd9..0000000 --- a/sources/dataengine/taskadds.h +++ /dev/null @@ -1 +0,0 @@ -../3rdparty/task/taskadds.h \ No newline at end of file diff --git a/sources/gui/src/CMakeLists.txt b/sources/gui/src/CMakeLists.txt index e8285a6..bc3e913 100644 --- a/sources/gui/src/CMakeLists.txt +++ b/sources/gui/src/CMakeLists.txt @@ -1,7 +1,9 @@ # set files -file (GLOB SOURCES *.cpp) -file (GLOB HEADERS *.h) -file (GLOB FORMS *.ui) +file (GLOB_RECURSE SOURCES *.cpp ${PROJECT_TRDPARTY_DIR}/task/*.cpp + ${PROJECT_TRDPARTY_DIR}/language/*.cpp) +file (GLOB_RECURSE HEADERS *.h ${PROJECT_TRDPARTY_DIR}/task/*.h + ${PROJECT_TRDPARTY_DIR}/language/*.h) +file (GLOB_RECURSE FORMS *.ui ${PROJECT_TRDPARTY_DIR}/about/*.ui) file (GLOB LANGUAGES ${SUBPROJECT_TRANSLATION_DIR}/*.ts) set (RESOURCES ${SUBPROJECT_RESOURCE_DIR}/resources.qrc) @@ -11,7 +13,8 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/includ ${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}) + ${CMAKE_CURRENT_BINARY_DIR} + ${PROJECT_TRDPARTY_DIR}) link_directories (${PROJECT_LIBRARY}/src/lib) if (USE_QT5) diff --git a/sources/gui/src/aboutwindow.cpp b/sources/gui/src/aboutwindow.cpp index a474e34..2780d7f 100644 --- a/sources/gui/src/aboutwindow.cpp +++ b/sources/gui/src/aboutwindow.cpp @@ -22,7 +22,8 @@ #include #include -#include "pdebug.h" +#include + #include "version.h" diff --git a/sources/gui/src/dbusoperation.cpp b/sources/gui/src/dbusoperation.cpp index 5d72103..c11bc13 100644 --- a/sources/gui/src/dbusoperation.cpp +++ b/sources/gui/src/dbusoperation.cpp @@ -21,7 +21,7 @@ #include #include -#include "pdebug.h" +#include QList parseOutputNetctl(const QList raw, diff --git a/sources/gui/src/errorwindow.cpp b/sources/gui/src/errorwindow.cpp index d342e17..c7032cd 100644 --- a/sources/gui/src/errorwindow.cpp +++ b/sources/gui/src/errorwindow.cpp @@ -22,7 +22,7 @@ #include #include -#include "pdebug.h" +#include ErrorWindow::ErrorWindow(QWidget *parent, const bool debugCmd) diff --git a/sources/gui/src/main.cpp b/sources/gui/src/main.cpp index 9c19fff..40ce105 100644 --- a/sources/gui/src/main.cpp +++ b/sources/gui/src/main.cpp @@ -25,7 +25,8 @@ #include #include -#include "language.h" +#include + #include "mainwindow.h" #include "messages.h" #include "version.h" diff --git a/sources/gui/src/mainprivateslots.cpp b/sources/gui/src/mainprivateslots.cpp index 4891a40..834d510 100644 --- a/sources/gui/src/mainprivateslots.cpp +++ b/sources/gui/src/mainprivateslots.cpp @@ -24,6 +24,8 @@ #include #include +#include + #include "bridgewidget.h" #include "dbusoperation.h" #include "errorwindow.h" @@ -33,7 +35,6 @@ #include "macvlanwidget.h" #include "mobilewidget.h" #include "passwdwidget.h" -#include "pdebug.h" #include "pppoewidget.h" #include "tunnelwidget.h" #include "tuntapwidget.h" diff --git a/sources/gui/src/mainpublicslots.cpp b/sources/gui/src/mainpublicslots.cpp index 631719e..7cbf991 100644 --- a/sources/gui/src/mainpublicslots.cpp +++ b/sources/gui/src/mainpublicslots.cpp @@ -24,15 +24,16 @@ #include #include +#include +#include +#include + #include "aboutwindow.h" #include "dbusoperation.h" #include "errorwindow.h" -#include "language.h" #include "netctlautowindow.h" #include "passwdwidget.h" -#include "pdebug.h" #include "settingswindow.h" -#include "taskadds.h" #include "trayicon.h" #include "version.h" diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index 52950b7..4ba2b88 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -22,6 +22,9 @@ #include #include +#include +#include + #include "aboutwindow.h" #include "bridgewidget.h" #include "dbusoperation.h" @@ -34,10 +37,8 @@ #include "netctlautowindow.h" #include "netctlguiadaptor.h" #include "passwdwidget.h" -#include "pdebug.h" #include "pppoewidget.h" #include "settingswindow.h" -#include "taskadds.h" #include "trayicon.h" #include "tunnelwidget.h" #include "tuntapwidget.h" diff --git a/sources/gui/src/netctlautowindow.cpp b/sources/gui/src/netctlautowindow.cpp index 79d5d6b..675909d 100644 --- a/sources/gui/src/netctlautowindow.cpp +++ b/sources/gui/src/netctlautowindow.cpp @@ -21,9 +21,9 @@ #include #include +#include #include "dbusoperation.h" -#include "pdebug.h" #include "version.h" diff --git a/sources/gui/src/pdebug.h b/sources/gui/src/pdebug.h deleted file mode 120000 index 2c26e28..0000000 --- a/sources/gui/src/pdebug.h +++ /dev/null @@ -1 +0,0 @@ -../../3rdparty/pdebug/pdebug.h \ No newline at end of file diff --git a/sources/gui/src/settingswindow.cpp b/sources/gui/src/settingswindow.cpp index d3ebfbf..24e639b 100644 --- a/sources/gui/src/settingswindow.cpp +++ b/sources/gui/src/settingswindow.cpp @@ -23,9 +23,10 @@ #include #include -#include "language.h" +#include +#include + #include "mainwindow.h" -#include "pdebug.h" SettingsWindow::SettingsWindow(QWidget *parent, const bool debugCmd, const QString configFile) diff --git a/sources/gui/src/task.h b/sources/gui/src/task.h deleted file mode 120000 index 5da0bbd..0000000 --- a/sources/gui/src/task.h +++ /dev/null @@ -1 +0,0 @@ -../../3rdparty/task/task.h \ No newline at end of file diff --git a/sources/gui/src/taskadds.cpp b/sources/gui/src/taskadds.cpp deleted file mode 120000 index 419d267..0000000 --- a/sources/gui/src/taskadds.cpp +++ /dev/null @@ -1 +0,0 @@ -../../3rdparty/task/taskadds.cpp \ No newline at end of file diff --git a/sources/gui/src/taskadds.h b/sources/gui/src/taskadds.h deleted file mode 120000 index 1611105..0000000 --- a/sources/gui/src/taskadds.h +++ /dev/null @@ -1 +0,0 @@ -../../3rdparty/task/taskadds.h \ No newline at end of file diff --git a/sources/gui/src/trayicon.cpp b/sources/gui/src/trayicon.cpp index 0bdbb46..1155edc 100644 --- a/sources/gui/src/trayicon.cpp +++ b/sources/gui/src/trayicon.cpp @@ -21,8 +21,9 @@ #include #include +#include + #include "mainwindow.h" -#include "pdebug.h" TrayIcon::TrayIcon(QObject *parent, const bool debugCmd) diff --git a/sources/helper/src/CMakeLists.txt b/sources/helper/src/CMakeLists.txt index defd301..c5ca85c 100644 --- a/sources/helper/src/CMakeLists.txt +++ b/sources/helper/src/CMakeLists.txt @@ -1,6 +1,8 @@ # set files -file (GLOB SOURCES *.cpp) -file (GLOB HEADERS *.h) +file (GLOB_RECURSE SOURCES *.cpp ${PROJECT_TRDPARTY_DIR}/task/*.cpp + ${PROJECT_TRDPARTY_DIR}/language/*.cpp) +file (GLOB_RECURSE HEADERS *.h ${PROJECT_TRDPARTY_DIR}/task/*.h + ${PROJECT_TRDPARTY_DIR}/language/*.h) file (GLOB LANGUAGES ${SUBPROJECT_TRANSLATION_DIR}/*.ts) set (RESOURCES ${SUBPROJECT_RESOURCE_DIR}/resources-helper.qrc) @@ -10,7 +12,8 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/includ ${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}) + ${CMAKE_CURRENT_BINARY_DIR} + ${PROJECT_TRDPARTY_DIR}) link_directories (${PROJECT_LIBRARY}/src/lib) if (USE_QT5) diff --git a/sources/helper/src/language.cpp b/sources/helper/src/language.cpp deleted file mode 120000 index b49a613..0000000 --- a/sources/helper/src/language.cpp +++ /dev/null @@ -1 +0,0 @@ -../../gui/src/language.cpp \ No newline at end of file diff --git a/sources/helper/src/language.h b/sources/helper/src/language.h deleted file mode 120000 index 6feee84..0000000 --- a/sources/helper/src/language.h +++ /dev/null @@ -1 +0,0 @@ -../../gui/src/language.h \ No newline at end of file diff --git a/sources/helper/src/main.cpp b/sources/helper/src/main.cpp index 77f9de4..ff7c9f2 100644 --- a/sources/helper/src/main.cpp +++ b/sources/helper/src/main.cpp @@ -25,7 +25,8 @@ #include #include -#include "language.h" +#include + #include "messages.h" #include "netctlhelper.h" #include "version.h" diff --git a/sources/helper/src/netctlhelper.cpp b/sources/helper/src/netctlhelper.cpp index 08996b6..759bbb8 100644 --- a/sources/helper/src/netctlhelper.cpp +++ b/sources/helper/src/netctlhelper.cpp @@ -24,10 +24,10 @@ #include #include +#include #include "controladaptor.h" #include "netctladaptor.h" -#include "pdebug.h" #include "version.h" diff --git a/sources/helper/src/pdebug.h b/sources/helper/src/pdebug.h deleted file mode 120000 index 2c26e28..0000000 --- a/sources/helper/src/pdebug.h +++ /dev/null @@ -1 +0,0 @@ -../../3rdparty/pdebug/pdebug.h \ No newline at end of file diff --git a/sources/netctlgui/src/CMakeLists.txt b/sources/netctlgui/src/CMakeLists.txt index 80038d4..843a536 100644 --- a/sources/netctlgui/src/CMakeLists.txt +++ b/sources/netctlgui/src/CMakeLists.txt @@ -1,13 +1,15 @@ # set files -file (GLOB SOURCES *.cpp) -file (GLOB HEADERS *.h) +file (GLOB_RECURSE SOURCES *.cpp ${PROJECT_TRDPARTY_DIR}/task/*.cpp) +file (GLOB_RECURSE HEADERS *.h ${SUBPROJECT_INCLUDE_DIR}/*h + ${PROJECT_TRDPARTY_DIR}/task/*.h) # include_path include_directories (${SUBPROJECT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}) + ${CMAKE_CURRENT_BINARY_DIR} + ${PROJECT_TRDPARTY_DIR}) if (USE_QT5) find_package(Qt5 COMPONENTS Core REQUIRED) diff --git a/sources/netctlgui/src/main.cpp b/sources/netctlgui/src/main.cpp index c52f729..45047c5 100644 --- a/sources/netctlgui/src/main.cpp +++ b/sources/netctlgui/src/main.cpp @@ -23,7 +23,7 @@ */ -#include "netctlgui.h" +#include /** diff --git a/sources/netctlgui/src/netctlgui.h b/sources/netctlgui/src/netctlgui.h deleted file mode 120000 index 39334b9..0000000 --- a/sources/netctlgui/src/netctlgui.h +++ /dev/null @@ -1 +0,0 @@ -../include/netctlgui/netctlgui.h \ No newline at end of file diff --git a/sources/netctlgui/src/netctlinteract.cpp b/sources/netctlgui/src/netctlinteract.cpp index 55454a5..f55b10b 100644 --- a/sources/netctlgui/src/netctlinteract.cpp +++ b/sources/netctlgui/src/netctlinteract.cpp @@ -26,9 +26,9 @@ #include #include -#include "netctlgui.h" -#include "pdebug.h" -#include "taskadds.h" +#include +#include +#include /** diff --git a/sources/netctlgui/src/netctlinteract.h b/sources/netctlgui/src/netctlinteract.h deleted file mode 120000 index eee7a8a..0000000 --- a/sources/netctlgui/src/netctlinteract.h +++ /dev/null @@ -1 +0,0 @@ -../include/netctlgui/netctlinteract.h \ No newline at end of file diff --git a/sources/netctlgui/src/netctlprofile.cpp b/sources/netctlgui/src/netctlprofile.cpp index 45eeee3..7806f4d 100644 --- a/sources/netctlgui/src/netctlprofile.cpp +++ b/sources/netctlgui/src/netctlprofile.cpp @@ -29,9 +29,9 @@ #include #include -#include "netctlgui.h" -#include "pdebug.h" -#include "taskadds.h" +#include +#include +#include /** diff --git a/sources/netctlgui/src/netctlprofile.h b/sources/netctlgui/src/netctlprofile.h deleted file mode 120000 index 9934b85..0000000 --- a/sources/netctlgui/src/netctlprofile.h +++ /dev/null @@ -1 +0,0 @@ -../include/netctlgui/netctlprofile.h \ No newline at end of file diff --git a/sources/netctlgui/src/pdebug.h b/sources/netctlgui/src/pdebug.h deleted file mode 120000 index 2c26e28..0000000 --- a/sources/netctlgui/src/pdebug.h +++ /dev/null @@ -1 +0,0 @@ -../../3rdparty/pdebug/pdebug.h \ No newline at end of file diff --git a/sources/netctlgui/src/task.h b/sources/netctlgui/src/task.h deleted file mode 120000 index 5da0bbd..0000000 --- a/sources/netctlgui/src/task.h +++ /dev/null @@ -1 +0,0 @@ -../../3rdparty/task/task.h \ No newline at end of file diff --git a/sources/netctlgui/src/taskadds.cpp b/sources/netctlgui/src/taskadds.cpp deleted file mode 120000 index 419d267..0000000 --- a/sources/netctlgui/src/taskadds.cpp +++ /dev/null @@ -1 +0,0 @@ -../../3rdparty/task/taskadds.cpp \ No newline at end of file diff --git a/sources/netctlgui/src/taskadds.h b/sources/netctlgui/src/taskadds.h deleted file mode 120000 index 1611105..0000000 --- a/sources/netctlgui/src/taskadds.h +++ /dev/null @@ -1 +0,0 @@ -../../3rdparty/task/taskadds.h \ No newline at end of file diff --git a/sources/netctlgui/src/wpasupinteract.cpp b/sources/netctlgui/src/wpasupinteract.cpp index 659f062..fb26aba 100644 --- a/sources/netctlgui/src/wpasupinteract.cpp +++ b/sources/netctlgui/src/wpasupinteract.cpp @@ -26,9 +26,9 @@ #include #include -#include "netctlgui.h" -#include "pdebug.h" -#include "taskadds.h" +#include +#include +#include /** diff --git a/sources/netctlgui/src/wpasupinteract.h b/sources/netctlgui/src/wpasupinteract.h deleted file mode 120000 index b052f5c..0000000 --- a/sources/netctlgui/src/wpasupinteract.h +++ /dev/null @@ -1 +0,0 @@ -../include/netctlgui/wpasupinteract.h \ No newline at end of file diff --git a/sources/plasmoid/CMakeLists.txt b/sources/plasmoid/CMakeLists.txt index 1081035..d795ae3 100644 --- a/sources/plasmoid/CMakeLists.txt +++ b/sources/plasmoid/CMakeLists.txt @@ -9,7 +9,12 @@ find_package (KDE4 REQUIRED) include (KDE4Defaults) add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../) +include_directories (${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${KDE4_INCLUDES} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/../ + ${PROJECT_TRDPARTY_DIR}) add_subdirectory (po) @@ -19,7 +24,7 @@ file (GLOB SUBPROJECT_DESKTOP_IN *.desktop) file (RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN}) file (GLOB SUBPROJECT_NOTIFY *.notifyrc) file (GLOB SUBPROJECT_SOURCE *.cpp) -file (GLOB SUBPROJECT_UI *.ui) +file (GLOB_RECURSE SUBPROJECT_UI *.ui ${PROJECT_TRDPARTY_DIR}/about/*.ui) # prepare configure_file (${SUBPROJECT_DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP}) diff --git a/sources/plasmoid/about.ui b/sources/plasmoid/about.ui deleted file mode 120000 index 84f8ecb..0000000 --- a/sources/plasmoid/about.ui +++ /dev/null @@ -1 +0,0 @@ -../gui/src/about.ui \ No newline at end of file diff --git a/sources/plasmoid/netctl.cpp b/sources/plasmoid/netctl.cpp index dcceea4..a9689d0 100644 --- a/sources/plasmoid/netctl.cpp +++ b/sources/plasmoid/netctl.cpp @@ -29,8 +29,9 @@ #include #include +#include + #include "netctl.h" -#include "pdebug.h" #include "ui_about.h" #include "ui_appearance.h" #include "ui_dataengine.h" diff --git a/sources/plasmoid/pdebug.h b/sources/plasmoid/pdebug.h deleted file mode 120000 index bddbe27..0000000 --- a/sources/plasmoid/pdebug.h +++ /dev/null @@ -1 +0,0 @@ -../3rdparty/pdebug/pdebug.h \ No newline at end of file