Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

24 files changed, 128 insertions, 128 deletions

diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp
index b7b9b4d..ee601c2 100644
--- a/ksim/generalprefs.cpp
+++ b/ksim/generalprefs.cpp
@@ -174,21 +174,21 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name)
   m_uptimeCombo->insertItem(i18n("%dd %h:%m"));
   m_uptimeCombo->insertItem(i18n("Uptime: %h:%m:%s"));
   connect(m_uptimeCombo,
-     TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
-     TQT_SLOT(uptimeContextMenu(TQPopupMenu *)));
+     TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
+     TQ_SLOT(uptimeContextMenu(TQPopupMenu *)));
 
   m_uptimeAdd = new TQPushButton(this);
   m_uptimeAdd->setPixmap(SmallIcon("go-down"));
-  connect(m_uptimeAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertUptimeItem()));
+  connect(m_uptimeAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertUptimeItem()));
   TQToolTip::add(m_uptimeAdd, i18n("Insert item"));
 
   m_uptimeCheck = new TQCheckBox(this);
   m_uptimeCheck->setText(i18n("Show uptime"));
   m_uptimeCheck->setChecked(true);
-  connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)),
-     m_uptimeCombo, TQT_SLOT(setEnabled(bool)));
-  connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)),
-     m_uptimeAdd, TQT_SLOT(setEnabled(bool)));
+  connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)),
+     m_uptimeCombo, TQ_SLOT(setEnabled(bool)));
+  connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)),
+     m_uptimeAdd, TQ_SLOT(setEnabled(bool)));
   m_mainLayout->addWidget(m_uptimeCheck);
 
   m_subLayout = new TQHBoxLayout;
@@ -273,9 +273,9 @@ void KSim::UptimePrefs::uptimeContextMenu(TQPopupMenu *menu)
 {
   menu->insertSeparator();
   menu->insertItem(m_addIcon, i18n("Insert Item"),
-     this, TQT_SLOT(insertUptimeItem()));
+     this, TQ_SLOT(insertUptimeItem()));
   menu->insertItem(m_removeIcon, i18n("Remove Item"),
-     this, TQT_SLOT(removeUptimeItem()));
+     this, TQ_SLOT(removeUptimeItem()));
 }
 
 void KSim::UptimePrefs::insertUptimeItem()
@@ -310,21 +310,21 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name)
   //m_memCombo->insertItem(i18n("%tM - %fM free"));
   //m_memCombo->insertItem(i18n("%tM - %uM used"));
   connect(m_memCombo,
-     TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
-     TQT_SLOT(memoryContextMenu(TQPopupMenu *)));
+     TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
+     TQ_SLOT(memoryContextMenu(TQPopupMenu *)));
 
   m_memoryAdd = new TQPushButton(this);
   m_memoryAdd->setPixmap(SmallIcon("go-down"));
-  connect(m_memoryAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertMemoryItem()));
+  connect(m_memoryAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertMemoryItem()));
   TQToolTip::add(m_memoryAdd, i18n("Insert item"));
 
   m_memCheck = new TQCheckBox(this);
   m_memCheck->setText(i18n("Show memory and free memory"));
   m_memCheck->setChecked(false);
-  connect(m_memCheck, TQT_SIGNAL(toggled(bool)),
-     m_memCombo, TQT_SLOT(setEnabled(bool)));
-  connect(m_memCheck, TQT_SIGNAL(toggled(bool)),
-     m_memoryAdd, TQT_SLOT(setEnabled(bool)));
+  connect(m_memCheck, TQ_SIGNAL(toggled(bool)),
+     m_memCombo, TQ_SLOT(setEnabled(bool)));
+  connect(m_memCheck, TQ_SIGNAL(toggled(bool)),
+     m_memoryAdd, TQ_SLOT(setEnabled(bool)));
   m_mainLayout->addWidget(m_memCheck);
 
   m_subLayout = new TQHBoxLayout;
