From 62969630767e6cca05721e2a5f910ccc1bcdd354 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:55:49 -0600
Subject: [PATCH] Rename a number of libraries and executables to avoid
 conflicts with KDE4

---
 kde.py                | 4 ++--
 po/messages.sh        | 2 +-
 src/kstreamripper.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kde.py b/kde.py
index 3eaa6df..cc963ba 100644
--- a/kde.py
+++ b/kde.py
@@ -531,7 +531,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	## kcfg file processing
 	def kcfgGenerator(target, source, env, for_signature):
 		act=[]
-		act.append('kconfig_compiler -d'+str(source[0].get_dir())+' '+source[1].path+' '+source[0].path)
+		act.append('tdeconfig_compiler -d'+str(source[0].get_dir())+' '+source[1].path+' '+source[0].path)
 		return act
 	
 	def kcfgEmitter(target, source, env):
@@ -689,7 +689,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 			for ofile in other_files:
 				if ofile == file:
 					print RED+"WARNING: You have included "+file+".kcfg and another file of the same prefix"+NORMAL
-					print "Files generated by kconfig_compiler (settings.h, settings.cpp) must not be included"
+					print "Files generated by tdeconfig_compiler (settings.h, settings.cpp) must not be included"
 		return src
 
 
diff --git a/po/messages.sh b/po/messages.sh
index 34870bc..3020ce8 100755
--- a/po/messages.sh
+++ b/po/messages.sh
@@ -14,7 +14,7 @@
 # for yourself and help me to improve this script, thanks
 # (tnagyemail-mail tat yahoo d0tt fr)
 
-SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code
+SRCDIR=../test1-tdeconfigxt # srcdir is the directory containing the source code
 TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips
 
 TDEDIR=`tde-config --prefix`
diff --git a/src/kstreamripper.cpp b/src/kstreamripper.cpp
index c20b7de..0c124b3 100644
--- a/src/kstreamripper.cpp
+++ b/src/kstreamripper.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kled.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kaboutapplication.h>
 
 #include <tqpushbutton.h>