13 files changed, 21 insertions, 21 deletions
diff --git a/doc/classref/tdecore/TDEApplication.html b/doc/classref/tdecore/TDEApplication.html
index ad51bb2..e3c9013 100644
--- a/doc/classref/tdecore/TDEApplication.html
+++ b/doc/classref/tdecore/TDEApplication.html
@@ -363,7 +363,7 @@
 <li><b>isRestored</b> ()
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>kApplication</b> ()
+<li><b>tdeApplication</b> ()
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDEApplication)</i></td></tr>
 <tr><td><i>static</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
diff --git a/doc/classref/tdecore/TDECmdLineArgs.html b/doc/classref/tdecore/TDECmdLineArgs.html
index e8874ba..a8c8083 100644
--- a/doc/classref/tdecore/TDECmdLineArgs.html
+++ b/doc/classref/tdecore/TDECmdLineArgs.html
@@ -105,7 +105,7 @@ NULL (or None) parameters to mark the end of the list are not required
 <tr><td>a0</td><td>char</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>init</b> (_argc, _argv, _appname, programName, _description, _version, noKApp = 0)
+<li><b>init</b> (_argc, _argv, _appname, programName, _description, _version, noTDEApp = 0)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 <tr><td>In versions KDE 3.2.0 and above only</td></tr>
 <tr><td><i>static</i></td></tr>
@@ -116,10 +116,10 @@ NULL (or None) parameters to mark the end of the list are not required
 <tr><td>programName</td><td>char</td><td></td></tr>
 <tr><td>_description</td><td>char</td><td></td></tr>
 <tr><td>_version</td><td>char</td><td></td></tr>
-<tr><td>noKApp</td><td>bool</td><td>0</td></tr>
+<tr><td>noTDEApp</td><td>bool</td><td>0</td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>init</b> (_argv, _appname, _description, _version, noKApp = False)
+<li><b>init</b> (_argv, _appname, _description, _version, noTDEApp = False)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 <tr><td><i>static</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
@@ -127,16 +127,16 @@ NULL (or None) parameters to mark the end of the list are not required
 <tr><td>_appname</td><td>char</td><td></td></tr>
 <tr><td>_description</td><td>char</td><td></td></tr>
 <tr><td>_version</td><td>char</td><td></td></tr>
-<tr><td>noKApp</td><td>bool</td><td>False</td></tr>
+<tr><td>noTDEApp</td><td>bool</td><td>False</td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>init</b> (_argv, about, noKApp = 0)
+<li><b>init</b> (_argv, about, noTDEApp = 0)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 <tr><td><i>static</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>_argv</td><td>a Python list of strings which may be modified</td><td></td></tr>
 <tr><td>about</td><td>TDEAboutData</td><td></td></tr>
-<tr><td>noKApp</td><td>bool</td><td>0</td></tr>
+<tr><td>noTDEApp</td><td>bool</td><td>0</td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>init</b> (about)
diff --git a/examples/pytde-sampler/misc/window_info.py b/examples/pytde-sampler/misc/window_info.py
index c222413..c760dbc 100644
--- a/examples/pytde-sampler/misc/window_info.py
+++ b/examples/pytde-sampler/misc/window_info.py
@@ -25,7 +25,7 @@ class MainFrame(TQFrame):
 
 
     def showWindowInfo(self):
-        app = TDEApplication.kApplication()
+        app = TDEApplication.tdeApplication()
         
         info = KWindowInfo(app.activeWindow())
         info.message('Updated Window Info', 3000)
diff --git a/examples/uimodules/uimenus.py b/examples/uimodules/uimenus.py
index e44dc58..1fdaf03 100644
--- a/examples/uimodules/uimenus.py
+++ b/examples/uimodules/uimenus.py
@@ -17,7 +17,7 @@ class PageLaunch:
 
         self.page.show ()
 
-        TDEApplication.kApplication ().processEvents ()
+        TDEApplication.tdeApplication ().processEvents ()
 
 
 class PageNotImpl:
diff --git a/examples/uimodules/uiwidgets.py b/examples/uimodules/uiwidgets.py
index 69bd002..aea7383 100644
--- a/examples/uimodules/uiwidgets.py
+++ b/examples/uimodules/uiwidgets.py
@@ -114,8 +114,8 @@ class Page1:
         grp.show ()
 
         self.page.show ()
-        kapp = TDEApplication.kApplication ()
-        kapp.processEvents ()
+        tdeApp = TDEApplication.tdeApplication ()
+        tdeApp.processEvents ()
 
         y = y + 195
         sqzLbl = TQLabel ("This text is too long to fit in the label below", self.page)
diff --git a/examples/uimodules/uixml.py b/examples/uimodules/uixml.py
index 0c7578e..f7842e2 100644
--- a/examples/uimodules/uixml.py
+++ b/examples/uimodules/uixml.py
@@ -17,7 +17,7 @@ class PageLaunch:
 
         self.page.show ()
 
-        TDEApplication.kApplication ().processEvents ()
+        TDEApplication.tdeApplication ().processEvents ()
 
 def xmlTDEActionCollection (parent):
     parent.currentPageObj = PageLaunch (parent)
