Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 17 insertions, 17 deletions

diff --git a/kplayer/kplayernodeaction.cpp b/kplayer/kplayernodeaction.cpp
index fce7941..a58089d 100644
--- a/kplayer/kplayernodeaction.cpp
+++ b/kplayer/kplayernodeaction.cpp
@@ -54,12 +54,12 @@ void KPlayerNodeActionList::initialize (const KURL& url)
     node() -> reference();
     populateNode();
     updateActions();
-    connect (node(), SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)),
-      SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)));
-    connect (node(), SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)),
-      SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&)));
-    connect (node(), SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)),
-      SLOT (updated (KPlayerContainerNode*, KPlayerNode*)));
+    connect (node(), TQ_SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)),
+      TQ_SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)));
+    connect (node(), TQ_SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)),
+      TQ_SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&)));
+    connect (node(), TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)),
+      TQ_SLOT (updated (KPlayerContainerNode*, KPlayerNode*)));
   }
 }
 
@@ -145,7 +145,7 @@ TDEAction* KPlayerNodeActionList::createAction (KPlayerNode* node)
 #ifdef DEBUG_KPLAYER_NODEACTION
   kdDebugTime() << " Name   " << name << "\n";
 #endif
-  TDEAction* action = new TDEAction (m_text.arg (name), 0, this, SLOT (actionActivated()), node);
+  TDEAction* action = new TDEAction (m_text.arg (name), 0, this, TQ_SLOT (actionActivated()), node);
   updateAction (action);
   return action;
 }
@@ -285,7 +285,7 @@ TDEAction* KPlayerDevicesActionList::createAction (KPlayerNode* node)
     (KPlayerDeviceActionMenu*) new KPlayerDiskActionMenu (device);
   updateAction (action);
   action -> setup();
-  connect (action, SIGNAL (activated (KPlayerNode*)), parent(), SLOT (play (KPlayerNode*)));
+  connect (action, TQ_SIGNAL (activated (KPlayerNode*)), parent(), TQ_SLOT (play (KPlayerNode*)));
   return action;
 }
 
@@ -299,12 +299,12 @@ KPlayerDeviceActionMenu::KPlayerDeviceActionMenu (KPlayerDeviceNode* device)
   setDelayed (false);
   m_populated = false;
   device -> reference();
-  connect (device, SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)),
-    SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)));
-  connect (device, SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)),
-    SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&)));
-  connect (device, SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)),
-    SLOT (updated (KPlayerContainerNode*, KPlayerNode*)));
+  connect (device, TQ_SIGNAL (nodesAdded (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)),
+    TQ_SLOT (added (KPlayerContainerNode*, const KPlayerNodeList&, KPlayerNode*)));
+  connect (device, TQ_SIGNAL (nodesRemoved (KPlayerContainerNode*, const KPlayerNodeList&)),
+    TQ_SLOT (removed (KPlayerContainerNode*, const KPlayerNodeList&)));
+  connect (device, TQ_SIGNAL (nodeUpdated (KPlayerContainerNode*, KPlayerNode*)),
+    TQ_SLOT (updated (KPlayerContainerNode*, KPlayerNode*)));
 }
 
 KPlayerDeviceActionMenu::~KPlayerDeviceActionMenu()
@@ -372,7 +372,7 @@ void KPlayerDeviceActionMenu::updateActions (void)
       ++ actit;
     }
     if ( ! action )
-      action = new TDEAction (i18n("Play %1").arg (node -> name()), 0, this, SLOT (play()), node);
+      action = new TDEAction (i18n("Play %1").arg (node -> name()), 0, this, TQ_SLOT (play()), node);
     m_actions.append (action);
     ++ iterator;
   }
@@ -435,8 +435,8 @@ KPlayerDiskActionMenu::KPlayerDiskActionMenu (KPlayerDeviceNode* device)
   kdDebugTime() << " URL    " << device -> url().url() << "\n";
 #endif
   m_play_disk = false;
-  m_load_action = new TDEAction (i18n("&Load Disk"), 0, this, SLOT (loadDisk()), device);
-  m_play_action = new TDEAction (i18n("&Play Disk"), 0, this, SLOT (playDisk()), device);
+  m_load_action = new TDEAction (i18n("&Load Disk"), 0, this, TQ_SLOT (loadDisk()), device);
+  m_play_action = new TDEAction (i18n("&Play Disk"), 0, this, TQ_SLOT (playDisk()), device);
 }
 
 KPlayerDiskActionMenu::~KPlayerDiskActionMenu()