summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-16 13:45:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-16 13:45:33 -0600
commitb21a3fd337f722027e5728be90a7ddc4e758961e (patch)
treec4016e66d02a54a34b4911fae7d74e424d48c9a0
parent24f84d9cb7c82f0ca0d50e1eaaf10af2b3836a3f (diff)
downloadpytde-b21a3fd337f722027e5728be90a7ddc4e758961e.tar.gz
pytde-b21a3fd337f722027e5728be90a7ddc4e758961e.zip
Additional renaming of kde to tde
-rw-r--r--ChangeLog.2001-42
-rw-r--r--Changelog2
-rw-r--r--configure.py36
-rw-r--r--doc/switches.html2
-rw-r--r--extra/kde340/kicontheme.h2
-rw-r--r--extra/kde340/krecentdirs.h2
-rw-r--r--extra/kde340/ksharedptr.h2
-rw-r--r--extra/kde341/kicontheme.h2
-rw-r--r--extra/kde341/krecentdirs.h2
-rw-r--r--extra/kde341/ksharedptr.h2
-rw-r--r--extra/kde342/kicontheme.h2
-rw-r--r--extra/kde342/krecentdirs.h2
-rw-r--r--extra/kde342/ksharedptr.h2
-rw-r--r--extra/kde343/kicontheme.h2
-rw-r--r--extra/kde343/krecentdirs.h2
-rw-r--r--extra/kde343/ksharedptr.h2
-rw-r--r--extra/kde350/kicontheme.h2
-rw-r--r--extra/kde350/krecentdirs.h2
-rw-r--r--extra/kde350/ksharedptr.h2
-rw-r--r--extra/kde351/kicontheme.h2
-rw-r--r--extra/kde351/ksharedptr.h2
-rw-r--r--extra/kde352/kicontheme.h2
-rw-r--r--extra/kde352/ksharedptr.h2
-rw-r--r--extra/kde353/kicontheme.h2
-rw-r--r--extra/kde353/ksharedptr.h2
-rw-r--r--pykde350.prj4
-rw-r--r--pykde351.prj4
-rw-r--r--pykde352.prj4
-rw-r--r--pykde353.prj4
-rw-r--r--pykdeconfig.py2
-rw-r--r--sip/tdecore/kdeversion.sip2
-rw-r--r--sip/tdecore/tdecore-kde314.diff2
-rw-r--r--sip/tdecore/tdecore-kde315.diff2
-rw-r--r--sip/tdecore/tdecore-kde320.diff2
-rw-r--r--sip/tdecore/tdecore-kde321.diff2
-rw-r--r--sip/tdecore/tdecore-kde322.diff2
-rw-r--r--sip/tdecore/tdecore-kde323.diff2
-rw-r--r--sip/tdecore/tdecore-kde330.diff2
-rw-r--r--sip/tdecore/tdecore-kde331.diff2
-rw-r--r--sip/tdecore/tdecore-kde332.diff2
-rw-r--r--sip/tdecore/tdecore-kde340.diff2
-rw-r--r--sip/tdecore/tdecore-kde341.diff2
-rw-r--r--sip/tdecore/tdecore-kde342.diff2
-rw-r--r--sip/tdecore/tdecore-kde343.diff2
-rw-r--r--sip/tdecore/tdecore-kde350.diff2
-rw-r--r--sip/tdecore/tdecore-kde351.diff2
-rw-r--r--sip/tdecore/tdecore-kde352.diff2
-rw-r--r--sip/tdecore/tdecore-kde353.diff2
48 files changed, 69 insertions, 69 deletions
diff --git a/ChangeLog.2001-4 b/ChangeLog.2001-4
index e754d5e..34f02f0 100644
--- a/ChangeLog.2001-4
+++ b/ChangeLog.2001-4
@@ -165,7 +165,7 @@ released)
2002/2/7 14:25:00 jim
3.0alpha4: changed postproc to run from $PYTHONINTERP from
configure; removed unnecessary links to libdcop (from
-kdebindings) -- only libDCOP is req'd (bug reports from
+tdebindings) -- only libDCOP is req'd (bug reports from
Henrik Motakef)
2001/11/25 13:19:00 jim
diff --git a/Changelog b/Changelog
index 81336ac..8452b3a 100644
--- a/Changelog
+++ b/Changelog
@@ -139,7 +139,7 @@ fully-qualified names in kabc/resourcefile.sip
r130 | (no author) | 2006-01-26 16:53:44 -0800 (Thu, 26 Jan 2006) | 3 lines
Put kabc/resourcefile.sip back into kabc for later
-versions (missing in kdelibs tarball, but in trinity/include/kabc)
+versions (missing in tdelibs tarball, but in trinity/include/kabc)
------------------------------------------------------------------------
r129 | (no author) | 2006-01-26 16:50:00 -0800 (Thu, 26 Jan 2006) | 3 lines
diff --git a/configure.py b/configure.py
index 3ef3964..49e7ee7 100644
--- a/configure.py
+++ b/configure.py
@@ -89,7 +89,7 @@ opt_split = 1
opt_releasegil = 0
opt_tracing = 0
opt_static = 0
-opt_kdebasedir = None
+opt_tdebasedir = None
opt_kdelibdir = None
opt_kdeincdir = None
opt_dep_warnings = 0
@@ -270,7 +270,7 @@ def inform_user(stage):
print
elif stage == 1:
- sipconfig.inform ("KDE base directory is %s" % opt_kdebasedir)
+ sipconfig.inform ("KDE base directory is %s" % opt_tdebasedir)
sipconfig.inform ("KDE include directory is %s" % opt_kdeincdir)
sipconfig.inform ("KDE lib directory is %s" % opt_kdelibdir)
sipconfig.inform ("lib directory is %s" % opt_libdir)
@@ -306,7 +306,7 @@ def create_config(module, template):
"pykde_sip_dir": opt_pykdesipdir,
"pykde_modules": pykde_modules,
"pykde_kde_sip_flags": kde_sip_flags,
- "kdebasedir": opt_kdebasedir,
+ "tdebasedir": opt_tdebasedir,
"kdelibdir": opt_kdelibdir,
"libdir": opt_libdir,
"kdeincdir": opt_kdeincdir,
@@ -387,9 +387,9 @@ def search (target, searchPath):
return path
def discoverKDE3 ():
- global opt_kdeincdir, opt_kdebasedir, opt_kdelibdir, opt_libdir
+ global opt_kdeincdir, opt_tdebasedir, opt_kdelibdir, opt_libdir
- if not opt_kdebasedir:
+ if not opt_tdebasedir:
kdeSearchPaths = []
libSearchPaths = []
incSearchPaths = []
@@ -401,16 +401,16 @@ def discoverKDE3 ():
kdeSearchPaths.append (os.path.join ("/opt", "trinity"))
kdeSearchPaths.append ("/usr")
- opt_kdebasedir = search (None, kdeSearchPaths)
+ opt_tdebasedir = search (None, kdeSearchPaths)
if not opt_kdelibdir:
- libSearchPaths = [os.path.join (opt_kdebasedir, "lib"), os.path.join (opt_kdebasedir, "lib64"), os.path.join (opt_kdebasedir, opt_libdir)]
+ libSearchPaths = [os.path.join (opt_tdebasedir, "lib"), os.path.join (opt_tdebasedir, "lib64"), os.path.join (opt_tdebasedir, opt_libdir)]
# print opt_libdir
opt_kdelibdir = search ("libtdecore.so", libSearchPaths)
if not opt_kdeincdir:
- incSearchPaths = [os.path.join (opt_kdebasedir, "include")]
- incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "kde")) # Red Hat
+ incSearchPaths = [os.path.join (opt_tdebasedir, "include")]
+ incSearchPaths.append (os.path.join (opt_tdebasedir, "include", "kde")) # Red Hat
opt_kdeincdir = search ("kapplication.h", incSearchPaths)
def check_kde_installation():
@@ -421,24 +421,24 @@ def check_kde_installation():
discoverKDE3 ()
- if not opt_kdebasedir:
+ if not opt_tdebasedir:
sipconfig.error ("Couldn't locate KDE3 base directory")
if not opt_kdeincdir:
- sipconfig.error ("Couldn't locate KDE3 include directory (%s is KDE base)" % opt_kdebasedir)
+ sipconfig.error ("Couldn't locate KDE3 include directory (%s is KDE base)" % opt_tdebasedir)
if not opt_kdelibdir:
- sipconfig.error ("Couldn't locate KDE3 lib directory (%s is KDE base)" % opt_kdebasedir)
+ sipconfig.error ("Couldn't locate KDE3 lib directory (%s is KDE base)" % opt_tdebasedir)
- kdeversion_h = os.path.join(opt_kdeincdir, "kdeversion.h")
+ tdeversion_h = os.path.join(opt_kdeincdir, "tdeversion.h")
inform_user (1)
- if not os.access(kdeversion_h, os.F_OK):
- sipconfig.error("kdeversion.h could not be found in %s." % opt_kdeincdir)
+ if not os.access(tdeversion_h, os.F_OK):
+ sipconfig.error("tdeversion.h could not be found in %s." % opt_kdeincdir)
# Get the KDE version number.
- getKDEVersion(kdeversion_h)
+ getKDEVersion(tdeversion_h)
inform_user (2)
@@ -827,7 +827,7 @@ def main(argv):
global opt_debug, opt_concat, opt_releasegil
global opt_split, opt_tracing, opt_startModName
global opt_startmod, opt_endmod
- global opt_kdebasedir, opt_kdelibdir, opt_kdeincdir, opt_libdir
+ global opt_tdebasedir, opt_kdelibdir, opt_kdeincdir, opt_libdir
global pykde_modules, opt_dep_warnings, opt_dist_name
global pykde_imports, kde_includes
@@ -866,7 +866,7 @@ def main(argv):
usage()
elif opt == "-k":
- opt_kdebasedir = arg
+ opt_tdebasedir = arg
elif opt == "-L":
opt_libdir = arg
diff --git a/doc/switches.html b/doc/switches.html
index 948a356..0dc04fa 100644
--- a/doc/switches.html
+++ b/doc/switches.html
@@ -162,7 +162,7 @@ The path to KDE's library files (libtdecore.so, etc).
<td width = "40%"><u>configure.py Default:</u> trinity/include</td>
<td width = "20%"> </td>
</tr></table>
-The path to KDE's h files. (May require installation of kdelibs3-devel rpm package)
+The path to KDE's h files. (May require installation of tdelibs3-devel rpm package)
configure.py. PyKDE will locate h files in subdirectories of this path automatically (eg trinity/include/kio/*.h)
</dd>
<hr>
diff --git a/extra/kde340/kicontheme.h b/extra/kde340/kicontheme.h
index 84fc6f9..24574be 100644
--- a/extra/kde340/kicontheme.h
+++ b/extra/kde340/kicontheme.h
@@ -16,7 +16,7 @@
#include <qstring.h>
#include <qstringlist.h>
#include <qptrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KConfig;
//class KIconThemeDir;
diff --git a/extra/kde340/krecentdirs.h b/extra/kde340/krecentdirs.h
index 078efcc..3b81d9c 100644
--- a/extra/kde340/krecentdirs.h
+++ b/extra/kde340/krecentdirs.h
@@ -30,7 +30,7 @@
#include <qstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* The goal of this class is to make sure that, when the user needs to
diff --git a/extra/kde340/ksharedptr.h b/extra/kde340/ksharedptr.h
index 8338145..16ece72 100644
--- a/extra/kde340/ksharedptr.h
+++ b/extra/kde340/ksharedptr.h
@@ -18,7 +18,7 @@
#ifndef KSharedPTR_H
#define KSharedPTR_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* Reference counting for shared objects. If you derive your object
diff --git a/extra/kde341/kicontheme.h b/extra/kde341/kicontheme.h
index 84fc6f9..24574be 100644
--- a/extra/kde341/kicontheme.h
+++ b/extra/kde341/kicontheme.h
@@ -16,7 +16,7 @@
#include <qstring.h>
#include <qstringlist.h>
#include <qptrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KConfig;
//class KIconThemeDir;
diff --git a/extra/kde341/krecentdirs.h b/extra/kde341/krecentdirs.h
index 078efcc..3b81d9c 100644
--- a/extra/kde341/krecentdirs.h
+++ b/extra/kde341/krecentdirs.h
@@ -30,7 +30,7 @@
#include <qstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* The goal of this class is to make sure that, when the user needs to
diff --git a/extra/kde341/ksharedptr.h b/extra/kde341/ksharedptr.h
index 8338145..16ece72 100644
--- a/extra/kde341/ksharedptr.h
+++ b/extra/kde341/ksharedptr.h
@@ -18,7 +18,7 @@
#ifndef KSharedPTR_H
#define KSharedPTR_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* Reference counting for shared objects. If you derive your object
diff --git a/extra/kde342/kicontheme.h b/extra/kde342/kicontheme.h
index 136bf06..acd122e 100644
--- a/extra/kde342/kicontheme.h
+++ b/extra/kde342/kicontheme.h
@@ -16,7 +16,7 @@
#include <qstring.h>
#include <qstringlist.h>
#include <qptrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KConfig;
//class KIconThemeDir;
diff --git a/extra/kde342/krecentdirs.h b/extra/kde342/krecentdirs.h
index 078efcc..3b81d9c 100644
--- a/extra/kde342/krecentdirs.h
+++ b/extra/kde342/krecentdirs.h
@@ -30,7 +30,7 @@
#include <qstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* The goal of this class is to make sure that, when the user needs to
diff --git a/extra/kde342/ksharedptr.h b/extra/kde342/ksharedptr.h
index 8338145..16ece72 100644
--- a/extra/kde342/ksharedptr.h
+++ b/extra/kde342/ksharedptr.h
@@ -18,7 +18,7 @@
#ifndef KSharedPTR_H
#define KSharedPTR_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* Reference counting for shared objects. If you derive your object
diff --git a/extra/kde343/kicontheme.h b/extra/kde343/kicontheme.h
index 136bf06..acd122e 100644
--- a/extra/kde343/kicontheme.h
+++ b/extra/kde343/kicontheme.h
@@ -16,7 +16,7 @@
#include <qstring.h>
#include <qstringlist.h>
#include <qptrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KConfig;
//class KIconThemeDir;
diff --git a/extra/kde343/krecentdirs.h b/extra/kde343/krecentdirs.h
index 078efcc..3b81d9c 100644
--- a/extra/kde343/krecentdirs.h
+++ b/extra/kde343/krecentdirs.h
@@ -30,7 +30,7 @@
#include <qstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* The goal of this class is to make sure that, when the user needs to
diff --git a/extra/kde343/ksharedptr.h b/extra/kde343/ksharedptr.h
index 8338145..16ece72 100644
--- a/extra/kde343/ksharedptr.h
+++ b/extra/kde343/ksharedptr.h
@@ -18,7 +18,7 @@
#ifndef KSharedPTR_H
#define KSharedPTR_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* Reference counting for shared objects. If you derive your object
diff --git a/extra/kde350/kicontheme.h b/extra/kde350/kicontheme.h
index d095d15..c1ea330 100644
--- a/extra/kde350/kicontheme.h
+++ b/extra/kde350/kicontheme.h
@@ -16,7 +16,7 @@
#include <qstring.h>
#include <qstringlist.h>
#include <qptrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KConfig;
//class KIconThemeDir;
diff --git a/extra/kde350/krecentdirs.h b/extra/kde350/krecentdirs.h
index 078efcc..3b81d9c 100644
--- a/extra/kde350/krecentdirs.h
+++ b/extra/kde350/krecentdirs.h
@@ -30,7 +30,7 @@
#include <qstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* The goal of this class is to make sure that, when the user needs to
diff --git a/extra/kde350/ksharedptr.h b/extra/kde350/ksharedptr.h
index 8338145..16ece72 100644
--- a/extra/kde350/ksharedptr.h
+++ b/extra/kde350/ksharedptr.h
@@ -18,7 +18,7 @@
#ifndef KSharedPTR_H
#define KSharedPTR_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* Reference counting for shared objects. If you derive your object
diff --git a/extra/kde351/kicontheme.h b/extra/kde351/kicontheme.h
index bdb19d1..1261b15 100644
--- a/extra/kde351/kicontheme.h
+++ b/extra/kde351/kicontheme.h
@@ -16,7 +16,7 @@
#include <qstring.h>
#include <qstringlist.h>
#include <qptrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KConfig;
//class KIconThemeDir;
diff --git a/extra/kde351/ksharedptr.h b/extra/kde351/ksharedptr.h
index 8338145..16ece72 100644
--- a/extra/kde351/ksharedptr.h
+++ b/extra/kde351/ksharedptr.h
@@ -18,7 +18,7 @@
#ifndef KSharedPTR_H
#define KSharedPTR_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* Reference counting for shared objects. If you derive your object
diff --git a/extra/kde352/kicontheme.h b/extra/kde352/kicontheme.h
index bdb19d1..1261b15 100644
--- a/extra/kde352/kicontheme.h
+++ b/extra/kde352/kicontheme.h
@@ -16,7 +16,7 @@
#include <qstring.h>
#include <qstringlist.h>
#include <qptrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KConfig;
//class KIconThemeDir;
diff --git a/extra/kde352/ksharedptr.h b/extra/kde352/ksharedptr.h
index 8338145..16ece72 100644
--- a/extra/kde352/ksharedptr.h
+++ b/extra/kde352/ksharedptr.h
@@ -18,7 +18,7 @@
#ifndef KSharedPTR_H
#define KSharedPTR_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* Reference counting for shared objects. If you derive your object
diff --git a/extra/kde353/kicontheme.h b/extra/kde353/kicontheme.h
index bdb19d1..1261b15 100644
--- a/extra/kde353/kicontheme.h
+++ b/extra/kde353/kicontheme.h
@@ -16,7 +16,7 @@
#include <qstring.h>
#include <qstringlist.h>
#include <qptrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KConfig;
//class KIconThemeDir;
diff --git a/extra/kde353/ksharedptr.h b/extra/kde353/ksharedptr.h
index 8338145..16ece72 100644
--- a/extra/kde353/ksharedptr.h
+++ b/extra/kde353/ksharedptr.h
@@ -18,7 +18,7 @@
#ifndef KSharedPTR_H
#define KSharedPTR_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* Reference counting for shared objects. If you derive your object
diff --git a/pykde350.prj b/pykde350.prj
index 4e48ef9..69728b0 100644
--- a/pykde350.prj
+++ b/pykde350.prj
@@ -26,7 +26,7 @@
project = PyKDE
destination = /home/jim/PyKDE350
-source = /server/source/KDESrc/kdelibs-3.5.0
+source = /server/source/KDESrc/tdelibs-3.5.0
compare = /opt/trinity/include
importpath = /usr/share/sip
prevpath = /home/jim/PyKDE/sip
@@ -69,7 +69,7 @@ ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextso
ignore = ksycocaentry.h ksycocafactory.h ksycocatype.h ksycoca.h kapp.h kstandarddirs.h
ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h
ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
-ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h kdelibs_export.h
+ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h
ignore = kswap.h
compare = $COMP $DST/extra/kde350
subst = $DST/extra/kde350
diff --git a/pykde351.prj b/pykde351.prj
index e272870..eafe669 100644
--- a/pykde351.prj
+++ b/pykde351.prj
@@ -26,7 +26,7 @@
project = PyKDE
destination = /home/jim/PyKDE351
-source = /server/source/KDESrc/kdelibs-3.5.1
+source = /server/source/KDESrc/tdelibs-3.5.1
compare = /opt/trinity/include
importpath = /usr/share/sip
prevpath = /home/jim/PyKDE/sip
@@ -69,7 +69,7 @@ ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextso
ignore = ksycocaentry.h ksycocafactory.h ksycocatype.h ksycoca.h kapp.h kstandarddirs.h
ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h
ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
-ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h kdelibs_export.h
+ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h
ignore = kswap.h
compare = $COMP $DST/extra/kde351
subst = $DST/extra/kde351
diff --git a/pykde352.prj b/pykde352.prj
index b8491e8..7eacbf4 100644
--- a/pykde352.prj
+++ b/pykde352.prj
@@ -26,7 +26,7 @@
project = PyKDE
destination = /home/jim/PyKDE352
-source = /server/source/KDESrc/kdelibs-3.5.2
+source = /server/source/KDESrc/tdelibs-3.5.2
compare = /opt/trinity/include
importpath = /usr/share/sip
prevpath = /home/jim/PyKDE/sip
@@ -69,7 +69,7 @@ ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextso
ignore = ksycocaentry.h ksycocafactory.h ksycocatype.h ksycoca.h kapp.h kstandarddirs.h
ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h
ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
-ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h kdelibs_export.h
+ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h
ignore = kswap.h
compare = $COMP $DST/extra/kde352
subst = $DST/extra/kde352
diff --git a/pykde353.prj b/pykde353.prj
index 4dc5173..dae9680 100644
--- a/pykde353.prj
+++ b/pykde353.prj
@@ -26,7 +26,7 @@
project = PyKDE
destination = /home/jim/PyKDE353
-source = /server/source/KDESrc/kdelibs-3.5.3
+source = /server/source/KDESrc/tdelibs-3.5.3
compare = /opt/trinity/include
importpath = /usr/share/sip
prevpath = /home/jim/PyKDE/sip
@@ -69,7 +69,7 @@ ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextso
ignore = ksycocaentry.h ksycocafactory.h ksycocatype.h ksycoca.h kapp.h kstandarddirs.h
ignore = kgenericfactory.h ktypelist.h kvmallocator.h ksortablevaluelist.h
ignore = kextendedsocket.h klargefile.h kdebug.h kdebugclasses.h kxmessages.h kaccelmanager.h
-ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h kdelibs_export.h
+ignore = kdemacros.h kxerrorhandler.h fixx11.h kuser.h kuniqueapp.h kde_file.h tdelibs_export.h
ignore = kswap.h
compare = $COMP $DST/extra/kde353
subst = $DST/extra/kde353
diff --git a/pykdeconfig.py b/pykdeconfig.py
index fa4b3b6..164fb81 100644
--- a/pykdeconfig.py
+++ b/pykdeconfig.py
@@ -32,7 +32,7 @@ _pkg_config = {
'kde_version_extra': 'kde353',
'kde_version_sfx': '-kde353.diff',
'kde_version_str': '3.5.3',
- 'kdebasedir': '/opt/trinity',
+ 'tdebasedir': '/opt/trinity',
'kdeincdir': '/opt/trinity/include',
'kdelibdir': '/opt/trinity/lib',
'libdir': 'lib',
diff --git a/sip/tdecore/kdeversion.sip b/sip/tdecore/kdeversion.sip
index 0f71d17..5de5c03 100644
--- a/sip/tdecore/kdeversion.sip
+++ b/sip/tdecore/kdeversion.sip
@@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%ModuleHeaderCode
-#include <kdeversion.h>
+#include <tdeversion.h>
%End
diff --git a/sip/tdecore/tdecore-kde314.diff b/sip/tdecore/tdecore-kde314.diff
index 13e7719..6cd5b60 100644
--- a/sip/tdecore/tdecore-kde314.diff
+++ b/sip/tdecore/tdecore-kde314.diff
@@ -1,3 +1,3 @@
+ %Include kclipboard.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kurldrag.sip
diff --git a/sip/tdecore/tdecore-kde315.diff b/sip/tdecore/tdecore-kde315.diff
index 13e7719..6cd5b60 100644
--- a/sip/tdecore/tdecore-kde315.diff
+++ b/sip/tdecore/tdecore-kde315.diff
@@ -1,3 +1,3 @@
+ %Include kclipboard.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kurldrag.sip
diff --git a/sip/tdecore/tdecore-kde320.diff b/sip/tdecore/tdecore-kde320.diff
index 8476e6c..91d9a2c 100644
--- a/sip/tdecore/tdecore-kde320.diff
+++ b/sip/tdecore/tdecore-kde320.diff
@@ -3,7 +3,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include kmacroexpander.sip
+ %Include kmountpoint.sip
diff --git a/sip/tdecore/tdecore-kde321.diff b/sip/tdecore/tdecore-kde321.diff
index 5dc526d..70ae29c 100644
--- a/sip/tdecore/tdecore-kde321.diff
+++ b/sip/tdecore/tdecore-kde321.diff
@@ -3,7 +3,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include kmacroexpander.sip
+ %Include kmountpoint.sip
diff --git a/sip/tdecore/tdecore-kde322.diff b/sip/tdecore/tdecore-kde322.diff
index e0d64ad..2114627 100644
--- a/sip/tdecore/tdecore-kde322.diff
+++ b/sip/tdecore/tdecore-kde322.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include kmacroexpander.sip
+ %Include kmountpoint.sip
diff --git a/sip/tdecore/tdecore-kde323.diff b/sip/tdecore/tdecore-kde323.diff
index e0d64ad..2114627 100644
--- a/sip/tdecore/tdecore-kde323.diff
+++ b/sip/tdecore/tdecore-kde323.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include kmacroexpander.sip
+ %Include kmountpoint.sip
diff --git a/sip/tdecore/tdecore-kde330.diff b/sip/tdecore/tdecore-kde330.diff
index d202574..335a5f4 100644
--- a/sip/tdecore/tdecore-kde330.diff
+++ b/sip/tdecore/tdecore-kde330.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include klockfile.sip
+ %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde331.diff b/sip/tdecore/tdecore-kde331.diff
index d202574..335a5f4 100644
--- a/sip/tdecore/tdecore-kde331.diff
+++ b/sip/tdecore/tdecore-kde331.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include klockfile.sip
+ %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde332.diff b/sip/tdecore/tdecore-kde332.diff
index d202574..335a5f4 100644
--- a/sip/tdecore/tdecore-kde332.diff
+++ b/sip/tdecore/tdecore-kde332.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include klockfile.sip
+ %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde340.diff b/sip/tdecore/tdecore-kde340.diff
index d202574..335a5f4 100644
--- a/sip/tdecore/tdecore-kde340.diff
+++ b/sip/tdecore/tdecore-kde340.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include klockfile.sip
+ %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde341.diff b/sip/tdecore/tdecore-kde341.diff
index d202574..335a5f4 100644
--- a/sip/tdecore/tdecore-kde341.diff
+++ b/sip/tdecore/tdecore-kde341.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include klockfile.sip
+ %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde342.diff b/sip/tdecore/tdecore-kde342.diff
index d202574..335a5f4 100644
--- a/sip/tdecore/tdecore-kde342.diff
+++ b/sip/tdecore/tdecore-kde342.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include klockfile.sip
+ %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde343.diff b/sip/tdecore/tdecore-kde343.diff
index d202574..335a5f4 100644
--- a/sip/tdecore/tdecore-kde343.diff
+++ b/sip/tdecore/tdecore-kde343.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include klockfile.sip
+ %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde350.diff b/sip/tdecore/tdecore-kde350.diff
index b8dba4c..72166a8 100644
--- a/sip/tdecore/tdecore-kde350.diff
+++ b/sip/tdecore/tdecore-kde350.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include klockfile.sip
+ %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde351.diff b/sip/tdecore/tdecore-kde351.diff
index b8dba4c..72166a8 100644
--- a/sip/tdecore/tdecore-kde351.diff
+++ b/sip/tdecore/tdecore-kde351.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include klockfile.sip
+ %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde352.diff b/sip/tdecore/tdecore-kde352.diff
index b8dba4c..72166a8 100644
--- a/sip/tdecore/tdecore-kde352.diff
+++ b/sip/tdecore/tdecore-kde352.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include klockfile.sip
+ %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde353.diff b/sip/tdecore/tdecore-kde353.diff
index b8dba4c..72166a8 100644
--- a/sip/tdecore/tdecore-kde353.diff
+++ b/sip/tdecore/tdecore-kde353.diff
@@ -4,7 +4,7 @@
+ %Include kclipboard.sip
+ %Include kconfigdialogmanager.sip
+ %Include kconfigskeleton.sip
-+ %Include kdeversion.sip
++ %Include tdeversion.sip
+ %Include kidna.sip
+ %Include klockfile.sip
+ %Include kmacroexpander.sip