diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:49 -0600 |
| commit | 62969630767e6cca05721e2a5f910ccc1bcdd354 (patch) | |
| tree | bc9de625bf8496318f4b6efccd72f26025ea958b | |
| parent | d349acd84e270013633969a7805d85d47769a047 (diff) | |
| download | kstreamripper-62969630767e6cca05721e2a5f910ccc1bcdd354.tar.gz kstreamripper-62969630767e6cca05721e2a5f910ccc1bcdd354.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | kde.py | 4 | ||||
| -rwxr-xr-x | po/messages.sh | 2 | ||||
| -rw-r--r-- | src/kstreamripper.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -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> |