Rename a number of libraries and executables to avoid conflicts with KDE4

configdialog/CMakeLists.txt

@@ -36,7 +36,7 @@ tde_add_executable( kbfxconfigapp AUTOMOC
           kbfxconfigdlgstyle.ui kbfxconfigdlgtooltip.ui
           kbfxconfigdlgfonts-old.ui kbfxconfigdlgplugins.ui
           kbfxconfigdlglayout.ui
-  LINK ${TQT_LIBRARIES} kbfxdata kbfxcommon tdecore-shared tdeui-shared DCOP-shared kio-shared khtml-shared
+  LINK ${TQT_LIBRARIES} kbfxdata kbfxcommon tdecore-shared tdeui-shared DCOP-shared kio-shared tdehtml-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 

configdialog/kbfxconfigapp.h

@@ -47,8 +47,8 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kfiledialog.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 #include <kicondialog.h>
 #include <kio/job.h>
 #include <kio/netaccess.h>

kbfxlib/common/CMakeLists.txt

@@ -35,7 +35,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared khtml-shared ${M_LIBRARY}
+  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 

kbfxlib/data/CMakeLists.txt

@@ -36,7 +36,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared khtml-shared ${M_LIBRARY}
+  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 

plugins/applications/CMakeLists.txt

@@ -39,7 +39,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared khtml-shared ${M_LIBRARY} kbfxdata
+  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} kbfxdata
   DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
 )
 

plugins/plasmoids/CMakeLists.txt

@@ -39,7 +39,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared khtml-shared ${M_LIBRARY} kbfxdata
+  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} kbfxdata
   DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
 )
 

plugins/recentstuff/CMakeLists.txt

@@ -39,7 +39,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared khtml-shared ${M_LIBRARY} kbfxdata
+  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} kbfxdata
   DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
 )
 

plugins/settings/CMakeLists.txt

@@ -39,7 +39,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared khtml-shared ${M_LIBRARY} kbfxdata
+  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} kbfxdata
   DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
 )
 

plugins/strigi/CMakeLists.txt

@@ -39,7 +39,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
 #   VERSION 4.2.0
-  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared khtml-shared ${M_LIBRARY} ${STRIGICLIENT_LIBRARY} kbfxdata kbfxplasmadatasettings
+  LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} ${STRIGICLIENT_LIBRARY} kbfxdata kbfxplasmadatasettings
   DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
 )