Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit ba3b5b77e1a430dc7197df20872ba46ce2fb6fa7)

1 files changed, 26 insertions, 26 deletions

diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index a6ed43f03..e8309ea4c 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -94,11 +94,11 @@ class UIServerSystemTray:public KSystemTray
          :KSystemTray(uis)
       {
          TDEPopupMenu* pop= contextMenu();
-         pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure()));
-         pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
+         pop->insertItem(i18n("Settings..."), uis, TQ_SLOT(slotConfigure()));
+         pop->insertItem(i18n("Remove"), uis, TQ_SLOT(slotRemoveSystemTrayIcon()));
          setPixmap(loadIcon("document-save"));
          //actionCollection()->action("file_quit")->setEnabled(true);
-         KStdAction::quit(uis, TQT_SLOT(slotQuit()), actionCollection());
+         KStdAction::quit(uis, TQ_SLOT(slotQuit()), actionCollection());
       }
 };
 
@@ -193,8 +193,8 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString
   // create dialog, but don't show it
   defaultProgress = new TDEIO::DefaultProgress( false );
   defaultProgress->setOnlyClean( true );
-  connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) );
-  connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) );
+  connect ( defaultProgress, TQ_SIGNAL( stopped() ), this, TQ_SLOT( slotCanceled() ) );
+  connect ( &m_showTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(slotShowDefaultProgress()) );
 
   if ( showDefault ) {
     m_showTimer.start( 500, true );
@@ -478,7 +478,7 @@ ListProgress::ListProgress (TQWidget *parent, const char *name)
   //used for squeezing the text in local file name and url
   m_squeezer=new KSqueezedTextLabel(this);
   m_squeezer->hide();
-  connect(header(),TQT_SIGNAL(sizeChange(int,int,int)),this,TQT_SLOT(columnWidthChanged(int)));
+  connect(header(),TQ_SIGNAL(sizeChange(int,int,int)),this,TQ_SLOT(columnWidthChanged(int)));
 }
 
 
@@ -595,11 +595,11 @@ UIServer::UIServer()
 
   // setup toolbar
   toolBar()->insertButton("edit-delete", TOOL_CANCEL,
-                          TQT_SIGNAL(clicked()), this,
-                          TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
+                          TQ_SIGNAL(clicked()), this,
+                          TQ_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
   toolBar()->insertButton("configure", TOOL_CONFIGURE,
-                          TQT_SIGNAL(clicked()), this,
-                          TQT_SLOT(slotConfigure()), true, i18n("Settings..."));
+                          TQ_SIGNAL(clicked()), this,
+                          TQ_SLOT(slotConfigure()), true, i18n("Settings..."));
 
   toolBar()->setBarPos( TDEToolBar::Left );
 
@@ -614,18 +614,18 @@ UIServer::UIServer()
 
   setCentralWidget( listProgress );
 
-  connect( listProgress, TQT_SIGNAL( selectionChanged() ),
-           TQT_SLOT( slotSelection() ) );
-  connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ),
-           TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
-  connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
-           TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
+  connect( listProgress, TQ_SIGNAL( selectionChanged() ),
+           TQ_SLOT( slotSelection() ) );
+  connect( listProgress, TQ_SIGNAL( executed( TQListViewItem* ) ),
+           TQ_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
+  connect( listProgress, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
+           TQ_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
 
 
   // setup animation timer
   updateTimer = new TQTimer( this );
-  connect( updateTimer, TQT_SIGNAL( timeout() ),
-           TQT_SLOT( slotUpdate() ) );
+  connect( updateTimer, TQ_SIGNAL( timeout() ),
+           TQ_SLOT( slotUpdate() ) );
   m_bUpdateNewJob=false;
 
   setCaption(i18n("Progress Dialog"));
@@ -675,10 +675,10 @@ void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQP
    if (m_contextMenu==0)
    {
       m_contextMenu=new TQPopupMenu(this);
-      m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQT_SLOT(slotCancelCurrent()));
-//      m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQT_SLOT(slotToggleDefaultProgress()));
+      m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQ_SLOT(slotCancelCurrent()));
+//      m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQ_SLOT(slotToggleDefaultProgress()));
       m_contextMenu->insertSeparator();
-      m_contextMenu->insertItem(i18n("Settings..."), this, TQT_SLOT(slotConfigure()));
+      m_contextMenu->insertItem(i18n("Settings..."), this, TQ_SLOT(slotConfigure()));
    }
    if ( item )
        item->setSelected( true );
@@ -707,9 +707,9 @@ void UIServer::slotConfigure()
    if (m_configDialog==0)
    {
       m_configDialog=new ProgressConfigDialog(0);
-//      connect(m_configDialog,TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancelConfig()));
-      connect(m_configDialog,TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotApplyConfig()));
-      connect(m_configDialog,TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApplyConfig()));
+//      connect(m_configDialog,TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancelConfig()));
+      connect(m_configDialog,TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotApplyConfig()));
+      connect(m_configDialog,TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApplyConfig()));
    }
    m_configDialog->m_showSystemTrayCb->setChecked(m_showSystemTray);
    m_configDialog->m_keepOpenCb->setChecked(m_keepListOpen);
@@ -760,8 +760,8 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress )
   bool show = !m_bShowList && showProgress;
 
   ProgressItem *item = new ProgressItem( listProgress, it.current(), observerAppId, s_jobId, show );
-  connect( item, TQT_SIGNAL( jobCanceled( ProgressItem* ) ),
-           TQT_SLOT( slotJobCanceled( ProgressItem* ) ) );
+  connect( item, TQ_SIGNAL( jobCanceled( ProgressItem* ) ),
+           TQ_SLOT( slotJobCanceled( ProgressItem* ) ) );
 
   if ( m_bShowList && !updateTimer->isActive() )
     updateTimer->start( 1000 );