Code cleanup

Remove unused includes
Remove void code logic (KCMUTILS_LIBS was always empty anyway)
This commit is contained in:
Aleix Pol 2013-11-15 16:56:17 +01:00
parent 0fa21b4af5
commit 2cb4ebd6f5
2 changed files with 0 additions and 17 deletions

View File

@ -15,7 +15,6 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(PLASMA_NO_KIO TRUE)
set(PLASMA_NO_PACKAGEKIT TRUE)
set(PLASMA_NO_PACKAGE_EXTRADATA TRUE)
set(PLASMA_NO_KUTILS TRUE)
set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
endif()
@ -29,10 +28,6 @@ endif()
# URL "http://www.kde.org" TYPE OPTIONAL
# PURPOSE "Needed for building several Plasma DataEngines")
if(NOT PLASMA_NO_KIO)
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS})
endif()
if(NOT PLASMA_NO_SOLID)
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} KF5::Solid)
endif()
@ -42,11 +37,6 @@ if(NOT PLASMA_NO_PACKAGEKIT)
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} Qt5::DBus)
endif()
if (NOT PLASMA_NO_KUTILS)
#FIXME: for kcmodule classes; should not be in libplasma if possible
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KCMUTILS_LIBS})
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-plasma.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-plasma.h)
#FIXME: gpgme++ is in kdepimlibs, must move somewhere else!

View File

@ -44,13 +44,6 @@
#include <kservicetypetrader.h>
#include <kwindowsystem.h>
#if !PLASMA_NO_KUTILS
#include <kcmoduleinfo.h>
#include <kcmoduleproxy.h>
#else
#include <kcmodule.h>
#endif
#include "configloader.h"
#include "containment.h"
#include "corona.h"