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

16 files changed, 18 insertions, 18 deletions

diff --git a/kbugbuster/CMakeLists.txt b/kbugbuster/CMakeLists.txt
index 67e702b1..6cac4696 100644
--- a/kbugbuster/CMakeLists.txt
+++ b/kbugbuster/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_subdirectory( backend )
 add_subdirectory( gui )
 add_subdirectory( pics )
-tde_conditional_add_subdirectory( WITH_KCAL kresources )
+tde_conditional_add_subdirectory( WITH_KCAL tderesources )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -39,6 +39,6 @@ tde_add_executable( kbugbuster
   SOURCES main.cpp
   LINK
     kbbmainwindow-static kbbbackend_nopic-static
-    kutils-shared kio-shared khtml-shared
+    tdeutils-shared kio-shared tdehtml-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am
index 8aa545ed..727c0b69 100644
--- a/kbugbuster/Makefile.am
+++ b/kbugbuster/Makefile.am
@@ -1,5 +1,5 @@
 if include_kcalresource
-KRESOURCES_SUBDIR = kresources
+KRESOURCES_SUBDIR = tderesources
 LIBKCAL_INCLUDES= $(KDE_INCLUDES)/libkcal
 endif
 
@@ -10,9 +10,9 @@ SUBDIRS = backend gui pics $(KRESOURCES_SUBDIR)
 bin_PROGRAMS = kbugbuster
 
 kbugbuster_SOURCES = main.cpp
-kbugbuster_LDADD   = -lkutils gui/libkbbmainwindow.la \
+kbugbuster_LDADD   = -ltdeutils gui/libkbbmainwindow.la \
                      backend/libkbbbackend.la $(LIB_KHTML) $(LIB_KIO) -ltdefx $(LIB_KUTILS)
-kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)
+kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KUTILS)
 
 xdg_apps_DATA = kbugbuster.desktop
 
diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp
index 6b0ded58..0cc7fb7d 100644
--- a/kbugbuster/backend/bugdetails.cpp
+++ b/kbugbuster/backend/bugdetails.cpp
@@ -131,7 +131,7 @@ TQValueList<BugDetails::Attachment> BugDetails::extractAttachments( const TQStri
 #ifdef DEBUG_EXTRACT
         kdDebug() << "Line: " << *it << endl;
 #endif
-        if ( (*it).startsWith( " Content-Type" ) ) // ## leading space comes from khtml
+        if ( (*it).startsWith( " Content-Type" ) ) // ## leading space comes from tdehtml
         {
 #ifdef DEBUG_EXTRACT
             //kdDebug() << "BugDetails::extractAttachments going back, looking for empty or boundary=" << boundary << endl;
diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp
index 2eccbbce..0ab78ff2 100644
--- a/kbugbuster/gui/cwbugdetails.cpp
+++ b/kbugbuster/gui/cwbugdetails.cpp
@@ -24,8 +24,8 @@
 #include "bugsystem.h"
 #include "bugserver.h"
 
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <krun.h>
diff --git a/kbugbuster/gui/cwbugdetails.h b/kbugbuster/gui/cwbugdetails.h
index 88712210..5067b953 100644
--- a/kbugbuster/gui/cwbugdetails.h
+++ b/kbugbuster/gui/cwbugdetails.h
@@ -22,7 +22,7 @@
 
 #include <tqwidget.h>
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 class KHTMLPart;
 
diff --git a/kbugbuster/kresources/CMakeLists.txt b/kbugbuster/tderesources/CMakeLists.txt
index b100a022..ec5956a3 100644
--- a/kbugbuster/kresources/CMakeLists.txt
+++ b/kbugbuster/tderesources/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 
 install( FILES
     bugzilla.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
 
 
 ##### kcal_bugzilla (module) ####################
@@ -38,6 +38,6 @@ tde_add_kpart( kcal_bugzilla AUTOMOC
   SOURCES
     kcalresource.cpp kcalresourceconfig.cpp
     kcalresource_plugin.cpp resourceprefs.kcfgc
-  LINK kbbbackend_pic-static tdecore-shared kio-shared kabc kcal kresources
+  LINK kbbbackend_pic-static tdecore-shared kio-shared kabc kcal tderesources
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbugbuster/kresources/ConfigureChecks.cmake b/kbugbuster/tderesources/ConfigureChecks.cmake
index b12337a1..b12337a1 100644
--- a/kbugbuster/kresources/ConfigureChecks.cmake
+++ b/kbugbuster/tderesources/ConfigureChecks.cmake
diff --git a/kbugbuster/kresources/Makefile.am b/kbugbuster/tderesources/Makefile.am
index b411e3c8..ebd63550 100644
--- a/kbugbuster/kresources/Makefile.am
+++ b/kbugbuster/tderesources/Makefile.am
@@ -11,7 +11,7 @@ kcal_bugzilla_la_SOURCES = kcalresource.cpp kcalresourceconfig.cpp \
 kcal_bugzilla_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcal_bugzilla_la_LIBADD  = ../backend/libkbbbackend.la -lkcal
 
-servicedir = $(kde_servicesdir)/kresources/kcal
+servicedir = $(kde_servicesdir)/tderesources/kcal
 service_DATA = bugzilla.desktop
 
 METASOURCES = AUTO
diff --git a/kbugbuster/kresources/bugzilla.desktop b/kbugbuster/tderesources/bugzilla.desktop
index 767b06cd..767b06cd 100644
--- a/kbugbuster/kresources/bugzilla.desktop
+++ b/kbugbuster/tderesources/bugzilla.desktop
diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/tderesources/kcalresource.cpp
index bdad0381..62051bc5 100644
--- a/kbugbuster/kresources/kcalresource.cpp
+++ b/kbugbuster/tderesources/kcalresource.cpp
@@ -44,7 +44,7 @@
 
 #include <kabc/locknull.h>
 
-#include <kresources/configwidget.h>
+#include <tderesources/configwidget.h>
 
 #include "bugsystem.h"
 #include "bugserver.h"
@@ -119,7 +119,7 @@ void KCalResource::writeConfig( TDEConfig *config )
 
 TQString KCalResource::cacheFile()
 {
-  TQString file = locateLocal( "cache", "kcal/kresources/" + identifier() );
+  TQString file = locateLocal( "cache", "kcal/tderesources/" + identifier() );
   kdDebug() << "KCalResource::cacheFile(): " << file << endl;
   return file;
 }
diff --git a/kbugbuster/kresources/kcalresource.h b/kbugbuster/tderesources/kcalresource.h
index cfa4e2a6..cfa4e2a6 100644
--- a/kbugbuster/kresources/kcalresource.h
+++ b/kbugbuster/tderesources/kcalresource.h
diff --git a/kbugbuster/kresources/kcalresource_plugin.cpp b/kbugbuster/tderesources/kcalresource_plugin.cpp
index 7cf81289..7cf81289 100644
--- a/kbugbuster/kresources/kcalresource_plugin.cpp
+++ b/kbugbuster/tderesources/kcalresource_plugin.cpp
diff --git a/kbugbuster/kresources/kcalresourceconfig.cpp b/kbugbuster/tderesources/kcalresourceconfig.cpp
index 58466642..58466642 100644
--- a/kbugbuster/kresources/kcalresourceconfig.cpp
+++ b/kbugbuster/tderesources/kcalresourceconfig.cpp
diff --git a/kbugbuster/kresources/kcalresourceconfig.h b/kbugbuster/tderesources/kcalresourceconfig.h
index d28deb1f..f0eae40e 100644
--- a/kbugbuster/kresources/kcalresourceconfig.h
+++ b/kbugbuster/tderesources/kcalresourceconfig.h
@@ -21,8 +21,8 @@
 #ifndef KCALRESOURCECONFIG_H
 #define KCALRESOURCECONFIG_H
 
-#include <kresources/resource.h>
-#include <kresources/configwidget.h>
+#include <tderesources/resource.h>
+#include <tderesources/configwidget.h>
 
 class KLineEdit;
 
diff --git a/kbugbuster/kresources/resourceprefs.kcfgc b/kbugbuster/tderesources/resourceprefs.kcfgc
index 0f41bdb1..88125829 100644
--- a/kbugbuster/kresources/resourceprefs.kcfgc
+++ b/kbugbuster/tderesources/resourceprefs.kcfgc
@@ -1,5 +1,5 @@
 # Code generation options for kconfig_compiler
-File=kresources_kcal_bugzilla.kcfg
+File=tderesources_kcal_bugzilla.kcfg
 ClassName=ResourcePrefs
 NameSpace=KBB
 Singleton=false
diff --git a/kbugbuster/kresources/kresources_kcal_bugzilla.kcfg b/kbugbuster/tderesources/tderesources_kcal_bugzilla.kcfg
index ce23c969..360a2144 100644
--- a/kbugbuster/kresources/kresources_kcal_bugzilla.kcfg
+++ b/kbugbuster/tderesources/tderesources_kcal_bugzilla.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="kresources_kcal_bugzillarc"/>
+  <kcfgfile name="tderesources_kcal_bugzillarc"/>
 
   <group name="General">
     <entry type="String" name="Server">