From dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:17:21 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kinit/CMakeLists.txt | 2 +-
 kinit/kinit.cpp      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kinit')

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(); }
-- 
cgit v1.2.1