Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 63 insertions, 63 deletions

diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index 8ad2ed0..fe669cd 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -203,8 +203,8 @@ void FSView::requestUpdate(Inode* i)
   i->clear();
 
   if (!_sm.scanRunning()) {
-    TQTimer::singleShot(0, this, TQT_SLOT(doUpdate()));
-    TQTimer::singleShot(100, this, TQT_SLOT(doRedraw()));
+    TQTimer::singleShot(0, this, TQ_SLOT(doUpdate()));
+    TQTimer::singleShot(100, this, TQ_SLOT(doRedraw()));
 
     /* start new progress chunk */
     _progressPhase = 1;
@@ -381,8 +381,8 @@ void FSView::addColorItems(TQPopupMenu* popup, int id)
   _colorID = id;
   popup->setCheckable(true);
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(colorActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(colorActivated(int)));
 
   popup->insertItem(i18n("None"),      id);
   popup->insertItem(i18n("Depth"),     id+1);
@@ -458,7 +458,7 @@ void FSView::doRedraw()
     redo = true;
 
   if (redo) {
-    TQTimer::singleShot(500, this, TQT_SLOT(doRedraw()));
+    TQTimer::singleShot(500, this, TQ_SLOT(doRedraw()));
     redrawCounter++;
   }
 }
@@ -532,7 +532,7 @@ void FSView::doUpdate()
   }
 
   if (_sm.scanRunning())
-    TQTimer::singleShot(0, this, TQT_SLOT(doUpdate()));
+    TQTimer::singleShot(0, this, TQ_SLOT(doUpdate()));
   else
     emit completed(_dirsFinished);
 }
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 4f7b592..86f7f16 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -57,8 +57,8 @@ FSJob::FSJob(FSView* v)
   : TDEIO::Job(false)
 {
   _view = v;
-  TQObject::connect(v, TQT_SIGNAL(progress(int,int,const TQString&)),
-                   this, TQT_SLOT(progressSlot(int,int,const TQString&)));
+  TQObject::connect(v, TQ_SIGNAL(progress(int,int,const TQString&)),
+                   this, TQ_SLOT(progressSlot(int,int,const TQString&)));
 }
 
 void FSJob::kill(bool quietly)
@@ -129,40 +129,40 @@ FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName,
 
     TDEAction* action;
     action = new TDEAction( i18n( "&FSView Manual" ), "fsview",
-			TDEShortcut(), this, TQT_SLOT(showHelp()),
+			TDEShortcut(), this, TQ_SLOT(showHelp()),
                         actionCollection(), "help_fsview" );
     action->setToolTip(i18n("Show FSView manual"));
     action->setWhatsThis(i18n("Opens the help browser with the "
 			      "FSView documentation"));
 
-    TQObject::connect (_visMenu->popupMenu(), TQT_SIGNAL (aboutToShow()),
-		      TQT_SLOT (slotShowVisMenu()));
-    TQObject::connect (_areaMenu->popupMenu(), TQT_SIGNAL (aboutToShow()),
-		      TQT_SLOT (slotShowAreaMenu()));
-    TQObject::connect (_depthMenu->popupMenu(), TQT_SIGNAL (aboutToShow()),
-		      TQT_SLOT (slotShowDepthMenu()));
-    TQObject::connect (_colorMenu->popupMenu(), TQT_SIGNAL (aboutToShow()),
-		      TQT_SLOT (slotShowColorMenu()));
+    TQObject::connect (_visMenu->popupMenu(), TQ_SIGNAL (aboutToShow()),
+		      TQ_SLOT (slotShowVisMenu()));
+    TQObject::connect (_areaMenu->popupMenu(), TQ_SIGNAL (aboutToShow()),
+		      TQ_SLOT (slotShowAreaMenu()));
+    TQObject::connect (_depthMenu->popupMenu(), TQ_SIGNAL (aboutToShow()),
+		      TQ_SLOT (slotShowDepthMenu()));
+    TQObject::connect (_colorMenu->popupMenu(), TQ_SIGNAL (aboutToShow()),
+		      TQ_SLOT (slotShowColorMenu()));
 
     slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
     if (kapp)
-      connect( kapp, TQT_SIGNAL( settingsChanged(int) ),
-	       TQT_SLOT( slotSettingsChanged(int) ) );
+      connect( kapp, TQ_SIGNAL( settingsChanged(int) ),
+	       TQ_SLOT( slotSettingsChanged(int) ) );
 
-    TQObject::connect(_view,TQT_SIGNAL(returnPressed(TreeMapItem*)),
-                     _ext,TQT_SLOT(selected(TreeMapItem*)));
-    TQObject::connect(_view,TQT_SIGNAL(selectionChanged()),
-                     _ext,TQT_SLOT(updateActions()));
+    TQObject::connect(_view,TQ_SIGNAL(returnPressed(TreeMapItem*)),
+                     _ext,TQ_SLOT(selected(TreeMapItem*)));
+    TQObject::connect(_view,TQ_SIGNAL(selectionChanged()),
+                     _ext,TQ_SLOT(updateActions()));
     TQObject::connect(_view,
-                     TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)),
+                     TQ_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)),
                      _ext,
-                     TQT_SLOT(contextMenu(TreeMapItem*, const TQPoint&)));
+                     TQ_SLOT(contextMenu(TreeMapItem*, const TQPoint&)));
 
-    TQObject::connect(_view, TQT_SIGNAL(started()), this, TQT_SLOT(startedSlot()));
-    TQObject::connect(_view, TQT_SIGNAL(completed(int)),
-		     this, TQT_SLOT(completedSlot(int)));
+    TQObject::connect(_view, TQ_SIGNAL(started()), this, TQ_SLOT(startedSlot()));
+    TQObject::connect(_view, TQ_SIGNAL(completed(int)),
+		     this, TQ_SLOT(completedSlot(int)));
 
-    TQTimer::singleShot(1, this, TQT_SLOT(showInfo()));
+    TQTimer::singleShot(1, this, TQ_SLOT(showInfo()));
 
     setXMLFile( "fsview_part.rc" );
 }
@@ -180,17 +180,17 @@ void FSViewPart::slotSettingsChanged(int category)
 {
   if (category != TDEApplication::SETTINGS_MOUSE) return;
 
-  TQObject::disconnect(_view,TQT_SIGNAL(clicked(TreeMapItem*)),
-		      _ext,TQT_SLOT(selected(TreeMapItem*)));
-  TQObject::disconnect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)),
-		      _ext,TQT_SLOT(selected(TreeMapItem*)));
+  TQObject::disconnect(_view,TQ_SIGNAL(clicked(TreeMapItem*)),
+		      _ext,TQ_SLOT(selected(TreeMapItem*)));
+  TQObject::disconnect(_view,TQ_SIGNAL(doubleClicked(TreeMapItem*)),
+		      _ext,TQ_SLOT(selected(TreeMapItem*)));
   
   if (TDEGlobalSettings::singleClick())
-    TQObject::connect(_view,TQT_SIGNAL(clicked(TreeMapItem*)),
-		     _ext,TQT_SLOT(selected(TreeMapItem*)));
+    TQObject::connect(_view,TQ_SIGNAL(clicked(TreeMapItem*)),
+		     _ext,TQ_SLOT(selected(TreeMapItem*)));
   else
-    TQObject::connect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)),
-		     _ext,TQT_SLOT(selected(TreeMapItem*)));
+    TQObject::connect(_view,TQ_SIGNAL(doubleClicked(TreeMapItem*)),
+		     _ext,TQ_SLOT(selected(TreeMapItem*)));
 }
 
 void FSViewPart::showInfo()
@@ -331,14 +331,14 @@ void FSViewBrowserExtension::del()
   // - search for the KonqOperations child of _view (name "KonqOperations")
   // - connect to destroyed signal
   KonqOperations* o = (KonqOperations*) _view->child("KonqOperations");
-  if (o) connect(o, TQT_SIGNAL(destroyed()), TQT_SLOT(refresh()));
+  if (o) connect(o, TQ_SIGNAL(destroyed()), TQ_SLOT(refresh()));
 }
 
 void FSViewBrowserExtension::trash()
 {
   KonqOperations::del(_view, KonqOperations::TRASH, _view->selectedUrls());
   KonqOperations* o = (KonqOperations*) _view->child("KonqOperations");
-  if (o) connect(o, TQT_SIGNAL(destroyed()), TQT_SLOT(refresh()));
+  if (o) connect(o, TQ_SIGNAL(destroyed()), TQ_SLOT(refresh()));
 }
 
 void FSViewBrowserExtension::copySelection( bool move )
diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp
index 1f6f268..3beb941 100644
--- a/konq-plugins/fsview/main.cpp
+++ b/konq-plugins/fsview/main.cpp
@@ -40,17 +40,17 @@ int main(int argc, char* argv[])
   // TreeMap Widget as toplevel window
   FSView w(new Inode());
 
-  TQObject::connect(&w,TQT_SIGNAL(clicked(TreeMapItem*)),
-                   &w,TQT_SLOT(selected(TreeMapItem*)));
-  TQObject::connect(&w,TQT_SIGNAL(returnPressed(TreeMapItem*)),
-                   &w,TQT_SLOT(selected(TreeMapItem*)));
+  TQObject::connect(&w,TQ_SIGNAL(clicked(TreeMapItem*)),
+                   &w,TQ_SLOT(selected(TreeMapItem*)));
+  TQObject::connect(&w,TQ_SIGNAL(returnPressed(TreeMapItem*)),
+                   &w,TQ_SLOT(selected(TreeMapItem*)));
   TQObject::connect(&w,
-                   TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)),
-                   &w,TQT_SLOT(contextMenu(TreeMapItem*, const TQPoint&)));
+                   TQ_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)),
+                   &w,TQ_SLOT(contextMenu(TreeMapItem*, const TQPoint&)));
 
   w.setPath(path);
   w.show();
 
-  a.connect( &a, TQT_SIGNAL( lastWindowClosed() ), &w, TQT_SLOT( quit() ) );
+  a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &w, TQ_SLOT( quit() ) );
   return a.exec();
 }
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index 97041a9..bff8641 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -1768,7 +1768,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
 {
   //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl;
 
-  if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
+  if ( receivers( TQ_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
     e->accept();
 
   if ( e->reason() == TQContextMenuEvent::Keyboard ) {
@@ -2774,8 +2774,8 @@ void TreeMapWidget::addSplitDirectionItems(TQPopupMenu* popup, int id)
   _splitID = id;
   popup->setCheckable(true);
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(splitActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(splitActivated(int)));
 
   popup->insertItem(i18n("Recursive Bisection"), id);
   popup->insertItem(i18n("Columns"),         id+1);
@@ -2833,10 +2833,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id)
   TQPopupMenu* bpopup = new TQPopupMenu();
   bpopup->setCheckable(true);
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(visualizationActivated(int)));
-  connect(bpopup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(visualizationActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(visualizationActivated(int)));
+  connect(bpopup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(visualizationActivated(int)));
 
   TQPopupMenu* spopup = new TQPopupMenu();
   addSplitDirectionItems(spopup, id+100);
@@ -2896,8 +2896,8 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id)
     tpopup->setItemChecked(id+7,_attr[f].pos == DrawParams::BottomCenter);
     tpopup->setItemChecked(id+8,_attr[f].pos == DrawParams::BottomRight);
 
-    connect(tpopup, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(visualizationActivated(int)));
+    connect(tpopup, TQ_SIGNAL(activated(int)),
+            this, TQ_SLOT(visualizationActivated(int)));
   }
 }
 
@@ -2921,8 +2921,8 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup,
   _selectionID = id;
   _menuItem = i;
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(selectionActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(selectionActivated(int)));
 
   while (i) {
     TQString name = i->text(0);
@@ -2952,8 +2952,8 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
 {
   _fieldStopID = id;
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(fieldStopActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(fieldStopActivated(int)));
 
   popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id);
   popup->setItemChecked(id, fieldStop(0).isEmpty());
@@ -3002,8 +3002,8 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
   _areaStopID = id;
   _menuItem = i;
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(areaStopActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(areaStopActivated(int)));
 
   bool foundArea = false;
 
@@ -3067,8 +3067,8 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
   _depthStopID = id;
   _menuItem = i;
 
-  connect(popup, TQT_SIGNAL(activated(int)),
-          this, TQT_SLOT(depthStopActivated(int)));
+  connect(popup, TQ_SIGNAL(activated(int)),
+          this, TQ_SLOT(depthStopActivated(int)));
 
   bool foundDepth = false;