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

---
 languages/cpp/app_templates/kpartplugin/plugin_app.cpp  | 2 +-
 languages/cpp/app_templates/kpartplugin/plugin_app.h    | 4 ++--
 languages/cpp/app_templates/kpartplugin/src-Makefile.am | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'languages/cpp/app_templates/kpartplugin')

diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index c5bdb434..c9717c29 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -1,7 +1,7 @@
 
 #include "plugin_%{APPNAMELC}.h"
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h
index 132ce724..16142b33 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.h
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h
@@ -2,8 +2,8 @@
 #ifndef _PLUGIN_%{APPNAMEUC}_H_
 #define _PLUGIN_%{APPNAMEUC}_H_
 
-#include <kparts/plugin.h>
-#include <kparts/factory.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/factory.h>
 
 class Plugin%{APPNAME} : public KParts::Plugin
 {
diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
index 633ca883..a0da7254 100644
--- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
@@ -14,7 +14,7 @@ lib%{APPNAMELC}plugin_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PL
 
 # Install the .rc file in the Part's directory (in this case, the part
 # is KHTMLPart)
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = plugin_%{APPNAMELC}.rc
 
 messages: rc.cpp
-- 
cgit v1.2.3