@@ -421,9 +421,9 @@ void KSim::MemoryPrefs::memoryContextMenu(TQPopupMenu *menu)
 {
   menu->insertSeparator();
   menu->insertItem(m_addIcon, i18n("Insert Item"),
-     this, TQT_SLOT(insertMemoryItem()));
+     this, TQ_SLOT(insertMemoryItem()));
   menu->insertItem(m_removeIcon, i18n("Remove Item"),
-     this, TQT_SLOT(removeMemoryItem()));
+     this, TQ_SLOT(removeMemoryItem()));
 }
 
 void KSim::MemoryPrefs::insertMemoryItem()
@@ -464,20 +464,20 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name)
   //m_swapCombo->insertItem(i18n("%tM - %uM used"));
   
   connect(m_swapCombo,
-     TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
-     TQT_SLOT(swapContextMenu(TQPopupMenu *)));
+     TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)),
+     TQ_SLOT(swapContextMenu(TQPopupMenu *)));
 
   m_swapAdd = new TQPushButton(this);
   m_swapAdd->setPixmap(SmallIcon("go-down"));
-  connect(m_swapAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertSwapItem()));
+  connect(m_swapAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertSwapItem()));
   TQToolTip::add(m_swapAdd, i18n("Insert item"));
 
   m_subLayout = new TQHBoxLayout;
   m_subLayout->setSpacing(6);
-  connect(m_swapCheck, TQT_SIGNAL(toggled(bool)),
-     m_swapCombo, TQT_SLOT(setEnabled(bool)));
-  connect(m_swapCheck, TQT_SIGNAL(toggled(bool)),
-     m_swapAdd, TQT_SLOT(setEnabled(bool)));
+  connect(m_swapCheck, TQ_SIGNAL(toggled(bool)),
+     m_swapCombo, TQ_SLOT(setEnabled(bool)));
+  connect(m_swapCheck, TQ_SIGNAL(toggled(bool)),
+     m_swapAdd, TQ_SLOT(setEnabled(bool)));
 
   m_swapFormat = new TQLabel(this);
   m_swapFormat->setText(i18n("Swap format:"));
@@ -553,8 +553,8 @@ void KSim::SwapPrefs::readConfig(KSim::Config *config)
 void KSim::SwapPrefs::swapContextMenu(TQPopupMenu *menu)
 {
   menu->insertSeparator();
-  menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQT_SLOT(insertSwapItem()));
-  menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQT_SLOT(removeSwapItem()));
+  menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQ_SLOT(insertSwapItem()));
+  menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQ_SLOT(removeSwapItem()));
 }
 
 void KSim::SwapPrefs::insertSwapItem()
diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp
index 746c810..b5600db 100644
--- a/ksim/ksimpref.cpp
+++ b/ksim/ksimpref.cpp
@@ -91,10 +91,10 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config,
      i18n("Theme Selector"), BarIcon("folder_image", TDEIcon::SizeSmall));
   m_themePage = new KSim::ThemePrefs(theme);
 
-  connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(savePrefs()));
-  connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(closePrefs()));
-  connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(loadPluginConfig()));
-  connect(parent, TQT_SIGNAL(reload()), TQT_SLOT(reload()));
+  connect(this, TQ_SIGNAL(applyClicked()), TQ_SLOT(savePrefs()));
+  connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(closePrefs()));
+  connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(loadPluginConfig()));
+  connect(parent, TQ_SIGNAL(reload()), TQ_SLOT(reload()));
 
   KSim::PluginList::ConstIterator it;
   const KSim::PluginList &pluginList = KSim::PluginLoader::self().pluginList();
@@ -164,8 +164,8 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin)
   plugin.configPage()->readConfig();
 
 // TODO: implement this correctly one day
-//  connect (info.configPage(), TQT_SIGNAL(pageChanged()),
-//     this, TQT_SLOT(enableButtons()));
+//  connect (info.configPage(), TQ_SIGNAL(pageChanged()),
+//     this, TQ_SLOT(enableButtons()));
 }
 
 void KSim::ConfigDialog::savePrefs()
diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp
index 1f204b7..e6b58e8 100644
--- a/ksim/ksimsysinfo.cpp
+++ b/ksim/ksimsysinfo.cpp
@@ -55,10 +55,10 @@ KSim::Sysinfo::Sysinfo(KSim::Config *config,
   //m_procsLabel = 0L;
 
   m_timer = new TQTimer(this);
-  connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(clockUptimeUpdate()));
+  connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(clockUptimeUpdate()));
 
   m_sysTimer = new TQTimer(this);
-  connect(m_sysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(sysUpdate()));
+  connect(m_sysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(sysUpdate()));
 
   createView();
 }
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index 21b4fa6..91fd84c 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -140,8 +140,8 @@ KSim::MainView::MainView(TDEConfig *config,
   m_sizeLayout->addWidget(m_rightFrame);
 
   connect(&KSim::PluginLoader::self(),
-     TQT_SIGNAL(pluginLoaded(const KSim::Plugin &)),
-     this, TQT_SLOT(addMonitor(const KSim::Plugin &)));
+     TQ_SIGNAL(pluginLoaded(const KSim::Plugin &)),
+     this, TQ_SLOT(addMonitor(const KSim::Plugin &)));
 
   KSim::ThemeLoader::self().themeColours(this);
 
@@ -150,7 +150,7 @@ KSim::MainView::MainView(TDEConfig *config,
     addPlugins();
   }
   
-  connect(&m_maskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView()));
+  connect(&m_maskTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMaskMainView()));
 }
 
 KSim::MainView::~MainView()
@@ -371,8 +371,8 @@ void KSim::MainView::addMonitor(const KSim::Plugin &plugin)
 //  kdDebug(2003) << "m_oldLocation: " << m_oldLocation << endl;
 //  kdDebug(2003) << "location: " << location << endl;
   m_pluginLayout->addWidget(plugin.view());
-  connect(plugin.view(), TQT_SIGNAL(runCommand(const TQCString &)),
-     TQT_SLOT(runCommand(const TQCString &)));
+  connect(plugin.view(), TQ_SIGNAL(runCommand(const TQCString &)),
+     TQ_SLOT(runCommand(const TQCString &)));
 
 //  if (location > m_oldLocation)
 //    m_oldLocation = location;
@@ -393,8 +393,8 @@ void KSim::MainView::preferences()
 {
   if (m_prefDialog == 0L) {
     m_prefDialog = new KSim::ConfigDialog(m_config, this, "m_prefDialog");
-    connect(m_prefDialog, TQT_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)),
-       this, TQT_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &)));
+    connect(m_prefDialog, TQ_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)),
+       this, TQ_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &)));
   }
 
   m_prefDialog->exec();
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index 99eb9c8..8f07f30 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -49,8 +49,8 @@ class KSim::Chart::Timer
         tqAddPostRoutine(cleanup);
       }
 
-      TQObject::connect(m_timer, TQT_SIGNAL(timeout()),
-         chart, TQT_SLOT(updateDisplay()));
+      TQObject::connect(m_timer, TQ_SIGNAL(timeout()),
+         chart, TQ_SLOT(updateDisplay()));
     }
 
     static void disconnect(KSim::Chart *chart)
@@ -58,8 +58,8 @@ class KSim::Chart::Timer
       if (!m_timer)
         return;
 
-      TQObject::disconnect(m_timer, TQT_SIGNAL(timeout()),
-         chart, TQT_SLOT(updateDisplay()));
+      TQObject::disconnect(m_timer, TQ_SIGNAL(timeout()),
+         chart, TQ_SLOT(updateDisplay()));
     }
 
   private:
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index 7ef24b2..150a2ba 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -123,7 +123,7 @@ KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name)
   d->parent = parent;
   d->popupMenu = new TQPopupMenu(this);
   d->popupMenu->insertItem(i18n("About"), this,
-     TQT_SLOT(showAbout()), 0, -1, 0);
+     TQ_SLOT(showAbout()), 0, -1, 0);
 
   if (parent && !parent->configFileName().isEmpty())
     d->config = new TDEConfig(parent->configFileName() + "rc");
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index 68b2b90..68d720b 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -126,7 +126,7 @@ CpuView::CpuView(KSim::PluginObject *parent, const char *name)
   addDisplay();
 
   m_timer = new TQTimer(this);
