Use tdeApprename/tdeapp

Signed-off-by: Michele Calgaro <[email protected]>

10 files changed, 40 insertions, 40 deletions

diff --git a/app_templates/kcontrol_module/src/kcontrol_module.py b/app_templates/kcontrol_module/src/kcontrol_module.py
index f1c18de..0f560f6 100755
--- a/app_templates/kcontrol_module/src/kcontrol_module.py
+++ b/app_templates/kcontrol_module/src/kcontrol_module.py
@@ -110,8 +110,8 @@ class KcontrolModuleApp(programbase):
 
     ########################################################################
     def __loadOptions(self):
-        global kapp
-        config = kapp.config()
+        global tdeApp
+        config = tdeApp.config()
         config.setGroup("General")
         size = config.readSizeEntry("Geometry")
         if size.isEmpty()==False:
@@ -119,8 +119,8 @@ class KcontrolModuleApp(programbase):
 
     #######################################################################
     def __saveOptions(self):
-        global kapp
-        config = kapp.config()
+        global tdeApp
+        config = tdeApp.config()
         config.setGroup("General")
         config.writeEntry("Geometry", self.size())
         config.sync()
@@ -147,18 +147,18 @@ class KcontrolModuleApp(programbase):
 ############################################################################
 # This is the entry point used when running this module outside of kcontrol.
 def main():
-    global kapp
+    global tdeApp
     about_data = AboutData()
     TDECmdLineArgs.init(sys.argv,about_data)
-    kapp = TDEApplication()
+    tdeApp = TDEApplication()
     myapp = KcontrolModuleApp()
     myapp.exec_loop()
     
 ############################################################################
 # Factory function for KControl
 def create_kcontrol_module(parent,name):
-    global kapp
-    kapp = TDEApplication.kApplication()
+    global tdeApp
+    tdeApp = TDEApplication.tdeApplication()
     return KcontrolModuleApp(parent, name)
     
 ############################################################################
diff --git a/app_templates/kdeapp/setup.py b/app_templates/kdeapp/setup.py
index 21386c6..6c2c44b 100755
--- a/app_templates/kdeapp/setup.py
+++ b/app_templates/kdeapp/setup.py
@@ -17,14 +17,14 @@
 
 import tdedistutils
 
