From e91a07ec04736a4dbb004d71a31ea610b1141775 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 16 Nov 2011 13:42:16 -0600 Subject: [PATCH] Additional renaming of kde to tde --- Doxyfile | 2 +- INSTALL | 2 +- SConstruct | 2 +- admin/kde.py | 12 ++++++------ kde.py | 12 ++++++------ kstreamripper.kdevelop | 4 ++-- src/kstreamripper.cpp | 2 +- src/kstreamripper.h | 2 +- src/processcontroller.h | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Doxyfile b/Doxyfile index 23a9436..1df30f6 100644 --- a/Doxyfile +++ b/Doxyfile @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = kstreamripper.kdevelop +PROJECT_NAME = kstreamripper.tdevelop PROJECT_NUMBER = 0.1 OUTPUT_DIRECTORY = OUTPUT_LANGUAGE = English diff --git a/INSTALL b/INSTALL index 8416e76..a9876f5 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ sctest REQUIREMENTS kde >= 3.2 is needed to run sctest To compile sctest, the kde development packages -are needed: kdelibs-devel, kdebase-devel and python +are needed: tdelibs-devel, tdebase-devel and python scons is also needed http://www.scons.org (this tool also used by Blender, ..) diff --git a/SConstruct b/SConstruct index 128317b..51f983f 100644 --- a/SConstruct +++ b/SConstruct @@ -57,7 +57,7 @@ datadir libdir kdeincludes qtincludes -kdelibs +tdelibs qtlibs extraincludes (a list of paths separated by ':') diff --git a/admin/kde.py b/admin/kde.py index 2133cd2..a563ce9 100644 --- a/admin/kde.py +++ b/admin/kde.py @@ -37,7 +37,7 @@ def detect_kde(env): datadir = env['ARGS'].get('datadir', None) libdir = env['ARGS'].get('libdir', None) kdeincludes= env['ARGS'].get('kdeincludes', None) - kdelibs = env['ARGS'].get('kdelibs', None) + tdelibs = env['ARGS'].get('tdelibs', None) qtincludes = env['ARGS'].get('qtincludes', None) qtlibs = env['ARGS'].get('qtlibs', None) @@ -49,7 +49,7 @@ def detect_kde(env): else: print RED + "kde-config was NOT found in your PATH"+ NORMAL print "Make sure kde is installed properly" - print "(missing package kdebase-devel?)" + print "(missing package tdebase-devel?)" env.Exit(1) env['KDEDIR'] = os.popen('kde-config -prefix').read().strip() @@ -193,9 +193,9 @@ def detect_kde(env): ## kde libs and includes env['KDEINCLUDEPATH']= kdeincludes - if not kdelibs: - kdelibs = os.popen('kde-config --expandvars --install lib').read().strip() - env['KDELIBPATH']= kdelibs + if not tdelibs: + tdelibs = os.popen('kde-config --expandvars --install lib').read().strip() + env['KDELIBPATH']= tdelibs ## qt libs and includes env['QTINCLUDEPATH']= qtincludes @@ -253,7 +253,7 @@ def generate(env): """+BOLD+"""* libdir """+NORMAL+""": install path for the libs, ie: /usr/lib """+BOLD+"""* kdeincludes"""+NORMAL+""": path to the kde includes (/usr/include/kde on debian, ...) """+BOLD+"""* qtincludes """+NORMAL+""": same punishment, for qt includes (/usr/include/qt on debian, ...) -"""+BOLD+"""* kdelibs """+NORMAL+""": path to the kde libs, for linking the programs +"""+BOLD+"""* tdelibs """+NORMAL+""": path to the kde libs, for linking the programs """+BOLD+"""* qtlibs """+NORMAL+""": same punishment, for qt libraries ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt """+NORMAL) diff --git a/kde.py b/kde.py index b4bcf3b..2eb2e3d 100644 --- a/kde.py +++ b/kde.py @@ -35,7 +35,7 @@ def detect_kde(env): libdir = env['ARGS'].get('libdir', None) libsuffix = env['ARGS'].get('libsuffix', '') kdeincludes = env['ARGS'].get('kdeincludes', None) - kdelibs = env['ARGS'].get('kdelibs', None) + tdelibs = env['ARGS'].get('tdelibs', None) qtincludes = env['ARGS'].get('qtincludes', None) qtlibs = env['ARGS'].get('qtlibs', None) @@ -50,7 +50,7 @@ def detect_kde(env): else: print RED+"kde-config was NOT found in your PATH"+NORMAL print "Make sure kde is installed properly" - print "(missing package kdebase-devel?)" + print "(missing package tdebase-devel?)" env.Exit(1) env['KDEDIR'] = os.popen('kde-config -prefix').read().strip() @@ -209,9 +209,9 @@ def detect_kde(env): ## kde libs and includes env['KDEINCLUDEPATH']=kdeincludes - if not kdelibs: - kdelibs=os.popen('kde-config --expandvars --install lib').read().strip() - env['KDELIBPATH']=kdelibs + if not tdelibs: + tdelibs=os.popen('kde-config --expandvars --install lib').read().strip() + env['KDELIBPATH']=tdelibs ## qt libs and includes env['QTINCLUDEPATH']=qtincludes @@ -233,7 +233,7 @@ def generate(env): """+BOLD+"""* libsuffix """+NORMAL+""": suffix of libraries on amd64, ie: 64, 32 """+BOLD+"""* kdeincludes"""+NORMAL+""": path to the kde includes (/usr/include/kde on debian, ...) """+BOLD+"""* qtincludes """+NORMAL+""": same punishment, for qt includes (/usr/include/qt on debian, ...) -"""+BOLD+"""* kdelibs """+NORMAL+""": path to the kde libs, for linking the programs +"""+BOLD+"""* tdelibs """+NORMAL+""": path to the kde libs, for linking the programs """+BOLD+"""* qtlibs """+NORMAL+""": same punishment, for qt libraries ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt """+NORMAL) diff --git a/kstreamripper.kdevelop b/kstreamripper.kdevelop index d974588..9fb91ad 100644 --- a/kstreamripper.kdevelop +++ b/kstreamripper.kdevelop @@ -1,5 +1,5 @@ - + Michael Goettsche mail@tuxipuxi.de @@ -203,4 +203,4 @@ -u3 -p - + diff --git a/src/kstreamripper.cpp b/src/kstreamripper.cpp index 999f272..d386097 100644 --- a/src/kstreamripper.cpp +++ b/src/kstreamripper.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "kstreamripper.h" #include "addnewstreamimpl.h" diff --git a/src/kstreamripper.h b/src/kstreamripper.h index 08b847c..25f8942 100644 --- a/src/kstreamripper.h +++ b/src/kstreamripper.h @@ -21,7 +21,7 @@ #ifndef KSTREAMRIPPER_H #define KSTREAMRIPPER_H -#include +#include #include "kstreamripperbase.h" #if KDE_IS_VERSION(3,3,90) #include diff --git a/src/processcontroller.h b/src/processcontroller.h index 3b6e910..df58ceb 100644 --- a/src/processcontroller.h +++ b/src/processcontroller.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #if KDE_IS_VERSION(3,3,90) #include #endif