-  connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateView()));
+  connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateView()));
   m_timer->start(CPU_SPEED);
   updateView();
 }
@@ -372,8 +372,8 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
   m_listView->addColumn(i18n("Chart Format"));
   m_listView->setAllColumnsShowFocus(true);
   m_listView->setSelectionMode(TQListView::Single);
-  connect( m_listView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-     TQT_SLOT( modify( TQListViewItem * ) ) );
+  connect( m_listView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+     TQ_SLOT( modify( TQListViewItem * ) ) );
 
   mainLayout->addWidget( m_listView );
 
@@ -386,7 +386,7 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
 
   m_modify = new TQPushButton( this );
   m_modify->setText( i18n( "Modify..." ) );
-  connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) );
+  connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) );
   layout->addWidget( m_modify );
   mainLayout->addLayout( layout );
 
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index d3a3827..fe278b5 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -126,7 +126,7 @@ DiskView::DiskView(KSim::PluginObject *parent, const char *name)
   init();
 
   m_timer = new TQTimer(this);
-  connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateDisplay()));
+  connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateDisplay()));
   m_timer->start(DISK_SPEED);
   updateDisplay();
 }
@@ -491,12 +491,12 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name)
 
   m_add = new TQPushButton(this);
   m_add->setText(i18n("Add..."));
-  connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem()));
+  connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(addItem()));
   layout->addWidget(m_add);
 
   m_remove = new TQPushButton(this);
   m_remove->setText(i18n("Remove"));
-  connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem()));
+  connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem()));
   layout->addWidget(m_remove);
   m_layout->addLayout(layout);
 
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index 4a63e04..21aebff 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -200,11 +200,11 @@ void FilesystemWidget::createProcess(const TQString &command, const TQString &po
 {
   m_process = new TDEProcess();
   connect(m_process,
-     TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-     TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
+     TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+     TQ_SLOT(receivedStderr(TDEProcess *, char *, int)));
   connect(m_process,
-     TQT_SIGNAL(processExited(TDEProcess *)),
-     TQT_SLOT(processExited(TDEProcess *)));
+     TQ_SIGNAL(processExited(TDEProcess *)),
+     TQ_SLOT(processExited(TDEProcess *)));
 
   (*m_process) << command << point;
   void(m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr));
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 0a436ed..262ae93 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -100,7 +100,7 @@ Fsystem::Fsystem(KSim::PluginObject *parent, const char *name)
   createFreeInfo();
 
   m_updateTimer = new TQTimer(this);
-  connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateFS()));
+  connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateFS()));
   m_updateTimer->start(config()->readNumEntry("updateValue", 60) * 1000);
 }
 
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index 21d0c9e..556f15c 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -121,7 +121,7 @@ void I8KView::openStream()
   {
     m_procStream = new TQTextIStream( m_procFile );
     disconnect( m_timer, 0, 0, 0 );
-    connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateView() ) );
+    connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateView() ) );
     m_timer->start( m_interval*1000 );
 
     kdDebug( 2003 ) << "i8k: Success" << endl;
@@ -130,7 +130,7 @@ void I8KView::openStream()
   {
     // i8k module is not loaded. Try again after 30 secs.
     disconnect( m_timer, 0, 0, 0 );
-    connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( openStream() ) );
+    connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( openStream() ) );
     m_timer->start( 30*1000 );
     kdDebug( 2003 ) << "i8k: Failed...retry after 30 secs" << endl;
   }
diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp
index 9514bc5..e920df9 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.cpp
+++ b/ksim/monitors/lm_sensors/ksimsensors.cpp
@@ -77,8 +77,8 @@ SensorsView::SensorsView(KSim::PluginObject *parent, const char *name)
   config()->setGroup("Sensors");
   (new TQVBoxLayout(this))->setAutoAdd(true);
 
-  connect(SensorBase::self(), TQT_SIGNAL(updateSensors(const SensorList &)),
-     this, TQT_SLOT(updateSensors(const SensorList &)));
+  connect(SensorBase::self(), TQ_SIGNAL(updateSensors(const SensorList &)),
+     this, TQ_SLOT(updateSensors(const SensorList &)));
 
   insertSensors();
 }
diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp
index c81ad56..0584870 100644
--- a/ksim/monitors/lm_sensors/sensorbase.cpp
+++ b/ksim/monitors/lm_sensors/sensorbase.cpp
@@ -76,7 +76,7 @@ SensorBase::SensorBase() : TQObject()
   }
 
   m_updateTimer = new TQTimer(this);
-  connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(update()));
+  connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(update()));
 }
 
 SensorBase::~SensorBase()
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp
index 1a1f4a1..e8afb88 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.cpp
+++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp
@@ -67,18 +67,18 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name)
   m_sensorView->setColumnWidth(1, 60);
   m_sensorView->setColumnWidth(2, 80);
   m_sensorView->setAllColumnsShowFocus(true);
-  connect(m_sensorView, TQT_SIGNAL(contextMenu(TDEListView *,
-     TQListViewItem *, const TQPoint &)), this, TQT_SLOT(menu(TDEListView *,
+  connect(m_sensorView, TQ_SIGNAL(contextMenu(TDEListView *,
+     TQListViewItem *, const TQPoint &)), this, TQ_SLOT(menu(TDEListView *,
      TQListViewItem *, const TQPoint &)));
 
-  connect( m_sensorView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-     TQT_SLOT( modify( TQListViewItem * ) ) );
+  connect( m_sensorView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+     TQ_SLOT( modify( TQListViewItem * ) ) );
 
   m_layout->addMultiCellWidget(m_sensorView, 1, 1, 0, 3);
 
   m_modify = new TQPushButton( this );
   m_modify->setText( i18n( "Modify..." ) );
-  connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) );
+  connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) );
   m_layout->addMultiCellWidget( m_modify, 2, 2, 3, 3 );
 
   m_fahrenBox = new TQCheckBox(i18n("Display Fahrenheit"), this);
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index bf67d46..fdfc977 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -93,7 +93,7 @@ MailLabel::MailLabel( TQWidget* parent )
 //	label->setPixmap( KSim::ThemeLoader::self().current().krellMail() );
 	configureObject( false );
 	TQTimer* timer = new TQTimer( this );
-	connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( animation() ) );
+	connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( animation() ) );
 	timer->start( 100 );
 }
 
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index e72f8ea..2167abe 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -119,11 +119,11 @@ NetView::NetView(KSim::PluginObject *parent, const char *name)
   addDisplay();
 
   m_netTimer = new TQTimer(this);
-  connect(m_netTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph()));
+  connect(m_netTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateGraph()));
   m_netTimer->start(NET_UPDATE);
 
   m_lightTimer = new TQTimer(this);
-  connect(m_lightTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateLights()));
+  connect(m_lightTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateLights()));
   m_lightTimer->start(LED_UPDATE);
 
   updateGraph();
@@ -444,10 +444,10 @@ TQPopupMenu *NetView::addPopupMenu(const TQString &device, int value)
 {
   TQPopupMenu *popup = new TQPopupMenu(this);
   popup->insertItem(SmallIcon("network"), i18n("Connect"), this,
-     TQT_SLOT(runConnectCommand(int)), 0, 1);
+     TQ_SLOT(runConnectCommand(int)), 0, 1);
   popup->setItemParameter(1, value);
   popup->insertItem(SmallIcon("network"), i18n("Disconnect"), this,
-     TQT_SLOT(runDisconnectCommand(int)), 0, 2);
+     TQ_SLOT(runDisconnectCommand(int)), 0, 2);
   popup->setItemParameter(2, value);
   menu()->insertItem(device, popup, 100 + value);
   return popup;
diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp
index eb2c1a3..2cfc1af 100644
--- a/ksim/monitors/net/netconfig.cpp
+++ b/ksim/monitors/net/netconfig.cpp
@@ -49,11 +49,11 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name)
   usingBox ->addColumn(i18n("Commands"));
   usingBox->setAllColumnsShowFocus(true);
 
-  connect(usingBox, TQT_SIGNAL(contextMenu(TDEListView *,
+  connect(usingBox, TQ_SIGNAL(contextMenu(TDEListView *,
      TQListViewItem *, const TQPoint &)),
-     TQT_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &)));
-  connect(usingBox, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-     TQT_SLOT(modifyItem(TQListViewItem *)));
+     TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &)));
+  connect(usingBox, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+     TQ_SLOT(modifyItem(TQListViewItem *)));
   mainLayout->addWidget(usingBox);
 
   layout = new TQHBoxLayout;
@@ -65,17 +65,17 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name)
 
   insertButton = new TQPushButton(this);
   insertButton->setText(i18n("Add..."));
-  connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog()));
+  connect(insertButton, TQ_SIGNAL(clicked()), TQ_SLOT(showNetDialog()));
   layout->addWidget(insertButton);
 
   modifyButton = new TQPushButton(this);
   modifyButton->setText(i18n("Modify..."));
-  connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent()));
+  connect(modifyButton, TQ_SIGNAL(clicked()), TQ_SLOT(modifyCurrent()));
   layout->addWidget(modifyButton);
 
   removeButton = new TQPushButton(this);
   removeButton->setText(i18n("Remove"));
-  connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent()));
+  connect(removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeCurrent()));
   layout->addWidget(removeButton);
 
   mainLayout->addLayout(layout);
diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp
index 12ef26d..39ea761 100644
--- a/ksim/monitors/net/netdialog.cpp
+++ b/ksim/monitors/net/netdialog.cpp
@@ -99,8 +99,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
 
   m_showTimer = new TQCheckBox(m_timerBox);
   m_showTimer->setText(i18n("Show timer"));
-  connect(m_showTimer, TQT_SIGNAL(toggled(bool)),
-      m_timerEdit, TQT_SLOT(setEnabled(bool)));
+  connect(m_showTimer, TQ_SIGNAL(toggled(bool)),
+      m_timerEdit, TQ_SLOT(setEnabled(bool)));
   m_timerBoxLayout->addWidget(m_showTimer);
   m_timerBoxLayout->addWidget(m_timerEdit);
 
@@ -138,8 +138,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
   m_connectRequester = new KURLRequester(m_commandTab);
   m_connectRequester->setMinimumSize(145, 0);
   m_connectRequester->setEnabled(false);
-  connect(m_enableCommands, TQT_SIGNAL(toggled(bool)),
-      m_connectRequester, TQT_SLOT(setEnabled(bool)));
+  connect(m_enableCommands, TQ_SIGNAL(toggled(bool)),
+      m_connectRequester, TQ_SLOT(setEnabled(bool)));
   m_commandLayout->addMultiCellWidget(m_connectRequester, 1, 1, 1, 2);
 
   m_dCommand = new TQLabel(m_commandTab);
@@ -149,8 +149,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
   m_disconnectRequester = new KURLRequester(m_commandTab);
   m_disconnectRequester->setMinimumSize(145, 0);
   m_disconnectRequester->setEnabled(false);
