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

5 files changed, 9 insertions, 9 deletions

diff --git a/konq-plugins/akregator/Makefile.am b/konq-plugins/akregator/Makefile.am
index c6964d1..1be20ad 100644
--- a/konq-plugins/akregator/Makefile.am
+++ b/konq-plugins/akregator/Makefile.am
@@ -15,7 +15,7 @@ libakregatorkonqfeedicon_la_LDFLAGS = -module $(KDE_PLUGIN) -avoid-version -no-u
 
 konqplugindir   = $(kde_servicesdir)
 konqplugin_DATA = akregator_konqplugin.desktop
-konqfeedicondir = $(kde_datadir)/khtml/kpartplugins
+konqfeedicondir = $(kde_datadir)/tdehtml/kpartplugins
 konqfeedicon_DATA = akregator_konqfeedicon.desktop akregator_konqfeedicon.rc
 
 rssicondir = $(kde_datadir)/akregator/pics
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index 11d6f6c..6c4d0ff 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -34,8 +34,8 @@
 #include <kpopupmenu.h>
 #include <kgenericfactory.h>
 #include <kurl.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 #include <kmessagebox.h>
 
 #include <tqdir.h>
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index dd8a8c5..07006b6 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -30,11 +30,11 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kiconloader.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kparts/statusbarextension.h>
+#include <tdeparts/statusbarextension.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
@@ -62,7 +62,7 @@ KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringLis
 
     m_part = dynamic_cast<KHTMLPart*>(parent);
     if(!m_part) { kdDebug() << "couldn't get part" << endl; return; }
-    // FIXME: need to do this because of a bug in khtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?)
+    // FIXME: need to do this because of a bug in tdehtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?)
     //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon()));
     TQTimer::singleShot(0, this, TQT_SLOT(waitPartToLoad()));
 }
@@ -154,7 +154,7 @@ void KonqFeedIcon::addFeedIcon()
 
     m_feedIcon = new KURLLabel(m_statusBarEx->statusBar());
 
-    // from khtmlpart's ualabel
+    // from tdehtmlpart's ualabel
     m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
     m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     m_feedIcon->setUseCursor(false);
diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h
index b4152e0..3bcaa38 100644
--- a/konq-plugins/akregator/konqfeedicon.h
+++ b/konq-plugins/akregator/konqfeedicon.h
@@ -26,7 +26,7 @@
 #define KONTQFEEDICON_H
 
 #include <tqguardedptr.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kpopupmenu.h>
 #include "feeddetector.h"
 #include "pluginbase.h"
diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp
index eb590eb..57fd966 100644
--- a/konq-plugins/akregator/pluginbase.cpp
+++ b/konq-plugins/akregator/pluginbase.cpp
@@ -25,7 +25,7 @@
 #include <kurl.h>
 #include <kprocess.h>
 #include <dcopref.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <klocale.h>
 
 #include "feeddetector.h"