diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /kinit | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kinit')
| -rw-r--r-- | kinit/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kinit/kinit.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt index fd1408918..834242bf1 100644 --- a/kinit/CMakeLists.txt +++ b/kinit/CMakeLists.txt @@ -39,7 +39,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK ltdlc-static kparts-shared + LINK ltdlc-static tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index 1f65658d9..6cf9293d6 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -166,9 +166,9 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err ); } #endif -/* These are to link libkparts even if 'smart' linker is used */ -#include <kparts/plugin.h> -extern "C" KParts::Plugin* _kinit_init_kparts() { return new KParts::Plugin(); } +/* These are to link libtdeparts even if 'smart' linker is used */ +#include <tdeparts/plugin.h> +extern "C" KParts::Plugin* _kinit_init_tdeparts() { return new KParts::Plugin(); } /* These are to link libkio even if 'smart' linker is used */ #include <kio/authinfo.h> extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); } |