From ff94d46e423398804d2ae63faeb114c2cf604fc4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:05:39 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kapptemplate/kapp/app.cpp          | 6 +++---
 kapptemplate/kpartapp/app.cpp      | 4 ++--
 kapptemplate/kpartapp/app_part.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kapptemplate')

diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp
index 7f69e8e8..df8cc8ed 100644
--- a/kapptemplate/kapp/app.cpp
+++ b/kapptemplate/kapp/app.cpp
@@ -20,9 +20,9 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kaccel.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kurlrequesterdlg.h>
diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp
index 77beb4fc..be995d83 100644
--- a/kapptemplate/kpartapp/app.cpp
+++ b/kapptemplate/kpartapp/app.cpp
@@ -9,7 +9,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
 #include "${APP_NAME_LC}.moc"
 
 #include <kkeydialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <kedittoolbar.h>
@@ -19,7 +19,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
 
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstatusbar.h>
 
 ${APP_NAME}::${APP_NAME}()
diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp
index 07843be0..7ef6e964 100644
--- a/kapptemplate/kpartapp/app_part.cpp
+++ b/kapptemplate/kpartapp/app_part.cpp
@@ -7,7 +7,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
 
 #include <tqfile.h>
-- 
cgit v1.2.3