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

---
 konq-plugins/sidebar/metabar/src/defaultplugin.cpp  | 2 +-
 konq-plugins/sidebar/metabar/src/httpplugin.cpp     | 2 +-
 konq-plugins/sidebar/metabar/src/metabarfunctions.h | 2 +-
 konq-plugins/sidebar/metabar/src/metabarwidget.cpp  | 4 ++--
 konq-plugins/sidebar/metabar/src/metabarwidget.h    | 2 +-
 konq-plugins/sidebar/metabar/src/protocolplugin.cpp | 2 +-
 konq-plugins/sidebar/metabar/src/protocolplugin.h   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'konq-plugins/sidebar/metabar')

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>
 
-- 
cgit v1.2.1