-  connect(m_enableCommands, TQT_SIGNAL(toggled(bool)),
-      m_disconnectRequester, TQT_SLOT(setEnabled(bool)));
+  connect(m_enableCommands, TQ_SIGNAL(toggled(bool)),
+      m_disconnectRequester, TQ_SLOT(setEnabled(bool)));
   m_commandLayout->addMultiCellWidget(m_disconnectRequester, 2, 2, 1, 2);
 
   TQSpacerItem *commandSpacer = new TQSpacerItem(20, 20,
@@ -160,7 +160,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
 
   setOkButton(KStdGuiItem::ok().text());
   setCancelButton(KStdGuiItem::cancel().text());
-  connect(this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(sendClicked()));
+  connect(this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(sendClicked()));
 }
 
 NetDialog::~NetDialog()
diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp
index 6e224f8..3aeb2b1 100644
--- a/ksim/monitors/snmp/browsedialog.cpp
+++ b/ksim/monitors/snmp/browsedialog.cpp
@@ -96,10 +96,10 @@ void BrowseDialog::startWalk( const Identifier &startOid )
     stopWalker();
 
     m_walker = new Walker( m_host, startOid, this );
-    connect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ),
-             this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) );
-    connect( m_walker, TQT_SIGNAL( finished() ),
-             this, TQT_SLOT( nextWalk() ) );
+    connect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ),
+             this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) );
+    connect( m_walker, TQ_SIGNAL( finished() ),
+             this, TQ_SLOT( nextWalk() ) );
 
     stop->setEnabled( true );
 }
@@ -109,10 +109,10 @@ void BrowseDialog::stopWalker()
     if ( !m_walker )
         return;
 
-    disconnect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ),
-                this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) );
-    disconnect( m_walker, TQT_SIGNAL( finished() ),
-                this, TQT_SLOT( nextWalk() ) );
+    disconnect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ),
+                this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) );
+    disconnect( m_walker, TQ_SIGNAL( finished() ),
+                this, TQ_SLOT( nextWalk() ) );
 
     m_walker->deleteLater();
     m_walker = 0;
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index e1dfcca..4ecd44e 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -50,24 +50,24 @@ ConfigPage::ConfigPage( Plugin *parent, const char *name )
 
     m_page = new ConfigWidget( this );
 
-    connect( m_page->addHost, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( addNewHost() ) );
-    connect( m_page->modifyHost, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( modifyHost() ) );
-    connect( m_page->removeHost, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( removeHost() ) );
-
-    connect( m_page->addMonitor, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( addNewMonitor() ) );
-    connect( m_page->modifyMonitor, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( modifyMonitor() ) );
-    connect( m_page->removeMonitor, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( removeMonitor() ) );
-
-    connect( m_page->hosts, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( disableOrEnableSomeWidgets() ) );
-    connect( m_page->monitors, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( disableOrEnableSomeWidgets() ) );
+    connect( m_page->addHost, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( addNewHost() ) );
+    connect( m_page->modifyHost, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( modifyHost() ) );
+    connect( m_page->removeHost, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( removeHost() ) );
+
+    connect( m_page->addMonitor, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( addNewMonitor() ) );
+    connect( m_page->modifyMonitor, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( modifyMonitor() ) );
+    connect( m_page->removeMonitor, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( removeMonitor() ) );
+
+    connect( m_page->hosts, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( disableOrEnableSomeWidgets() ) );
+    connect( m_page->monitors, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( disableOrEnableSomeWidgets() ) );
 }
 
 ConfigPage::~ConfigPage()
diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp
index aa645cf..1294c10 100644
--- a/ksim/monitors/snmp/monitor.cpp
+++ b/ksim/monitors/snmp/monitor.cpp
@@ -32,7 +32,7 @@ Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQ
     else
         m_timerId = -1;
 
-    TQTimer::singleShot( 0, this, TQT_SLOT( performSnmpRequest() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( performSnmpRequest() ) );
 }
 
 Monitor::~Monitor()
diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp
index 5242ee0..4e42bda 100644
--- a/ksim/monitors/snmp/monitorconfig.cpp
+++ b/ksim/monitors/snmp/monitorconfig.cpp
@@ -108,8 +108,8 @@ TQWidget *MonitorConfig::createMonitorWidget( TQWidget *parent, const char *name
         w = new ChartMonitor( *this, parent, name );
 
     Monitor *monitor = new Monitor( host, id, refresh, w );
-    TQObject::connect( monitor, TQT_SIGNAL( newData( const Value & ) ),
-                      w, TQT_SLOT( setData( const Value & ) ) );
+    TQObject::connect( monitor, TQ_SIGNAL( newData( const Value & ) ),
+                      w, TQ_SLOT( setData( const Value & ) ) );
     return w;
 }
 
diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp
index 736c534..2c9e930 100644
--- a/ksim/monitors/snmp/probedialog.cpp
+++ b/ksim/monitors/snmp/probedialog.cpp
@@ -79,10 +79,10 @@ void ProbeDialog::probeOne()
     delete m_currentMonitor;
     m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, this );
 
-    connect( m_currentMonitor, TQT_SIGNAL( newData( const Identifier &, const Value & ) ),
-             this, TQT_SLOT( probeResult( const Identifier &, const Value & ) ) );
-    connect( m_currentMonitor, TQT_SIGNAL( error( const Identifier &, const ErrorInfo & ) ),
-             this, TQT_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) );
+    connect( m_currentMonitor, TQ_SIGNAL( newData( const Identifier &, const Value & ) ),
+             this, TQ_SLOT( probeResult( const Identifier &, const Value & ) ) );
+    connect( m_currentMonitor, TQ_SIGNAL( error( const Identifier &, const ErrorInfo & ) ),
+             this, TQ_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) );
 }
 
 void ProbeDialog::probeResult( const Identifier &oid, const Value &value )
@@ -108,7 +108,7 @@ void ProbeDialog::nextProbe()
     if ( m_canceled )
         KProgressDialog::done( TQDialog::Rejected );
     else
-        TQTimer::singleShot( 0, this, TQT_SLOT( probeOne() ) );
+        TQTimer::singleShot( 0, this, TQ_SLOT( probeOne() ) );
 }
 
 #include "probedialog.moc"
diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp
index b0218d4..b39d02c 100644
--- a/ksim/themeprefs.cpp
+++ b/ksim/themeprefs.cpp
@@ -77,8 +77,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
   m_urlLabel = new KURLLabel(this);
   m_urlLabel->setText(i18n("Open Konqueror in KSim's theme folder"));
   m_urlLabel->setURL(TQString::fromLatin1("file://") + themeDir);
-  connect(m_urlLabel, TQT_SIGNAL(leftClickedURL(const TQString &)),
-     this, TQT_SLOT(openURL(const TQString &)));
+  connect(m_urlLabel, TQ_SIGNAL(leftClickedURL(const TQString &)),
+     this, TQ_SLOT(openURL(const TQString &)));
   m_themeLayout->addMultiCellWidget(m_urlLabel, 1, 1, 0, 4);
 
   m_line = new KSeparator(TQt::Horizontal, this);
@@ -99,8 +99,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
   m_listView = new TDEListView(this);
   m_listView->addColumn(i18n("Theme"));
   m_listView->setFullWidth(true);
-  connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)),
-     this, TQT_SLOT(selectItem(TQListViewItem *)));
+  connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem *)),
+     this, TQ_SLOT(selectItem(TQListViewItem *)));
   m_themeLayout->addMultiCellWidget(m_listView, 4, 4, 0, 4);
 
   m_alternateLabel = new TQLabel(this);
@@ -126,8 +126,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
   m_fontsCombo->insertItem(i18n("Default"));
   m_fontsCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
      TQSizePolicy::Fixed));
-  connect(m_fontsCombo, TQT_SIGNAL(activated(int)),
-     this, TQT_SLOT(showFontDialog(int)));
+  connect(m_fontsCombo, TQ_SIGNAL(activated(int)),
+     this, TQ_SLOT(showFontDialog(int)));
   m_themeLayout->addMultiCellWidget(m_fontsCombo, 5, 5, 4, 4);
 
   TQStringList locatedFiles = TDEGlobal::dirs()->findDirs("data", "ksim/themes");