Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

6 files changed, 41 insertions, 41 deletions

diff --git a/kkbswitch/kbconfig.cpp b/kkbswitch/kbconfig.cpp
index 8dd270e..a50a3a9 100644
--- a/kkbswitch/kbconfig.cpp
+++ b/kkbswitch/kbconfig.cpp
@@ -107,18 +107,18 @@ void KBConfig::load(TDEConfig *config){
     m_keys->insert(TQString::fromLatin1("SetGroup %1").arg(i),
       i18n("Activate %1 keyboard layout").arg(m_groups[i]->getName()),
       TQString::null, TQt::ALT+TQt::CTRL+TQt::Key_1 + i, KKey::QtWIN+TQt::CTRL+TQt::Key_1 + i,
-      kapp, SLOT(slotGroupSelected(int)));
+      kapp, TQ_SLOT(slotGroupSelected(int)));
   }
   m_keys->insert("NextGroup", i18n("Cycle keyboard layouts"),
                  i18n("Activates the next keyboard layout or, if the current layout is the last one, "
                       "activates the first layout."),
                  TQt::SHIFT+TQt::CTRL+TQt::Key_Plus, TQt::SHIFT+TQt::CTRL+TQt::Key_Plus,
-                 kapp, SLOT(slotSelectNextGroup()));
+                 kapp, TQ_SLOT(slotSelectNextGroup()));
   m_keys->insert("PrevGroup", i18n("Cycle keyboard layouts (reverse)"),
                  i18n("Activates the previous keyboard layout or, if the current layout is the first one, "
                       "activates the last layout."),
                  TQt::SHIFT+TQt::CTRL+TQt::Key_Minus, TQt::SHIFT+TQt::CTRL+TQt::Key_Minus,
-                 kapp, SLOT(slotSelectPrevGroup()));
+                 kapp, TQ_SLOT(slotSelectPrevGroup()));
   m_keys->readSettings(config);
   checkKeysEnabled();
 }
diff --git a/kkbswitch/kbconfigdlg.cpp b/kkbswitch/kbconfigdlg.cpp
index 6b1c73d..234802d 100644
--- a/kkbswitch/kbconfigdlg.cpp
+++ b/kkbswitch/kbconfigdlg.cpp
@@ -124,9 +124,9 @@ void KBConfigDlg::setupGeneralPage()
   groupsLayout->setSpacing(2);
 
   lbGroups = new TDEListBox(page);
-  TQObject::connect(lbGroups, SIGNAL(selectionChanged()), this, SLOT(slotLayoutSelected()));
-  TQObject::connect(lbGroups, SIGNAL(doubleClicked(TQListBoxItem *)), this,
-    SLOT(slotListBoxExecuted(TQListBoxItem *)));
+  TQObject::connect(lbGroups, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotLayoutSelected()));
+  TQObject::connect(lbGroups, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), this,
+    TQ_SLOT(slotListBoxExecuted(TQListBoxItem *)));
   groupsLayout->addWidget(lbGroups);
   lbl->setBuddy(lbGroups);
   TQWhatsThis::add(lbGroups, i18n("This list box shows keyboard layouts available in your system.\n"
@@ -139,19 +139,19 @@ void KBConfigDlg::setupGeneralPage()
   btnLayout->setSpacing(2);
 
   btnChangeIcon = new TQPushButton(i18n("Cha&nge Icon..."), page);
-  TQObject::connect(btnChangeIcon, SIGNAL(clicked()), this, SLOT(slotPickIcon()));
+  TQObject::connect(btnChangeIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPickIcon()));
   btnLayout->addWidget(btnChangeIcon, 0, TQt::AlignTop);
   TQWhatsThis::add(btnChangeIcon, i18n("Click this button to change the icon for the "
     "layout selected in the list box to the left."));
 
   btnSetDefaultIcon = new TQPushButton(i18n("Use &Default Icon"), page);
-  TQObject::connect(btnSetDefaultIcon, SIGNAL(clicked()), this, SLOT(slotSetDefaultIcon()));
+  TQObject::connect(btnSetDefaultIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetDefaultIcon()));
   btnLayout->addWidget(btnSetDefaultIcon, 0, TQt::AlignTop); 
   TQWhatsThis::add(btnSetDefaultIcon, i18n("Click this button to use default icon for the " 
     "layout selected in the list box to the left."));
     
   btnSetDefaultGroup = new TQPushButton(i18n("&Set as Default"), page);
