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

---
 kapptemplate/ChangeLog                      | 2 +-
 kapptemplate/kapp/appview.h                 | 2 +-
 kapptemplate/kpartapp/app.h                 | 2 +-
 kapptemplate/kpartapp/app_part.cpp          | 2 +-
 kapptemplate/kpartapp/app_part.h            | 2 +-
 kapptemplate/kpartplugin/plugin-Makefile.am | 2 +-
 kapptemplate/kpartplugin/plugin_app.cpp     | 2 +-
 kapptemplate/kpartplugin/plugin_app.h       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kapptemplate')

diff --git a/kapptemplate/ChangeLog b/kapptemplate/ChangeLog
index e1cde76a..0e9e42f8 100644
--- a/kapptemplate/ChangeLog
+++ b/kapptemplate/ChangeLog
@@ -116,7 +116,7 @@ May-30-2000 - Kurt Granroth (v0.6.2)
 
 Mar-14-2000 - Kurt Granroth (v0.6.1)
   o Added toolbar editor
-  o Changed sample html code to reflect khtml changes
+  o Changed sample html code to reflect tdehtml changes
 
 Feb-26-2000 - Kurt Granroth (v0.6)
   o Converted to use the new XML UI framework (big change!)
diff --git a/kapptemplate/kapp/appview.h b/kapptemplate/kapp/appview.h
index d7866b36..19799996 100644
--- a/kapptemplate/kapp/appview.h
+++ b/kapptemplate/kapp/appview.h
@@ -4,7 +4,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}view.h
 #define ${APP_NAME_UC}VIEW_H
 
 #include <tqwidget.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <${APP_NAME_LC}iface.h>
 
 class TQPainter;
diff --git a/kapptemplate/kpartapp/app.h b/kapptemplate/kpartapp/app.h
index deb38136..b0b571b6 100644
--- a/kapptemplate/kpartapp/app.h
+++ b/kapptemplate/kpartapp/app.h
@@ -8,7 +8,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}.h
 #endif
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 /**
  * This is the application "Shell".  It has a menubar, toolbar, and
diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp
index a95c0711..07843be0 100644
--- a/kapptemplate/kpartapp/app_part.cpp
+++ b/kapptemplate/kpartapp/app_part.cpp
@@ -8,7 +8,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kfiledialog.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/kapptemplate/kpartapp/app_part.h b/kapptemplate/kpartapp/app_part.h
index 1150a21d..2601e8fd 100644
--- a/kapptemplate/kpartapp/app_part.h
+++ b/kapptemplate/kpartapp/app_part.h
@@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.h
 #ifndef ${APP_NAME_UC}PART_H
 #define ${APP_NAME_UC}PART_H
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class TQWidget;
 class TQPainter;
diff --git a/kapptemplate/kpartplugin/plugin-Makefile.am b/kapptemplate/kpartplugin/plugin-Makefile.am
index cdb7d510..21b5ccdd 100644
--- a/kapptemplate/kpartplugin/plugin-Makefile.am
+++ b/kapptemplate/kpartplugin/plugin-Makefile.am
@@ -16,5 +16,5 @@ lib${APP_NAME_LC}plugin_la_LDFLAGS = -module \$(KDE_PLUGIN) \$(all_libraries)
 
 # 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_${APP_NAME_LC}.rc
diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp
index 0ec7a273..98a44cad 100644
--- a/kapptemplate/kpartplugin/plugin_app.cpp
+++ b/kapptemplate/kpartplugin/plugin_app.cpp
@@ -2,7 +2,7 @@ echo "Creating $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp...";
 cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp
 #include "plugin_${APP_NAME_LC}.h"
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
diff --git a/kapptemplate/kpartplugin/plugin_app.h b/kapptemplate/kpartplugin/plugin_app.h
index a480a187..5f0e655c 100644
--- a/kapptemplate/kpartplugin/plugin_app.h
+++ b/kapptemplate/kpartplugin/plugin_app.h
@@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.h
 #ifndef PLUGIN_${APP_NAME_UC}_H
 #define PLUGIN_${APP_NAME_UC}_H
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class Plugin${APP_NAME} : public KParts::Plugin
 {
-- 
cgit v1.2.1