diff --git a/postproc b/postproc
index 8d69469..b0a9ee1 100755
--- a/postproc
+++ b/postproc
@@ -343,7 +343,7 @@ def appQuit (filelist):
 
         tmp.write (\
 """\tdef quit (self):
-\t\tk = TDEApplication.kApplication ()
+\t\tk = TDEApplication.tdeApplication ()
 \t\te = TQCloseEvent ()
 
 \t\tfor w in k.topLevelWidgets ():
diff --git a/sip/tdecore/tdeapplication.sip b/sip/tdecore/tdeapplication.sip
index f4b40dd..4a241c4 100644
--- a/sip/tdecore/tdeapplication.sip
+++ b/sip/tdecore/tdeapplication.sip
@@ -84,7 +84,7 @@ public:
 %End
 
     static void          addCmdLineOptions ();
-    static TDEApplication* kApplication ();
+    static TDEApplication* tdeApplication ();
     TDEConfig*             sessionConfig ();
     bool                 isRestored () const;
     void                 disableSessionManagement ();
diff --git a/sip/tdecore/tdecmdlineargs.sip b/sip/tdecore/tdecmdlineargs.sip
index 4fe3904..acd051b 100644
--- a/sip/tdecore/tdecmdlineargs.sip
+++ b/sip/tdecore/tdecmdlineargs.sip
@@ -59,7 +59,7 @@ public:
 %If ( KDE_3_2_0 -  )
     static void          init (SIP_PYLIST, const char*, const char*, const char*, const char*, bool = 0) [void (int, char**, const char*, const char*, const char*, const char*, bool = 0)];
 %MethodCode
-//takes _argc | (int) | _argv | (char) | _appname | (char) | programName | (char) | _description | (char) | _version | (char) | noKApp | (bool = 0)
+//takes _argc | (int) | _argv | (char) | _appname | (char) | programName | (char) | _description | (char) | _version | (char) | noTDEApp | (bool = 0)
 
     int argc, nargc;
     char **argv;
@@ -85,7 +85,7 @@ public:
 
     static void          init (SIP_PYLIST, const char*, const char*, const char*, bool = 0) [void (int, char**, const char*, const char*, const char*, bool = 0)];
 %MethodCode
-//takes  _argv | (a Python list of strings which may be modified) | _appname | (char) | _description | (char) | _version | (char) | noKApp | (bool = False)
+//takes  _argv | (a Python list of strings which may be modified) | _appname | (char) | _description | (char) | _version | (char) | noTDEApp | (bool = False)
 
     int argc, nargc;
     char **argv;
@@ -109,7 +109,7 @@ public:
 
     static void          init (SIP_PYLIST, const TDEAboutData*, bool = 0) [void (int, char**, const TDEAboutData*, bool = 0)];
 %MethodCode
-//takes  _argv | (a Python list of strings which may be modified) | about | (TDEAboutData) | noKApp | (bool = 0)
+//takes  _argv | (a Python list of strings which may be modified) | about | (TDEAboutData) | noTDEApp | (bool = 0)
 
     int argc, nargc; //, iserr = 0;
     char **argv;
diff --git a/templates/annotated/systray.py b/templates/annotated/systray.py
index f0a005a..2d7056d 100644
--- a/templates/annotated/systray.py
+++ b/templates/annotated/systray.py
@@ -56,7 +56,7 @@ class MainWin (TQWidget):
 # when the user right clicks the icon in the system tray and
 # selects "Quit" from the popup menu
 def slotQuitSelected ():
-    TDEApplication.kApplication ().quit ()
+    TDEApplication.tdeApplication ().quit ()
 
 # The usual stuff
 appName = "template"
diff --git a/templates/annotated/systray1.py b/templates/annotated/systray1.py
index 8e164a2..620c798 100644
--- a/templates/annotated/systray1.py
+++ b/templates/annotated/systray1.py
@@ -70,7 +70,7 @@ class MainWin (TDEMainWindow):
     # system tray icon's menu
     def slotQuitSelected (self):
         self.exitFlag = True
-        TDEApplication.kApplication ().quit ()
+        TDEApplication.tdeApplication ().quit ()
 
 #-------------------- main ------------------------------------------------
 
diff --git a/templates/basic/systray.py b/templates/basic/systray.py
index 617f15b..87b8421 100644
--- a/templates/basic/systray.py
+++ b/templates/basic/systray.py
@@ -41,7 +41,7 @@ class MainWin (TQWidget):
 #-------------------- main ------------------------------------------------
 
 def slotQuitSelected ():
-    TDEApplication.kApplication().quit()
+    TDEApplication.tdeApplication().quit()
 
 version     = "1.0"
 description = "A basic application template"
diff --git a/templates/basic/systray1.py b/templates/basic/systray1.py
index d112813..7897160 100644
--- a/templates/basic/systray1.py
+++ b/templates/basic/systray1.py
@@ -52,7 +52,7 @@ class MainWin (TDEMainWindow):
 
     def slotQuitSelected (self):
         self.exitFlag = True
-        TDEApplication.kApplication ().quit ()
+        TDEApplication.tdeApplication ().quit ()
 
 #-------------------- main ------------------------------------------------