summaryrefslogtreecommitdiffstats
path: root/konq-plugins/rellinks
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:15:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:15:08 -0600
commit39177c1528006932b00136d34cf022434df73d72 (patch)
treea0791bebede3e7eb454ac2268a14c4e8a157de6d /konq-plugins/rellinks
parent2a74bca8c834c4d4f391c70de8fdfa12a7cc972c (diff)
downloadtdeaddons-39177c1528006932b00136d34cf022434df73d72.tar.gz
tdeaddons-39177c1528006932b00136d34cf022434df73d72.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/rellinks')
-rw-r--r--konq-plugins/rellinks/Makefile.am2
-rw-r--r--konq-plugins/rellinks/plugin_rellinks.cpp4
-rw-r--r--konq-plugins/rellinks/plugin_rellinks.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/konq-plugins/rellinks/Makefile.am b/konq-plugins/rellinks/Makefile.am
index aeec3fc..f320d96 100644
--- a/konq-plugins/rellinks/Makefile.am
+++ b/konq-plugins/rellinks/Makefile.am
@@ -5,7 +5,7 @@ librellinksplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
librellinksplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML)
librellinksplugin_la_SOURCES = plugin_rellinks.cpp
plugins_DATA = plugin_rellinks.rc plugin_rellinks.desktop
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/rellinks.pot
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index d2b2826..69a8e11 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -35,8 +35,8 @@
#include <kaction.h>
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
#include <kiconloader.h>
#include <kinstance.h>
#include <klocale.h>
diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h
index 209f899..d791eb9 100644
--- a/konq-plugins/rellinks/plugin_rellinks.h
+++ b/konq-plugins/rellinks/plugin_rellinks.h
@@ -34,7 +34,7 @@
#include <tqmap.h>
// KDE includes
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
#include <dom/dom_string.h>
// type definitions