Use tdeAppHEADmaster

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

4 files changed, 25 insertions, 25 deletions

diff --git a/mountconfig/fuser.py b/mountconfig/fuser.py
index e91bd7b..4687ac0 100644
--- a/mountconfig/fuser.py
+++ b/mountconfig/fuser.py
@@ -111,13 +111,13 @@ class FileProcess(TQListViewItem):
 class FUser(FUserUI):
     """ done() / result() return 0 on successful umount and 1 if cancelled. """
 
-    def __init__(self,device,parentdialog=None,lsof_bin='/usr/sbin/lsof',kapp=None):
+    def __init__(self,device,parentdialog=None,lsof_bin='/usr/sbin/lsof',tdeApp=None):
         FUserUI.__init__(self,parentdialog,name = None,modal = 0,fl = 0)
         self.device = device
         self.fileprocesses = []
         self.lsof_bin = '/usr/sbin/lsof'
         self.setLsof(lsof_bin)
-        self.setApp(kapp)
+        self.setApp(tdeApp)
 
         self.processlist.clear()
         self.processhidden = False
@@ -170,9 +170,9 @@ class FUser(FUserUI):
 
     def refreshProcesslist(self):
         """ Read lsof output and add the processdescriptors to the listview. """
-        kapp = self.app
+        tdeApp = self.app
 
-        kapp.setOverrideCursorT(TQCursor(TQt.BusyCursor))
+        tdeApp.setOverrideCursorT(TQCursor(TQt.BusyCursor))
 
         self.processlist.clear()
         rc, output = SimpleCommandRunner().run([self.lsof_bin,'-FpcLn',self.device],True)
@@ -214,7 +214,7 @@ class FUser(FUserUI):
                 files += 1
                 childproc.fillColumns()
 
-        kapp.restoreOverrideCursor()
+        tdeApp.restoreOverrideCursor()
 
         # Enable / disable buttons which are (in)appropriate.
         self.killallbutton.setEnabled(len(self.realprocesses)!=0)
@@ -289,11 +289,11 @@ if standalone:
     # print args.count()
     # ----------------------------------------------------------------------------
 
-    kapp = TDEApplication()
+    tdeApp = TDEApplication()
     TDEGlobal.iconLoader().addAppDir("guidance")
     fuserapp = FUser(device)
 
-    fuserapp.setApp(kapp)
-    kapp.setMainWidget(fuserapp)
+    fuserapp.setApp(tdeApp)
+    tdeApp.setMainWidget(fuserapp)
     fuserapp.show()
-    kapp.exec_loop()
+    tdeApp.exec_loop()
diff --git a/mountconfig/mountconfig.py b/mountconfig/mountconfig.py
index 4e65ef2..157ed0c 100755
--- a/mountconfig/mountconfig.py
+++ b/mountconfig/mountconfig.py
@@ -401,7 +401,7 @@ class MountEntryExt(object):
         Keyword arguments:
         mount_action - True=enable, False=disable
         """
-        global kapp
+        global tdeApp
         if mount_action:
             msg = i18n("An error occurred while enabling %1.\n\nThe system reported: %2").arg( \
                                                                         self.mountpoint).arg(output)
@@ -439,7 +439,7 @@ class MountEntryExt(object):
                 if in_use:
                     # Start fuser.py which lists open filedescriptors on device and offers to get
                     # rid of them.
-                    fuser = FUser(str(self.mountpoint),None,lsof_bin,kapp)
+                    fuser = FUser(str(self.mountpoint),None,lsof_bin,tdeApp)
                     fuser.exec_loop()
                     in_use_message = ""
                     if fuser.result() != 0:
@@ -453,19 +453,19 @@ class MountEntryExt(object):
 
     ########################################################################
     def _setBusy(self,parentdialog,flag):
-        global kapp
+        global tdeApp
         if flag:
-            kapp.setOverrideCursor( TQCursor(TQt.WaitCursor) )
+            tdeApp.setOverrideCursor( TQCursor(TQt.WaitCursor) )
             parentdialog.setEnabled(False)
 
             # It is necessary to process some of the events in the event queue.
             # Otherwise the user won't see that the window is disabled.
             # ( setEnabled() here above doesn't redraw the window immediately.
             # Redrawing is done via the event queue.)
-            kapp.processEvents()
+            tdeApp.processEvents()
         else:
             parentdialog.setEnabled(True)
-            kapp.restoreOverrideCursor()
+            tdeApp.restoreOverrideCursor()
 
 ############################################################################
 class MountEntryExtCommonUnix(MountEntryExt):
@@ -3281,9 +3281,9 @@ class MountConfigApp(programbase):
 ############################################################################
 # Factory function for KControl
 def create_mountconfig(parent,name):
-    global kapp, microhal
+    global tdeApp, microhal
     microhal = MicroHAL.MicroHAL()
-    kapp = TDEApplication.kApplication()    
+    tdeApp = TDEApplication.tdeApplication()    
     return MountConfigApp(parent, name)
 
 ############################################################################
@@ -3300,6 +3300,6 @@ if standalone:
     TDECmdLineArgs.init(sys.argv,aboutdata)
 
     microhal = MicroHAL.MicroHAL()
-    kapp = TDEApplication()
+    tdeApp = TDEApplication()
     sysvapp = MountConfigApp()
     sysvapp.exec_loop()
diff --git a/serviceconfig/serviceconfig.py b/serviceconfig/serviceconfig.py
index 220a370..6f0f08f 100755
--- a/serviceconfig/serviceconfig.py
+++ b/serviceconfig/serviceconfig.py
@@ -1299,7 +1299,7 @@ class SysVInitApp(programbase):
 
     ########################################################################
     def __checkServiceStatus(self):
-        global kapp
+        global tdeApp
         global progcount
 
         # Put up the progress dialog. (User pacifier).
@@ -1314,7 +1314,7 @@ class SysVInitApp(programbase):
         services.sort(key=lambda x: x.filename)
         dialog.progressBar().setTotalSteps(len(services))
 
-        kapp.processEvents()
+        tdeApp.processEvents()
         self.updatingGUI = True
 
         for item in services:
@@ -1325,7 +1325,7 @@ class SysVInitApp(programbase):
                 if self.selectedservice is item:
                     self.statustext.setText(item.status)
             dialog.progressBar().advance(1)
-            kapp.processEvents()
+            tdeApp.processEvents()
         dialog.setMinimumDuration(2000000000)
         dialog.hide()
         self.updatingGUI = False
@@ -1458,8 +1458,8 @@ class CommandRunner(KDialogBase):
 ############################################################################
 # Factory function for KControl
 def create_serviceconfig(parent,name):
-    global kapp
-    kapp = TDEApplication.kApplication()
+    global tdeApp
+    tdeApp = TDEApplication.tdeApplication()
     return SysVInitApp(parent, name)
 
 ############################################################################
@@ -1476,6 +1476,6 @@ if standalone:
     aboutdata = MakeAboutData()
     TDECmdLineArgs.init(sys.argv,aboutdata)
 
-    kapp = TDEApplication()
+    tdeApp = TDEApplication()
     sysvapp = SysVInitApp()
     sysvapp.exec_loop()
diff --git a/userconfig/userconfig.py b/userconfig/userconfig.py
index 325f0c3..96517f1 100755
--- a/userconfig/userconfig.py
+++ b/userconfig/userconfig.py
@@ -1748,6 +1748,6 @@ if standalone:
 
     TDECmdLineArgs.init(sys.argv,aboutdata)
 
-    kapp = TDEApplication()
+    tdeApp = TDEApplication()
     userconfigapp = UserConfigApp()
     userconfigapp.exec_loop()