-  TQObject::connect(btnSetDefaultGroup, SIGNAL(clicked()), this, SLOT(slotSetDefaultGroup()));
+  TQObject::connect(btnSetDefaultGroup, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetDefaultGroup()));
   btnLayout->addWidget(btnSetDefaultGroup, 0, TQt::AlignTop);
   TQWhatsThis::add(btnSetDefaultGroup, i18n("Click this button to set the layout selected "
     "in the list box to the left as the default"));
@@ -167,7 +167,7 @@ void KBConfigDlg::setupGeneralPage()
   cbxIconType->insertItem(i18n("Country flag"));
   cbxIconType->insertItem(i18n("Language code"));
   cbxIconType->insertItem(i18n("Flag and code"));
-  TQObject::connect(cbxIconType, SIGNAL(activated(int)), this, SLOT(slotIconTypeSelected(int)));
+  TQObject::connect(cbxIconType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotIconTypeSelected(int)));
   vlayout->addWidget(cbxIconType);
   lbl->setBuddy(cbxIconType);
   TQWhatsThis::add(cbxIconType, i18n("<p>Select the style of icons representing the "
@@ -218,7 +218,7 @@ void KBConfigDlg::setupShortcutsPage()
 {
   TQVBox *box = addVBoxPage(i18n("Sho&rtcuts"));
   chkUseShortcuts = new TQCheckBox(i18n("Use shortcuts to &activate keyboard layouts"), box);
-  connect(chkUseShortcuts, SIGNAL(toggled(bool)), this, SLOT(slotUseShortcutsToggled(bool)));
+  connect(chkUseShortcuts, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUseShortcutsToggled(bool)));
   TQWhatsThis::add(chkUseShortcuts, i18n("Check this checkbox to be able to quickly "
     "activate any keyboard layout with keyboard shorcuts. Once this checkbox "
     "is checked, you can adjust the shortcuts at the key chooser pane below. "
diff --git a/kkbswitch/kbpickicondlg.cpp b/kkbswitch/kbpickicondlg.cpp
index a8a0e05..a69c052 100644
--- a/kkbswitch/kbpickicondlg.cpp
+++ b/kkbswitch/kbpickicondlg.cpp
@@ -43,14 +43,14 @@ KBPickIconDlg::KBPickIconDlg(const TQString &currentPath, const TQPixmap &curren
   TQVBox *page = makeVBoxMainWidget();
   
   lbIcons = new TDEListBox(page);
-  TQObject::connect(lbIcons, SIGNAL(doubleClicked(TQListBoxItem*)),
-    this, SLOT(slotOk()));
-  TQObject::connect(lbIcons, SIGNAL(returnPressed(TQListBoxItem*)),
-    this, SLOT(slotOk()));
+  TQObject::connect(lbIcons, TQ_SIGNAL(doubleClicked(TQListBoxItem*)),
+    this, TQ_SLOT(slotOk()));
+  TQObject::connect(lbIcons, TQ_SIGNAL(returnPressed(TQListBoxItem*)),
+    this, TQ_SLOT(slotOk()));
   TQWhatsThis::add(lbIcons, i18n("Select one of the icons"));  
 
   TQPushButton *btnBrowse = new TQPushButton(i18n("&Browse..."), page);
-  TQObject::connect(btnBrowse, SIGNAL(clicked()), this, SLOT(slotBrowseForIcon()));
+  TQObject::connect(btnBrowse, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowseForIcon()));
   TQWhatsThis::add(btnBrowse, i18n("Browse for an image file to use as an icon"));
   
   loadCountryFlags();
diff --git a/kkbswitch/kbswitchapp.cpp b/kkbswitch/kbswitchapp.cpp
index 0c9f675..70c3925 100644
--- a/kkbswitch/kbswitchapp.cpp
+++ b/kkbswitch/kbswitchapp.cpp
@@ -45,21 +45,21 @@ KBSwitchApp::KBSwitchApp()
 #endif
 
   m_intf = new KBSwitchIntf(this, &m_kbconf);
-  TQObject::connect(m_intf, SIGNAL(nextGroupSelected()), this, SLOT(slotSelectNextGroup()));
-  TQObject::connect(m_intf, SIGNAL(groupSelected(int)), this, SLOT(slotGroupSelected(int)));
+  TQObject::connect(m_intf, TQ_SIGNAL(nextGroupSelected()), this, TQ_SLOT(slotSelectNextGroup()));
+  TQObject::connect(m_intf, TQ_SIGNAL(groupSelected(int)), this, TQ_SLOT(slotGroupSelected(int)));
 
-  TQObject::connect(&m_xkb, SIGNAL(layoutChanged()), this, SLOT(reconfigure()));
-  TQObject::connect(&m_xkb, SIGNAL(groupChanged(int)), this, SLOT(slotXkbGroupChanged(int)));
+  TQObject::connect(&m_xkb, TQ_SIGNAL(layoutChanged()), this, TQ_SLOT(reconfigure()));
+  TQObject::connect(&m_xkb, TQ_SIGNAL(groupChanged(int)), this, TQ_SLOT(slotXkbGroupChanged(int)));
 
   m_force_group_setting = false;
   int start_group = m_kbconf.default_groupno();
 
   m_trayicon = new KBSwitchTrayIcon(&m_kbconf);
-  TQObject::connect(m_trayicon, SIGNAL(groupSelected(int)), this,
-    SLOT(slotGroupSelected(int)));
-  TQObject::connect(m_trayicon, SIGNAL(clicked()), this, SLOT(slotSelectNextGroup()));
-  TQObject::connect(m_trayicon, SIGNAL(preferencesSelected()), this,
-    SLOT(slotPreferences()));
+  TQObject::connect(m_trayicon, TQ_SIGNAL(groupSelected(int)), this,
+    TQ_SLOT(slotGroupSelected(int)));
+  TQObject::connect(m_trayicon, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectNextGroup()));
+  TQObject::connect(m_trayicon, TQ_SIGNAL(preferencesSelected()), this,
+    TQ_SLOT(slotPreferences()));
   
   if (start_group != m_xkb.getGroupNo()) {
     setStartGroup(start_group);
@@ -154,10 +154,10 @@ void KBSwitchApp::slotSelectPrevGroup()
 /** No descriptions */
 void KBSwitchApp::slotPreferences(){
   KBConfigDlg dlg(&m_kbconf);
-  TQObject::connect(&dlg, SIGNAL(okClicked()), m_trayicon, SLOT(slotUpdateIcons()));
-  TQObject::connect(&dlg, SIGNAL(applyClicked()), m_trayicon, SLOT(slotUpdateIcons()));
-  TQObject::connect(&dlg, SIGNAL(okClicked()), this, SLOT(slotPrefChanged()));
-  TQObject::connect(&dlg, SIGNAL(applyClicked()), this, SLOT(slotPrefChanged()));
+  TQObject::connect(&dlg, TQ_SIGNAL(okClicked()), m_trayicon, TQ_SLOT(slotUpdateIcons()));
+  TQObject::connect(&dlg, TQ_SIGNAL(applyClicked()), m_trayicon, TQ_SLOT(slotUpdateIcons()));
+  TQObject::connect(&dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotPrefChanged()));
+  TQObject::connect(&dlg, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotPrefChanged()));
   dlg.exec();
 }
 
@@ -316,8 +316,8 @@ void KBSwitchApp::resetWindowMap()
 {
   if (m_twin_module == NULL) {
     m_twin_module = new KWinModule();
-    connect(m_twin_module, SIGNAL(activeWindowChanged(WId)), SLOT(slotWindowChanged(WId)));
-    connect(m_twin_module, SIGNAL(windowRemoved(WId)), SLOT(slotWindowRemoved(WId)));
+    connect(m_twin_module, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(slotWindowChanged(WId)));
+    connect(m_twin_module, TQ_SIGNAL(windowRemoved(WId)), TQ_SLOT(slotWindowRemoved(WId)));
     resetWindowMap();
     if (m_cur_groupno != -1 && m_cur_groupno != m_kbconf.default_groupno())
       setStartGroup(m_kbconf.default_groupno());
@@ -354,8 +354,8 @@ void KBSwitchApp::enableWatcher()
     else if (m_watcher_type == KBConfig::SCOPE_CLASS)
       m_watcher = new WindowClassWatcher(&m_kbconf, this);
     else return; // if scope is global, don't create watcher
-    connect(m_watcher, SIGNAL(windowChanged(int, int )), 
-      SLOT(slotWindowChanged(int, int)));
+    connect(m_watcher, TQ_SIGNAL(windowChanged(int, int )), 
+      TQ_SLOT(slotWindowChanged(int, int)));
   }     
 }
 
diff --git a/kkbswitch/kbswitchtrayicon.cpp b/kkbswitch/kbswitchtrayicon.cpp
index df04cd2..b585965 100644
--- a/kkbswitch/kbswitchtrayicon.cpp
+++ b/kkbswitch/kbswitchtrayicon.cpp
@@ -72,17 +72,17 @@ KBSwitchTrayIcon::KBSwitchTrayIcon(KBConfig *conf){
 #endif
 
   m_kbconf = conf;
-  //TQObject::connect(conf, SIGNAL(changed()), this, SLOT(updateMenuIcons()));
+  //TQObject::connect(conf, TQ_SIGNAL(changed()), this, TQ_SLOT(updateMenuIcons()));
   TDEPopupMenu * menu = contextMenu();
   addLayoutItems(menu, false);
-  TQObject::connect(menu, SIGNAL(activated(int)), this, SLOT(slotMenuActivated(int)));
+  TQObject::connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)));
 
   menu->insertSeparator();
