summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Becker <[email protected]>2017-04-26 15:08:13 +0200
committerHeiko Becker <[email protected]>2017-04-26 15:16:51 +0200
commit543e6c4235d7d64067d878d20175556161b87ee4 (patch)
treed799e6e95fb683944c896aaec1d84d20b790c246
parent4c3b9dca9b3ed3c58cfbcd3b95c8ce75461dc403 (diff)
Remove no longer needed config-workspace header
Summary: Most of these defines seem to originate from the old kde-workspace; DPMS is a hard dependency since 7ffb0bb7586786d77f5c3c294d00562e85083bee. In any case I could not find any trace of any these defines in the current code. Test Plan: Built and installed, no apparent difference. Reviewers: #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D5599
-rw-r--r--CMakeLists.txt2
-rw-r--r--config-workspace.h.cmake159
-rw-r--r--daemon/actions/dpms/powerdevildpmsaction.cpp2
-rw-r--r--daemon/actions/dpms/xcbdpmshelper.cpp1
4 files changed, 0 insertions, 164 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a141da7..4bd2fbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,8 +57,6 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}/daemon
)
-configure_file(config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
-
add_definitions(-DQT_NO_KEYWORDS)
add_definitions(-DQT_NO_KEYWORDS)
diff --git a/config-workspace.h.cmake b/config-workspace.h.cmake
deleted file mode 100644
index 66c1d63..0000000
--- a/config-workspace.h.cmake
+++ /dev/null
@@ -1,159 +0,0 @@
-/* config-workspace.h. Generated by cmake from config-workspace.h.cmake */
-
-#cmakedefine HAVE_QIMAGEBLITZ
-
-/* Define if you have DPMS support */
-#cmakedefine HAVE_DPMS 1
-
-/* Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h> */
-#cmakedefine HAVE_DPMSCAPABLE_PROTO 1
-
-/* Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h> */
-#cmakedefine HAVE_DPMSINFO_PROTO 1
-
-/* Defines if your system has the libfontconfig library */
-#cmakedefine HAVE_FONTCONFIG 1
-
-/* Defines if your system has the freetype library */
-#cmakedefine HAVE_FREETYPE 1
-
-/* Define if you have gethostname */
-#cmakedefine HAVE_GETHOSTNAME 1
-
-/* Define if you have the gethostname prototype */
-#cmakedefine HAVE_GETHOSTNAME_PROTO 1
-
-/* Define to 1 if you have the `getpeereid' function. */
-#cmakedefine HAVE_GETPEEREID 1
-
-/* Defines if you have Solaris' libkstat */
-/* #undef HAVE_KSTAT */
-
-/* Define if you have long long as datatype */
-#cmakedefine HAVE_LONG_LONG 1
-
-/* Define to 1 if you have the `nice' function. */
-#cmakedefine HAVE_NICE 1
-
-/* Define to 1 if you have the <sasl.h> header file. */
-#cmakedefine HAVE_SASL_H 1
-
-/* Define to 1 if you have the <sasl/sasl.h> header file. */
-#cmakedefine HAVE_SASL_SASL_H 1
-
-/* Define to 1 if you have the `setpriority' function. */
-#cmakedefine HAVE_SETPRIORITY 1
-
-/* Define to 1 if you have the `sigaction' function. */
-#cmakedefine HAVE_SIGACTION 1
-
-/* Define to 1 if you have the `sigset' function. */
-#cmakedefine HAVE_SIGSET 1
-
-/* Define to 1 if you have statvfs */
-#cmakedefine HAVE_STATVFS 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#cmakedefine HAVE_STRING_H 1
-
-/* Define if you have the struct ucred */
-#cmakedefine HAVE_STRUCT_UCRED 1
-
-/* Define to 1 if you have the <sys/loadavg.h> header file. */
-#cmakedefine HAVE_SYS_LOADAVG_H 1
-
-/* Define to 1 if you have the <sys/mount.h> header file. */
-#cmakedefine HAVE_SYS_MOUNT_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#cmakedefine HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/statfs.h> header file. */
-#cmakedefine HAVE_SYS_STATFS_H 1
-
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-#cmakedefine HAVE_SYS_STATVFS_H 1
-
-/* Define to 1 if you have statfs(). */
-#cmakedefine HAVE_STATFS 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#cmakedefine HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#cmakedefine HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#cmakedefine HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-#cmakedefine HAVE_SYS_VFS_H 1
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#cmakedefine HAVE_SYS_WAIT_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#cmakedefine HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#cmakedefine HAVE_MALLOC_H 1
-
-/* Define if you have unsetenv */
-#cmakedefine HAVE_UNSETENV 1
-
-/* Define if you have the unsetenv prototype */
-#cmakedefine HAVE_UNSETENV_PROTO 1
-
-/* Define if you have usleep */
-#cmakedefine HAVE_USLEEP 1
-
-/* Define if you have the usleep prototype */
-#cmakedefine HAVE_USLEEP_PROTO 1
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#cmakedefine HAVE_VSNPRINTF 1
-
-/* Define to 1 if you have the Wayland libraries. */
-#cmakedefine WAYLAND_FOUND 1
-
-/* KDE's default home directory */
-#cmakedefine KDE_DEFAULT_HOME "${KDE_DEFAULT_HOME}"
-
-/* KDE's binaries directory */
-#define KDE_BINDIR "${BIN_INSTALL_DIR}"
-
-/* KDE's configuration directory */
-#define KDE_CONFDIR "${CONFIG_INSTALL_DIR}"
-
-/* KDE's static data directory */
-#define KDE_DATADIR "${DATA_INSTALL_DIR}"
-
-/* Define where your java executable is */
-#undef PATH_JAVA
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#cmakedefine TIME_WITH_SYS_TIME 1
-
-/* X binaries directory */
-#cmakedefine XBINDIR "${XBINDIR}"
-
-/* X libraries directory */
-#cmakedefine XLIBDIR "${XLIBDIR}"
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#define _FILE_OFFSET_BITS 64
-
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-/* type to use in place of socklen_t if not defined */
-#define kde_socklen_t socklen_t
-
-#define WORKSPACE_VERSION_STRING "${KDE4WORKSPACE_VERSION}" \ No newline at end of file
diff --git a/daemon/actions/dpms/powerdevildpmsaction.cpp b/daemon/actions/dpms/powerdevildpmsaction.cpp
index 3993190..d6bc71f 100644
--- a/daemon/actions/dpms/powerdevildpmsaction.cpp
+++ b/daemon/actions/dpms/powerdevildpmsaction.cpp
@@ -28,8 +28,6 @@
#include <powerdevilcore.h>
#include <powerdevil_debug.h>
-#include <config-workspace.h>
-
#include <QGuiApplication>
#include <QX11Info>
#include <QDebug>
diff --git a/daemon/actions/dpms/xcbdpmshelper.cpp b/daemon/actions/dpms/xcbdpmshelper.cpp
index 8516333..7a06f7b 100644
--- a/daemon/actions/dpms/xcbdpmshelper.cpp
+++ b/daemon/actions/dpms/xcbdpmshelper.cpp
@@ -23,7 +23,6 @@
#include <powerdevilpolicyagent.h>
#include <powerdevil_debug.h>
-#include <config-workspace.h>
#include <kwinkscreenhelpereffect.h>
// Qt