From 886e33053835feb8d41744c18c48ff76c86677c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:12:50 -0600 Subject: [PATCH] Rename common header files for consistency with class renaming --- configure.py | 2 +- examples/pyTDEHTMLPart.py | 2 +- pytde350.prj | 2 +- pytde351.prj | 2 +- pytde352.prj | 2 +- pytde353.prj | 2 +- sip/tdecore/{kaboutdata.sip => tdeaboutdata.sip} | 6 +++--- sip/tdecore/{kapplication.sip => tdeapplication.sip} | 6 +++--- sip/tdecore/{kcmdlineargs.sip => tdecmdlineargs.sip} | 4 ++-- sip/tdecore/tdecoremod.sip.in | 6 +++--- sip/tdefx/tdefxmod.sip.in | 2 +- sip/tdefx/{kstyle.sip => tdestylen.sip} | 2 +- .../{kaboutapplication.sip => tdeaboutapplication.sip} | 2 +- sip/tdeui/{kaboutdialog.sip => tdeaboutdialog.sip} | 8 ++++---- sip/tdeui/{kaboutkde.sip => tdeabouttde.sip} | 2 +- sip/tdeui/tdeuimod.sip.in | 6 +++--- 16 files changed, 28 insertions(+), 28 deletions(-) rename sip/tdecore/{kaboutdata.sip => tdeaboutdata.sip} (99%) rename sip/tdecore/{kapplication.sip => tdeapplication.sip} (99%) rename sip/tdecore/{kcmdlineargs.sip => tdecmdlineargs.sip} (99%) rename sip/tdefx/{kstyle.sip => tdestylen.sip} (99%) rename sip/tdeui/{kaboutapplication.sip => tdeaboutapplication.sip} (99%) rename sip/tdeui/{kaboutdialog.sip => tdeaboutdialog.sip} (98%) rename sip/tdeui/{kaboutkde.sip => tdeabouttde.sip} (97%) diff --git a/configure.py b/configure.py index b4053c8..2b63bc5 100644 --- a/configure.py +++ b/configure.py @@ -411,7 +411,7 @@ def discoverKDE3 (): if not opt_kdeincdir: incSearchPaths = [os.path.join (opt_tdebasedir, "include")] incSearchPaths.append (os.path.join (opt_tdebasedir, "include", "kde")) # Red Hat - opt_kdeincdir = search ("kapplication.h", incSearchPaths) + opt_kdeincdir = search ("tdeapplication.h", incSearchPaths) def check_kde_installation(): """Check the KDE installation and get the version number diff --git a/examples/pyTDEHTMLPart.py b/examples/pyTDEHTMLPart.py index e005c9b..bcdb18e 100644 --- a/examples/pyTDEHTMLPart.py +++ b/examples/pyTDEHTMLPart.py @@ -204,7 +204,7 @@ else: # this is our KParts::MainWindow derived class parts = pyPartsMW (None, "pyParts") if len(sys.argv) > 1: - # read kcmdlineargs.h for the full unabridged instructions + # read tdecmdlineargs.h for the full unabridged instructions # on using TDECmdLineArgs, it's pretty confusing at first, but it works # This is pretty useless in this program - you might want to # expand this in your app (to load a file, etc) diff --git a/pytde350.prj b/pytde350.prj index eb9cc0e..9a639a0 100644 --- a/pytde350.prj +++ b/pytde350.prj @@ -62,7 +62,7 @@ retain module = tdecore -//trace = kapplication.h +//trace = tdeapplication.h source = $SRC/tdecore ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextsock.h ksocks.h diff --git a/pytde351.prj b/pytde351.prj index 999c32b..b48db80 100644 --- a/pytde351.prj +++ b/pytde351.prj @@ -62,7 +62,7 @@ retain module = tdecore -//trace = kapplication.h +//trace = tdeapplication.h source = $SRC/tdecore ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextsock.h ksocks.h diff --git a/pytde352.prj b/pytde352.prj index 9a0858f..5af7193 100644 --- a/pytde352.prj +++ b/pytde352.prj @@ -62,7 +62,7 @@ retain module = tdecore -//trace = kapplication.h +//trace = tdeapplication.h source = $SRC/tdecore ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextsock.h ksocks.h diff --git a/pytde353.prj b/pytde353.prj index 1abec8d..098a032 100644 --- a/pytde353.prj +++ b/pytde353.prj @@ -62,7 +62,7 @@ retain module = tdecore -//trace = kapplication.h +//trace = tdeapplication.h source = $SRC/tdecore ignore = netwm_p.h kde_dmalloc.h kunload.h kdatastream.h ksockaddr.h kextsock.h ksocks.h diff --git a/sip/tdecore/kaboutdata.sip b/sip/tdecore/tdeaboutdata.sip similarity index 99% rename from sip/tdecore/kaboutdata.sip rename to sip/tdecore/tdeaboutdata.sip index ef46ee9..20a19c5 100644 --- a/sip/tdecore/kaboutdata.sip +++ b/sip/tdecore/tdeaboutdata.sip @@ -27,7 +27,7 @@ class TDEAboutPerson { %TypeHeaderCode -#include +#include %End @@ -45,7 +45,7 @@ public: class TDEAboutTranslator { %TypeHeaderCode -#include +#include %End @@ -60,7 +60,7 @@ public: class TDEAboutData { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdecore/kapplication.sip b/sip/tdecore/tdeapplication.sip similarity index 99% rename from sip/tdecore/kapplication.sip rename to sip/tdecore/tdeapplication.sip index d13d156..1f568a8 100644 --- a/sip/tdecore/kapplication.sip +++ b/sip/tdecore/tdeapplication.sip @@ -27,8 +27,8 @@ class TDEApplication : TQApplication, TDEInstance { %TypeHeaderCode -#include -#include +#include +#include extern char **pyArgvToC(PyObject *argvlist,int *argcp); extern void updatePyArgv(PyObject *argvlist,int argc,char **argv); %End @@ -375,7 +375,7 @@ public: class KSessionManaged { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdecore/kcmdlineargs.sip b/sip/tdecore/tdecmdlineargs.sip similarity index 99% rename from sip/tdecore/kcmdlineargs.sip rename to sip/tdecore/tdecmdlineargs.sip index 7f6226d..6b50c7e 100644 --- a/sip/tdecore/kcmdlineargs.sip +++ b/sip/tdecore/tdecmdlineargs.sip @@ -27,7 +27,7 @@ class TDECmdLineOptions { %TypeHeaderCode -#include +#include extern char **pyArgvToC(PyObject *argvlist,int *argcp); extern void updatePyArgv(PyObject *argvlist,int argc,char **argv); %End @@ -49,7 +49,7 @@ public: class TDECmdLineArgs { %TypeHeaderCode -#include +#include #include %End diff --git a/sip/tdecore/tdecoremod.sip.in b/sip/tdecore/tdecoremod.sip.in index 09aeacb..796dbc9 100644 --- a/sip/tdecore/tdecoremod.sip.in +++ b/sip/tdecore/tdecoremod.sip.in @@ -32,18 +32,18 @@ %Import dcopmod.sip %Include bytearray.sip -%Include kaboutdata.sip +%Include tdeaboutdata.sip %Include tdeaccel.sip %Include tdeaccelaction.sip %Include tdeaccelbase.sip %Include kallocator.sip -%Include kapplication.sip +%Include tdeapplication.sip %Include kasyncio.sip %Include kaudioplayer.sip %Include kbufferedio.sip %Include kcatalogue.sip %Include kcharsets.sip -%Include kcmdlineargs.sip +%Include tdecmdlineargs.sip %Include kcompletion.sip %Include tdeconfig.sip %Include tdeconfigbackend.sip diff --git a/sip/tdefx/tdefxmod.sip.in b/sip/tdefx/tdefxmod.sip.in index 27a3ade..9a65a1f 100644 --- a/sip/tdefx/tdefxmod.sip.in +++ b/sip/tdefx/tdefxmod.sip.in @@ -37,5 +37,5 @@ %Include kpixmap.sip %Include kpixmapeffect.sip %Include kpixmapsplitter.sip -%Include kstyle.sip +%Include tdestyle.sip @mark@ diff --git a/sip/tdefx/kstyle.sip b/sip/tdefx/tdestylen.sip similarity index 99% rename from sip/tdefx/kstyle.sip rename to sip/tdefx/tdestylen.sip index bf17b89..2d5f043 100644 --- a/sip/tdefx/kstyle.sip +++ b/sip/tdefx/tdestylen.sip @@ -27,7 +27,7 @@ class TDEStyle : TQCommonStyle { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/kaboutapplication.sip b/sip/tdeui/tdeaboutapplication.sip similarity index 99% rename from sip/tdeui/kaboutapplication.sip rename to sip/tdeui/tdeaboutapplication.sip index f86ad87..fb05127 100644 --- a/sip/tdeui/kaboutapplication.sip +++ b/sip/tdeui/tdeaboutapplication.sip @@ -27,7 +27,7 @@ class TDEAboutApplication : TDEAboutDialog { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/kaboutdialog.sip b/sip/tdeui/tdeaboutdialog.sip similarity index 98% rename from sip/tdeui/kaboutdialog.sip rename to sip/tdeui/tdeaboutdialog.sip index ad36cf9..1a972e2 100644 --- a/sip/tdeui/kaboutdialog.sip +++ b/sip/tdeui/tdeaboutdialog.sip @@ -27,7 +27,7 @@ class TDEAboutContainer : TQFrame { %TypeHeaderCode -#include +#include %End @@ -53,7 +53,7 @@ signals: class TDEAboutContributor : TQFrame { %TypeHeaderCode -#include +#include %End @@ -86,7 +86,7 @@ signals: class TDEAboutWidget : TQWidget { %TypeHeaderCode -#include +#include %End @@ -116,7 +116,7 @@ protected: class TDEAboutDialog : KDialogBase { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/kaboutkde.sip b/sip/tdeui/tdeabouttde.sip similarity index 97% rename from sip/tdeui/kaboutkde.sip rename to sip/tdeui/tdeabouttde.sip index b9cd58b..81fa7f8 100644 --- a/sip/tdeui/kaboutkde.sip +++ b/sip/tdeui/tdeabouttde.sip @@ -27,7 +27,7 @@ class TDEAboutKDE : TDEAboutDialog { %TypeHeaderCode -#include +#include %End diff --git a/sip/tdeui/tdeuimod.sip.in b/sip/tdeui/tdeuimod.sip.in index 1afb874..a8d915d 100644 --- a/sip/tdeui/tdeuimod.sip.in +++ b/sip/tdeui/tdeuimod.sip.in @@ -34,9 +34,9 @@ %Import tdecoremod.sip %Import tdefxmod.sip -%Include kaboutapplication.sip -%Include kaboutdialog.sip -%Include kaboutkde.sip +%Include tdeaboutapplication.sip +%Include tdeaboutdialog.sip +%Include tdeabouttde.sip %Include tdeaction.sip %Include tdeactionshortcutlist.sip %Include kactivelabel.sip