-  TDEAction *pref = KStdAction::preferences(this, SIGNAL(preferencesSelected()), ACTION_PARENT);
+  TDEAction *pref = KStdAction::preferences(this, TQ_SIGNAL(preferencesSelected()), ACTION_PARENT);
   pref->plug(menu);
-  TDEAction *help = KStdAction::help(this, SLOT(slotHelp()), ACTION_PARENT);
+  TDEAction *help = KStdAction::help(this, TQ_SLOT(slotHelp()), ACTION_PARENT);
   help->plug(menu);
-  TDEAction *about = KStdAction::aboutApp(this, SLOT(slotAbout()), ACTION_PARENT);
+  TDEAction *about = KStdAction::aboutApp(this, TQ_SLOT(slotAbout()), ACTION_PARENT);
   about->plug(menu);
 
   /*TQString path = locate("icon", "hicolor/16x16/apps/locale.png");
diff --git a/kkbswitch/windowwatcher.cpp b/kkbswitch/windowwatcher.cpp
index 96dbcc0..56aa184 100644
--- a/kkbswitch/windowwatcher.cpp
+++ b/kkbswitch/windowwatcher.cpp
@@ -26,9 +26,9 @@ WindowWatcher::WindowWatcher(KBConfig *kbconf, TQObject *parent, const char *nam
 {
   m_kbconf = kbconf;
   m_twin_module = new KWinModule(this);
-  connect(m_twin_module, SIGNAL(windowAdded(WId)), SLOT(windowAdded(WId)));
-  connect(m_twin_module, SIGNAL(windowRemoved(WId)), SLOT(windowRemoved(WId)));
-  connect(m_twin_module, SIGNAL(activeWindowChanged(WId)), SLOT(activeWindowChanged(WId)));
+  connect(m_twin_module, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId)));
+  connect(m_twin_module, TQ_SIGNAL(windowRemoved(WId)), TQ_SLOT(windowRemoved(WId)));
+  connect(m_twin_module, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(activeWindowChanged(WId)));
 }
 
 WindowWatcher::~WindowWatcher()