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

12 files changed, 17 insertions, 17 deletions

diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h
index 2621671..4b7361b 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.h
+++ b/konq-plugins/sidebar/delicious/mainWidget.h
@@ -26,7 +26,7 @@
 #include "widget.h"
 
 #include <kio/jobclasses.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 class TQStringList;
 class KURL;
diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h
index 7ac71a8..da1d51d 100644
--- a/konq-plugins/sidebar/delicious/plugin.h
+++ b/konq-plugins/sidebar/delicious/plugin.h
@@ -25,9 +25,9 @@
 #include "mainWidget.h"
 
 #include <konqsidebarplugin.h>
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
 #include <kinstance.h>
 #include <dcopobject.h>
 
diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h
index 5dacf9d..ec26fe1 100644
--- a/konq-plugins/sidebar/mediaplayer/engine.h
+++ b/konq-plugins/sidebar/mediaplayer/engine.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqobject.h>
 #include <kmedia2.h>
-#include <kmediaplayer/player.h>
+#include <tdemediaplayer/player.h>
 #include <kurl.h>
 
 namespace Arts
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h
index ee1a299..95e04f6 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h
@@ -18,9 +18,9 @@
 #ifndef _konq_sidebar_mediaplayer_h_
 #define _konq_sidebar_mediaplayer_h_
 #include <konqsidebarplugin.h>
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
 
 class KSB_MediaWidget;
 
diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp
index 741a6b6..38ac506 100644
--- a/konq-plugins/sidebar/mediaplayer/player.cpp
+++ b/konq-plugins/sidebar/mediaplayer/player.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kmediaplayer/player.h>
+#include <tdemediaplayer/player.h>
 
 #include "engine.h"
 #include "player.h"
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 3bcf924..9749a5b 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -24,7 +24,7 @@
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <kicontheme.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <kdesktopfile.h>
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index bbfb9e2..f994eb5 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -25,7 +25,7 @@
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kicontheme.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kurl.h>
 #include <klocale.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h
index 7108de9..800bb55 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h
@@ -27,7 +27,7 @@
 #include <tqmap.h>
 
 #include <kurl.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 class MetabarFunctions : public TQObject
 {
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index c4282ea..7142f15 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -35,7 +35,7 @@
 #include <tqurl.h>
 #include <tqbuffer.h>
 
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
@@ -55,7 +55,7 @@
 #include <tdecmoduleinfo.h>
 #include <kmdcodec.h>
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 #include <dom2_events.h>
 #include <dom2_views.h>
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index bf9c7ad..95c1148 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -21,7 +21,7 @@
 #ifndef METABAR_WIDGET_H
 #define METABAR_WIDGET_H
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 #include <kconfig.h>
 #include <kfileitem.h>
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 38d0bba..75e62c3 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -64,7 +64,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
       pix = m_items.getFirst()->pixmap(KIcon::SizeLarge);
     }
     else{
-      pix = DesktopIcon("kmultiple", KIcon::SizeLarge);
+      pix = DesktopIcon("tdemultiple", KIcon::SizeLarge);
     }
   
     TQByteArray data;
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.h b/konq-plugins/sidebar/metabar/src/protocolplugin.h
index 3614a30..6683f61 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.h
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.h
@@ -22,7 +22,7 @@
 #define _PROTOCOL_PLUGIN_H
 
 #include <kfileitem.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 #include <html_element.h>