diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,8 +57,6 @@ ${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 --- 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 */ -#cmakedefine HAVE_DPMSCAPABLE_PROTO 1 - -/* Define if you have the DPMSInfo prototype in */ -#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 header file. */ -#cmakedefine HAVE_SASL_H 1 - -/* Define to 1 if you have the 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 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 header file. */ -#cmakedefine HAVE_SYS_LOADAVG_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_MOUNT_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_STATFS_H 1 - -/* Define to 1 if you have the 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 header file. */ -#cmakedefine HAVE_SYS_SELECT_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_SOCKET_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_VFS_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_WAIT_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_UNISTD_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDINT_H 1 - -/* Define to 1 if you have the 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 and . */ -#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 --- a/daemon/actions/dpms/powerdevildpmsaction.cpp +++ b/daemon/actions/dpms/powerdevildpmsaction.cpp @@ -28,8 +28,6 @@ #include #include -#include - #include #include #include diff --git a/daemon/actions/dpms/xcbdpmshelper.cpp b/daemon/actions/dpms/xcbdpmshelper.cpp --- a/daemon/actions/dpms/xcbdpmshelper.cpp +++ b/daemon/actions/dpms/xcbdpmshelper.cpp @@ -23,7 +23,6 @@ #include #include -#include #include // Qt