Rename old tq methods that no longer need a unique name

4 files changed, 35 insertions, 35 deletions

diff --git a/amarok/src/scripts/databasescripts/databaseScripts.rb b/amarok/src/scripts/databasescripts/databaseScripts.rb
index 18db654f..99bdf361 100644
--- a/amarok/src/scripts/databasescripts/databaseScripts.rb
+++ b/amarok/src/scripts/databasescripts/databaseScripts.rb
@@ -79,7 +79,7 @@ class DatabaseScriptChooser < Qt::Dialog
         @Form1Layout.addLayout(@tqlayout3, 0, 0)
         languageChange()
 
-        resize( Qt::Size.new(356, 137).expandedTo(tqminimumSizeHint()) )
+        resize( Qt::Size.new(356, 137).expandedTo(minimumSizeHint()) )
         clearWState( WState_Polished )
     end
 
diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui b/amarok/src/scripts/graphequalizer/eqdialog.ui
index af027a99..11ec9e57 100644
--- a/amarok/src/scripts/graphequalizer/eqdialog.ui
+++ b/amarok/src/scripts/graphequalizer/eqdialog.ui
@@ -94,7 +94,7 @@
                                     <property name="sizeType">
                                         <enum>Maximum</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -125,7 +125,7 @@
                                     <property name="sizeType">
                                         <enum>Maximum</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -148,13 +148,13 @@
                     <property name="name">
                         <cstring>canvasView</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>404</width>
                             <height>200</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>404</width>
                             <height>200</height>
diff --git a/amarok/src/scripts/webcontrol/RequestHandler.py b/amarok/src/scripts/webcontrol/RequestHandler.py
index cf6e87fe..8519ef35 100644
--- a/amarok/src/scripts/webcontrol/RequestHandler.py
+++ b/amarok/src/scripts/webcontrol/RequestHandler.py
@@ -28,11 +28,11 @@ PLIST = None
 REQ_IDS = {}
 
 #
-# Holding current AmaroktqStatus. A bunch of init_XXX functions in
+# Holding current AmarokStatus. A bunch of init_XXX functions in
 # order to begin dcop requests as early as possible to avoid too
 # much latency
 #
-class AmaroktqStatus:
+class AmarokStatus:
 
     EngineEmpty = 1
     EngineIdle = 2
