Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 8 years ago
parent
commit
6296963076
  1. 4
      kde.py
  2. 2
      po/messages.sh
  3. 4
      src/kstreamripper.cpp

4
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

2
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`

4
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>

Loading…
Cancel
Save