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/uachanger/Makefile.am         | 2 +-
 konq-plugins/uachanger/uachangerplugin.cpp | 2 +-
 konq-plugins/uachanger/uachangerplugin.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'konq-plugins/uachanger')

diff --git a/konq-plugins/uachanger/Makefile.am b/konq-plugins/uachanger/Makefile.am
index 80e2c2b..61dcc36 100644
--- a/konq-plugins/uachanger/Makefile.am
+++ b/konq-plugins/uachanger/Makefile.am
@@ -7,7 +7,7 @@ libuachangerplugin_la_SOURCES = uachangerplugin.cpp
 libuachangerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML)
 libuachangerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = uachangerplugin.rc uachangerplugin.desktop
 
 appsdir = $(kde_appsdir)/.hidden
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index 8c8e9c3..ecfcff6 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -34,7 +34,7 @@
 #include <kinstance.h>
 #include <kpopupmenu.h>
 #include <dcopref.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kgenericfactory.h>
 #include <kprotocolmanager.h>
 #include <kaboutdata.h>
diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h
index 9aaff84..fc5b707 100644
--- a/konq-plugins/uachanger/uachangerplugin.h
+++ b/konq-plugins/uachanger/uachangerplugin.h
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <klibloader.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KHTMLPart;
 class KActionMenu;
-- 
cgit v1.2.1