@@ -90,19 +90,19 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
     our server."""
     
     def _amarokPlay(self):
-        AmaroktqStatus.playState = AmaroktqStatus.EnginePlay
+        AmarokStatus.playState = AmarokStatus.EnginePlay
         Globals._dcopCallPlayer("play")
 
     def _amarokPause(self):
-        AmaroktqStatus.playState = AmaroktqStatus.EnginePause
+        AmarokStatus.playState = AmarokStatus.EnginePause
         Globals._dcopCallPlayer("pause")
 
     def _amarokNext(self):
         Globals._dcopCallPlayer("next")
 
     def _amarokGoto(self,index):
-        AmaroktqStatus.playState = AmaroktqStatus.EnginePlay
-        AmaroktqStatus.currentTrackIndex = int(index)
+        AmarokStatus.playState = AmarokStatus.EnginePlay
+        AmarokStatus.currentTrackIndex = int(index)
         Globals._dcopCallPlaylistArg("playByIndex",index)
 
     def _amarokPrev(self):
@@ -110,7 +110,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
 
     def _amarokStop(self):
         Globals._dcopCallPlayer("stop")
-        AmaroktqStatus.playState = AmaroktqStatus.EngineStop
+        AmarokStatus.playState = AmarokStatus.EngineStop
         
     def _amarokSetVolume(self, val):
         Globals._dcopCallPlayerArg("setVolume",val)
@@ -165,8 +165,8 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
                 self._amarokSetVolume(qmap["value"])
         return 1
     
-    def _amaroktqStatus(self):
-        status = AmaroktqStatus()
+    def _amarokStatus(self):
+        status = AmarokStatus()
         return status
         
     def _sendFile(self, path):
@@ -219,7 +219,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         qmap = self._parseQueryVars()
         session_id, last_req_id = self._getSessionInfo(qmap)
             
-        if AmaroktqStatus.allowControl and self._handleAction(qmap):
+        if AmarokStatus.allowControl and self._handleAction(qmap):
             last_req_id = last_req_id + 1
             REQ_IDS[session_id] = last_req_id
         
@@ -242,7 +242,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
             self.end_headers()
             self._sendFile(self.path)
         else:
-            status = self._amaroktqStatus()
+            status = self._amarokStatus()
             status.dcop_volume.init()
             status.dcop_trackcurrenttime.init()
             status.dcop_tracktotaltime.init()
diff --git a/amarok/src/scripts/webcontrol/WebControl.py b/amarok/src/scripts/webcontrol/WebControl.py
index a6eb91cc..e172a157 100755
--- a/amarok/src/scripts/webcontrol/WebControl.py
+++ b/amarok/src/scripts/webcontrol/WebControl.py
@@ -60,8 +60,8 @@ class ConfigDialog( QDialog ):
 
         self.config = ConfigParser.ConfigParser()
 
-        allowControl = RequestHandler.AmaroktqStatus.allowControl
-	publish = RequestHandler.AmaroktqStatus.publish
+        allowControl = RequestHandler.AmarokStatus.allowControl
+	publish = RequestHandler.AmarokStatus.publish
         try:
             config = ConfigParser.ConfigParser()
             config.read( "webcontrolrc" )
@@ -159,8 +159,8 @@ class WebControl( QApplication ):
         config.read( "webcontrolrc" )
 
         try:
-            RequestHandler.AmaroktqStatus.allowControl = string.find(config.get( "General", "allowcontrol" ), "True") >= 0
-            RequestHandler.AmaroktqStatus.publish = string.find(config.get( "General", "publish" ), "True") >= 0
+            RequestHandler.AmarokStatus.allowControl = string.find(config.get( "General", "allowcontrol" ), "True") >= 0
+            RequestHandler.AmarokStatus.publish = string.find(config.get( "General", "publish" ), "True") >= 0
         except:
             debug( "No config file found, using defaults." )
         
@@ -170,7 +170,7 @@ class WebControl( QApplication ):
         self.zeroconfPublishing()
 
     def zeroconfPublishing( self ):
-        if RequestHandler.AmaroktqStatus.publish:
+        if RequestHandler.AmarokStatus.publish:
             if not publisher.active:
                 threading.Thread(target = publisher.run).start()
         else:
@@ -234,32 +234,32 @@ class WebControl( QApplication ):
 
     def engineStatePlay( self ):
         """ Called when Engine state changes to Play """
-        RequestHandler.AmaroktqStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime")
-        RequestHandler.AmaroktqStatus.dcop_trackcurrenttime.result()
-        RequestHandler.AmaroktqStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime")
-        RequestHandler.AmaroktqStatus.dcop_tracktotaltime.result()
-        RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EnginePlay
+        RequestHandler.AmarokStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime")
+        RequestHandler.AmarokStatus.dcop_trackcurrenttime.result()
+        RequestHandler.AmarokStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime")
+        RequestHandler.AmarokStatus.dcop_tracktotaltime.result()
+        RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EnginePlay
 
     def engineStateIdle( self ):
         """ Called when Engine state changes to Idle """
-        RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EngineIdle
+        RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EngineIdle
 
     def engineStatePause( self ):
         """ Called when Engine state changes to Pause """
-        RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EnginePause
+        RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EnginePause
 
     def engineStateEmpty( self ):
         """ Called when Engine state changes to Empty """
-        RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EngineEmpty
+        RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EngineEmpty
 
     def trackChange( self ):
         """ Called when a new track starts """
-        RequestHandler.AmaroktqStatus.dcop_trackcurrentindex = Globals.PlaylistDcop("getActiveIndex")
-        RequestHandler.AmaroktqStatus.dcop_trackcurrentindex.result()
-        RequestHandler.AmaroktqStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime")
-        RequestHandler.AmaroktqStatus.dcop_trackcurrenttime.result()
-        RequestHandler.AmaroktqStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime")
-        RequestHandler.AmaroktqStatus.dcop_tracktotaltime.result()
+        RequestHandler.AmarokStatus.dcop_trackcurrentindex = Globals.PlaylistDcop("getActiveIndex")
+        RequestHandler.AmarokStatus.dcop_trackcurrentindex.result()
+        RequestHandler.AmarokStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime")
+        RequestHandler.AmarokStatus.dcop_trackcurrenttime.result()
+        RequestHandler.AmarokStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime")
+        RequestHandler.AmarokStatus.dcop_tracktotaltime.result()