-tdedistutils.setup(name="kdeapp",
+tdedistutils.setup(name="tdeapp",
     version="0.1.0",
     author="AUTHOR",
     author_email="[email protected]",
-    url="http://www.KDEAPP.com/",
+    url="http://www.TDEAPP.com/",
     min_kde_version = "3.0.0",
     min_tqt_version = "3.0.0",
     license = "GPL",
-    application_data = ['src/kdeapp.py','src/prefdialog.py','src/kdeappview.py'],
-    executable_links = [('kdeapp','kdeapp.py')],
+    application_data = ['src/tdeapp.py','src/prefdialog.py','src/tdeappview.py'],
+    executable_links = [('tdeapp','tdeapp.py')],
     docbooks = [ ('doc/en','en') ] )
diff --git a/app_templates/kdeapp/src/kdeapp.desktop b/app_templates/kdeapp/src/tdeapp.desktop
index d1d2ca4..d1d2ca4 100644
--- a/app_templates/kdeapp/src/kdeapp.desktop
+++ b/app_templates/kdeapp/src/tdeapp.desktop
diff --git a/app_templates/kdeapp/src/kdeapp.py b/app_templates/kdeapp/src/tdeapp.py
index 68d07af..c4d3f7b 100755
--- a/app_templates/kdeapp/src/kdeapp.py
+++ b/app_templates/kdeapp/src/tdeapp.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 ###########################################################################
-# kdeapp - description                                                    #
+# tdeapp - description                                                    #
 # ------------------------------                                          #
 # begin     : Fri Jun 27 2005                                             #
 # copyright : (C) 2005 by AUTHOR                                          #
@@ -20,16 +20,16 @@ from tdecore import *
 from tdeui import *
 import sys
 from prefdialog import *
-from kdeappview import *
+from tdeappview import *
 
 description = "A KDE Application"
 version = "0.1";
 
-class KdeApp(TDEMainWindow):
+class TdeApp(TDEMainWindow):
     def __init__(self):
-        TDEMainWindow.__init__(self,None,"KdeApp")
+        TDEMainWindow.__init__(self,None,"TdeApp")
 
-        self._view = KdeAppView(self)
+        self._view = TdeAppView(self)
         self._printer = None
 
         # accept dnd
@@ -77,13 +77,13 @@ class KdeApp(TDEMainWindow):
 
 
     def _setupActions(self):
-        global kapp
+        global tdeApp
         KStdAction.openNew(self.fileNew, self.actionCollection())
         KStdAction.open(self.fileOpen, self.actionCollection())
         KStdAction.save(self.fileSave, self.actionCollection())
         KStdAction.saveAs(self.fileSaveAs, self.actionCollection())
         KStdAction.print_(self.filePrint, self.actionCollection())
-        KStdAction.quit(kapp.quit, self.actionCollection())
+        KStdAction.quit(tdeApp.quit, self.actionCollection())
         
         self._toolbarAction = KStdAction.showToolbar(self.optionsShowToolbar, self.actionCollection())
         self._statusbarAction = KStdAction.showStatusbar(self.optionsShowStatusbar, self.actionCollection())
@@ -142,7 +142,7 @@ class KdeApp(TDEMainWindow):
         # button is clicked
     
         # create a new window
-        KdeApp().show()
+        TdeApp().show()
 
     def fileOpen(self):
         # this slot is called whenever the File->Open menu is selected,
@@ -243,38 +243,38 @@ class KdeApp(TDEMainWindow):
 options = [ ("+[URL]", "Document to open", "") ]
 
 def main():
-    global kapp,version,description,options
+    global tdeApp,version,description,options
 
-    aboutdata = TDEAboutData("kdeapp", "KdeApp", version, description, \
+    aboutdata = TDEAboutData("tdeapp", "TdeApp", version, description, \
         TDEAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "[email protected]")
     aboutdata.addAuthor("AUTHOR", None, "[email protected]")
     TDECmdLineArgs.init(sys.argv,aboutdata)
     TDECmdLineArgs.addCmdLineOptions(options)
-    kapp = TDEApplication()
+    tdeApp = TDEApplication()
     
     # register ourselves as a dcop client
-    kapp.dcopClient().registerAs(kapp.name(), False)
+    tdeApp.dcopClient().registerAs(tdeApp.name(), False)
 
     # see if we are starting with session management
-    if kapp.isRestored():
+    if tdeApp.isRestored():
         n = 1
         while TDEMainWindow.canBeRestored(n):
-            KdeApp().restore(n)
+            TdeApp().restore(n)
             n += 1
     else:
         # no session.. just start up normally
         args = TDECmdLineArgs.parsedArgs()
         if args.count() == 0:
-            widget = KdeApp()
+            widget = TdeApp()
             widget.show()
         else:
             i = 0
             for i in range(args.count()):
-                widget = KdeApp()
+                widget = TdeApp()
                 widget.show()
                 widget.load(args.url(i))
 
         args.clear()
 
-    return kapp.exec_loop()
+    return tdeApp.exec_loop()
 main()
diff --git a/app_templates/kdeapp/src/kdeappiface.py b/app_templates/kdeapp/src/tdeappiface.py
index 5600437..5600437 100644
--- a/app_templates/kdeapp/src/kdeappiface.py
+++ b/app_templates/kdeapp/src/tdeappiface.py
diff --git a/app_templates/kdeapp/src/kdeappui.rc b/app_templates/kdeapp/src/tdeappui.rc
index 6c3f6a9..6c3f6a9 100644
--- a/app_templates/kdeapp/src/kdeappui.rc
+++ b/app_templates/kdeapp/src/tdeappui.rc
diff --git a/app_templates/kdeapp/src/kdeappview.py b/app_templates/kdeapp/src/tdeappview.py
index 69addb2..3d524d9 100644
--- a/app_templates/kdeapp/src/kdeappview.py
+++ b/app_templates/kdeapp/src/tdeappview.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 ###########################################################################
-# kdeappview - description                                                #
+# tdeappview - description                                                #
 # ------------------------------                                          #
 # begin     : Fri Jun 27 2005                                             #
 # copyright : (C) 2005 by AUTHOR                                          #
@@ -21,12 +21,12 @@ from tdeui import *
 from tdeio import *
 from tdehtml import *
 from tdeparts import *
-#from kdeappiface import *
+#from tdeappiface import *
 
-class KdeAppView(TQWidget):
+class TdeAppView(TQWidget):
     def __init__(self,parent):
         TQWidget.__init__(self,parent)
-        #self._dcopclient= KdeAppIface(self,"KdeAppIface")
+        #self._dcopclient= TdeAppIface(self,"TdeAppIface")
 
         # setup our layout manager to automatically add our widgets
         top_layout = TQHBoxLayout(self)
diff --git a/app_templates/kdeutility/src/kdeutility.py b/app_templates/kdeutility/src/kdeutility.py
index dc61002..ebd12f5 100755
--- a/app_templates/kdeutility/src/kdeutility.py
+++ b/app_templates/kdeutility/src/kdeutility.py
@@ -34,18 +34,18 @@ class KDEUtilityDialog(KDEUtilityDialogUI):
 options = [] # No command line options.
 
 def main():
-    global kapp,version,description,options
+    global tdeApp,version,description,options
 
     aboutdata = TDEAboutData("kdeutility", "KdeUtility", version, description, \
         TDEAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "[email protected]")
     aboutdata.addAuthor("AUTHOR", None, "[email protected]")
     TDECmdLineArgs.init(sys.argv,aboutdata)
     #TDECmdLineArgs.addCmdLineOptions(options)
-    kapp = TDEApplication()
+    tdeApp = TDEApplication()
     
     dialog = KDEUtilityDialog()
-    kapp.setMainWidget(dialog)
+    tdeApp.setMainWidget(dialog)
     dialog.show()
 
-    return kapp.exec_loop()
+    return tdeApp.exec_loop()
 main()
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 355e61c..dc1aec6 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -562,7 +562,7 @@ or toolbar.
 <sect1 id="app-template-application">
 <title>TDE application template</title>
 <para>
-The <filename>kdeapp</filename> application template is an application with
+The <filename>tdeapp</filename> application template is an application with
 menubar, toolbar and separated document and view classes. The menubar and toolbars
 are defined using XML.
 </para>
diff --git a/src/tdedistutils.py b/src/tdedistutils.py
index 8487708..2c46a82 100644
--- a/src/tdedistutils.py
+++ b/src/tdedistutils.py
@@ -216,9 +216,9 @@ class InstallKDE(install):
                 self.install_application_data = os.path.join(self.kde_prefix,'share/apps',self.distribution.metadata.name)
             else:
                 self.announce("Detecting TDE application directory...")
-                kdeappdir = ask_kde_config('--install data --expandvars').strip()
+                tdeappdir = ask_kde_config('--install data --expandvars').strip()
                 self.announce("  ...TDE application directory is %s" % self.install_application_data)
-                self.install_application_data = os.path.join(kdeappdir,self.distribution.metadata.name)
+                self.install_application_data = os.path.join(tdeappdir,self.distribution.metadata.name)
 
         if self.install_messages is None:
             if self.kde_prefix is not None: