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

9 files changed, 16 insertions, 16 deletions

diff --git a/libkonq/CMakeLists.txt b/libkonq/CMakeLists.txt
index 4ced51f33..b1b9b4a47 100644
--- a/libkonq/CMakeLists.txt
+++ b/libkonq/CMakeLists.txt
@@ -60,7 +60,7 @@ tde_add_library( konq SHARED AUTOMOC
     konq_pixmapprovider.cc kivdirectoryoverlay.cc konq_faviconmgr.cc
     konq_faviconmgr.skel konq_filetip.cc
   VERSION 4.2.0
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc
index 2b32129c2..cfc2a05e2 100644
--- a/libkonq/kivdirectoryoverlay.cc
+++ b/libkonq/kivdirectoryoverlay.cc
@@ -97,7 +97,7 @@ void KIVDirectoryOverlay::slotCompleted()
     }
     
     if ( best * 2 < total ) {
-        m_bestIcon = "kmultiple";
+        m_bestIcon = "tdemultiple";
     }
 
     if (!m_bestIcon.isNull()) {
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc
index 86f945742..59fc097b8 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cc
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <konq_drag.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kurldrag.h>
 #include <kuserprofile.h>
 #include <kurifilter.h>
diff --git a/libkonq/konq_dirpart.h b/libkonq/konq_dirpart.h
index 9c5d0735e..ffe176224 100644
--- a/libkonq/konq_dirpart.h
+++ b/libkonq/konq_dirpart.h
@@ -21,8 +21,8 @@
 #define __konqdirpart_h
 
 #include <tqstring.h>
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
 #include <kfileitem.h>
 #include <kdatastream.h>
 #include <kio/global.h>
diff --git a/libkonq/konq_events.h b/libkonq/konq_events.h
index c047d904e..dab0f3fa1 100644
--- a/libkonq/konq_events.h
+++ b/libkonq/konq_events.h
@@ -1,7 +1,7 @@
 #ifndef __konq_events_h__
 #define __konq_events_h__
 
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 #include <tqptrlist.h>
 #include <libkonq_export.h>
 
diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h
index 9545c5674..bd22331fd 100644
--- a/libkonq/konq_historymgr.h
+++ b/libkonq/konq_historymgr.h
@@ -31,7 +31,7 @@
 
 #include <kcompletion.h>
 #include <kurl.h>
-#include <kparts/historyprovider.h>
+#include <tdeparts/historyprovider.h>
 
 #include "konq_historycomm.h"
 
@@ -327,7 +327,7 @@ protected:
 private slots:
     /**
      * Called by the updateTimer to emit the KParts::HistoryProvider::updated()
-     * signal so that khtml can repaint the updated links.
+     * signal so that tdehtml can repaint the updated links.
      */
     void slotEmitUpdated();
 
diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h
index 2625055d8..1a4884db7 100644
--- a/libkonq/konq_iconviewwidget.h
+++ b/libkonq/konq_iconviewwidget.h
@@ -260,7 +260,7 @@ public slots:
 
 signals:
     /**
-     * For cut/copy/paste/move/delete (see kparts/browserextension.h)
+     * For cut/copy/paste/move/delete (see tdeparts/browserextension.h)
      */
     void enableAction( const char * name, bool enabled );
 
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 8d2503c30..294e43337 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -33,7 +33,7 @@
 #include <kstandarddirs.h>
 #include <kxmlguifactory.h>
 #include <kxmlguibuilder.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <assert.h>
 
@@ -56,11 +56,11 @@
   iconview trash:/
   sidebar directory tree
   sidebar Devices / Hard Disc
-  khtml background
-  khtml link
-  khtml image (www.kde.org RMB on K logo)
-  khtmlimage (same as above, then choose View image, then RMB)
-  selected text in khtml
+  tdehtml background
+  tdehtml link
+  tdehtml image (www.kde.org RMB on K logo)
+  tdehtmlimage (same as above, then choose View image, then RMB)
+  selected text in tdehtml
   embedded katepart
   kdesktop folder
   trash link on desktop
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index 744d67c4d..aaa7f6f07 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -33,7 +33,7 @@
 #include <kmimetype.h> // for KDEDesktopMimeType
 #include <libkonq_export.h>
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include "konq_xmlguiclient.h"