diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kdesktop/lock | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/lock')
| -rw-r--r-- | kdesktop/lock/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | kdesktop/lock/autologout.cc | 2 | ||||
| -rw-r--r-- | kdesktop/lock/infodlg.cc | 2 | ||||
| -rw-r--r-- | kdesktop/lock/lockdlg.cc | 2 | ||||
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 2 | ||||
| -rw-r--r-- | kdesktop/lock/querydlg.cc | 2 | ||||
| -rw-r--r-- | kdesktop/lock/sakdlg.cc | 2 | ||||
| -rw-r--r-- | kdesktop/lock/securedlg.cc | 2 |
8 files changed, 8 insertions, 15 deletions
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt index e847cf1fc..80c2b2cdb 100644 --- a/kdesktop/lock/CMakeLists.txt +++ b/kdesktop/lock/CMakeLists.txt @@ -32,16 +32,11 @@ set( target kdesktop_lock ) set( ${target}_SRCS lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc sakdlg.cc - securedlg.cc autologout.cc main.cc + securedlg.cc autologout.cc main.cc backtrace_symbols.c ) -if( WITH_KDESKTOP_LOCK_BACKTRACE ) - list( APPEND ${target}_SRCS backtrace_symbols.c ) - set( BACKTRACE_LIBRARY bfd ) -endif( ) - tde_add_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdesktopsettings-static dmctl-static kio-shared Xext ${BACKTRACE_LIBRARY} ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}" + LINK kdesktopsettings-static dmctl-static tdeio-shared Xext bfd ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}" DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc index 024425d2c..ef683cbcc 100644 --- a/kdesktop/lock/autologout.cc +++ b/kdesktop/lock/autologout.cc @@ -10,7 +10,7 @@ #include <kapplication.h> #include <klocale.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kdebug.h> #include <dcopref.h> diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc index 725122134..56ee83e38 100644 --- a/kdesktop/lock/infodlg.cc +++ b/kdesktop/lock/infodlg.cc @@ -16,7 +16,7 @@ #include <kseparator.h> #include <kstandarddirs.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> #include <kpassdlg.h> diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 29dc8bd9c..2684403a5 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -21,7 +21,7 @@ #include <kseparator.h> #include <kstandarddirs.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> #include <kpassdlg.h> diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 5f01274a8..a3f5fb56f 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -137,7 +137,6 @@ static Atom gXA_SCREENSAVER_VERSION; void print_trace() { -#ifdef WITH_KDESKTOP_LOCK_BACKTRACE void *array[10]; size_t size; char **strings; @@ -153,7 +152,6 @@ void print_trace() } free (strings); -#endif } static void segv_handler(int) diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc index 401370b21..acac92127 100644 --- a/kdesktop/lock/querydlg.cc +++ b/kdesktop/lock/querydlg.cc @@ -16,7 +16,7 @@ #include <kseparator.h> #include <kstandarddirs.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> #include <kpassdlg.h> diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc index 6f983ce70..4904e71e1 100644 --- a/kdesktop/lock/sakdlg.cc +++ b/kdesktop/lock/sakdlg.cc @@ -16,7 +16,7 @@ #include <kseparator.h> #include <kstandarddirs.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> #include <kpassdlg.h> diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc index 08a70a17d..79147ae0a 100644 --- a/kdesktop/lock/securedlg.cc +++ b/kdesktop/lock/securedlg.cc @@ -16,7 +16,7 @@ #include <kseparator.h> #include <kstandarddirs.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> #include <kpassdlg.h> |