Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 27 insertions, 27 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()