diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:01 -0600 |
| commit | ada451a25c1465c530dce9013d113d0b939ba96e (patch) | |
| tree | 2905e8c57fe35867527de0bcbb40e6329b5121b5 /ktux | |
| parent | 3e2a2c432996c0959278a76d08c5b0b827c72329 (diff) | |
| download | tdetoys-ada451a25c1465c530dce9013d113d0b939ba96e.tar.gz tdetoys-ada451a25c1465c530dce9013d113d0b939ba96e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'ktux')
| -rw-r--r-- | ktux/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ktux/Makefile.am | 4 | ||||
| -rw-r--r-- | ktux/ktux.desktop | 2 | ||||
| -rw-r--r-- | ktux/sprite.cpp | 2 | ||||
| -rw-r--r-- | ktux/sprite.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/ktux/CMakeLists.txt b/ktux/CMakeLists.txt index 384c8d5..cd18957 100644 --- a/ktux/CMakeLists.txt +++ b/ktux/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( tde_add_executable( ktux AUTOMOC SOURCES spriteanim.cpp spritemisc.cpp spritepm.cpp sprite.cpp - LINK kio-shared kscreensaver-shared + LINK kio-shared tdescreensaver-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ktux/Makefile.am b/ktux/Makefile.am index f34b50a..2a32b32 100644 --- a/ktux/Makefile.am +++ b/ktux/Makefile.am @@ -12,10 +12,10 @@ bin_PROGRAMS = ktux INCLUDES = $(all_includes) # the library search path. -ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. -ktux_LDADD = $(LIB_TDEUI) -lkscreensaver +ktux_LDADD = $(LIB_TDEUI) -ltdescreensaver # which sources should be compiled for ktux ktux_SOURCES = spriteanim.cpp spritemisc.cpp spritepm.cpp sprite.cpp diff --git a/ktux/ktux.desktop b/ktux/ktux.desktop index 77e372f..01f71c6 100644 --- a/ktux/ktux.desktop +++ b/ktux/ktux.desktop @@ -86,7 +86,7 @@ Name[xh]=Iyacwangciswa... Name[zh_CN]=设置... Name[zh_TW]=設定... Name[zu]=Iyalungiselela... -Icon=kscreensaver +Icon=tdescreensaver [Desktop Action InWindow] Exec=ktux -window-id %w diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp index c87fd9c..8110396 100644 --- a/ktux/sprite.cpp +++ b/ktux/sprite.cpp @@ -23,7 +23,7 @@ #include "sprite.moc" -// libkscreensaver interface +// libtdescreensaver interface extern "C" { KDE_EXPORT const char *kss_applicationName = "ktux"; diff --git a/ktux/sprite.h b/ktux/sprite.h index 9b60abe..58c27f2 100644 --- a/ktux/sprite.h +++ b/ktux/sprite.h @@ -13,7 +13,7 @@ #include <tqptrlist.h> #include <tqstrlist.h> #include <tqcanvas.h> -#include <kscreensaver.h> +#include <tdescreensaver.h> #include "spriteanim.h" //----------------------------------------------------------------------------- |