diff options
Diffstat (limited to 'kkbswitch/kbswitchapp.cpp')
| -rw-r--r-- | kkbswitch/kbswitchapp.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kkbswitch/kbswitchapp.cpp b/kkbswitch/kbswitchapp.cpp index 9dab46a..7798be3 100644 --- a/kkbswitch/kbswitchapp.cpp +++ b/kkbswitch/kbswitchapp.cpp @@ -45,20 +45,20 @@ KBSwitchApp::KBSwitchApp() #endif m_intf = new KBSwitchIntf(this, &m_kbconf); - QObject::connect(m_intf, SIGNAL(nextGroupSelected()), this, SLOT(slotSelectNextGroup())); - QObject::connect(m_intf, SIGNAL(groupSelected(int)), this, SLOT(slotGroupSelected(int))); + TQObject::connect(m_intf, SIGNAL(nextGroupSelected()), this, SLOT(slotSelectNextGroup())); + TQObject::connect(m_intf, SIGNAL(groupSelected(int)), this, SLOT(slotGroupSelected(int))); - QObject::connect(&m_xkb, SIGNAL(layoutChanged()), this, SLOT(reconfigure())); - QObject::connect(&m_xkb, SIGNAL(groupChanged(int)), this, SLOT(slotXkbGroupChanged(int))); + TQObject::connect(&m_xkb, SIGNAL(layoutChanged()), this, SLOT(reconfigure())); + TQObject::connect(&m_xkb, SIGNAL(groupChanged(int)), this, SLOT(slotXkbGroupChanged(int))); m_force_group_setting = false; int start_group = m_kbconf.default_groupno(); m_trayicon = new KBSwitchTrayIcon(&m_kbconf); - QObject::connect(m_trayicon, SIGNAL(groupSelected(int)), this, + TQObject::connect(m_trayicon, SIGNAL(groupSelected(int)), this, SLOT(slotGroupSelected(int))); - QObject::connect(m_trayicon, SIGNAL(clicked()), this, SLOT(slotSelectNextGroup())); - QObject::connect(m_trayicon, SIGNAL(preferencesSelected()), this, + TQObject::connect(m_trayicon, SIGNAL(clicked()), this, SLOT(slotSelectNextGroup())); + TQObject::connect(m_trayicon, SIGNAL(preferencesSelected()), this, SLOT(slotPreferences())); if (start_group != m_xkb.getGroupNo()) { @@ -144,10 +144,10 @@ void KBSwitchApp::slotSelectNextGroup() /** No descriptions */ void KBSwitchApp::slotPreferences(){ KBConfigDlg dlg(&m_kbconf); - QObject::connect(&dlg, SIGNAL(okClicked()), m_trayicon, SLOT(slotUpdateIcons())); - QObject::connect(&dlg, SIGNAL(applyClicked()), m_trayicon, SLOT(slotUpdateIcons())); - QObject::connect(&dlg, SIGNAL(okClicked()), this, SLOT(slotPrefChanged())); - QObject::connect(&dlg, SIGNAL(applyClicked()), this, SLOT(slotPrefChanged())); + 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())); dlg.exec(); } @@ -179,7 +179,7 @@ void KBSwitchApp::slotXkbGroupChanged(int groupno){ #ifdef HAVE_LIBXKLAVIER updateIcon(groupno); /* XWindowAttributes attrs; - XGetWindowAttributes(qt_xdisplay(), qt_xrootwin(), &attrs); + XGetWindowAttributes(tqt_xdisplay(), tqt_xrootwin(), &attrs); kdDebug() << "root event mask is " << attrs.your_event_mask << endl; kdDebug() << "SubstructureNotifyMask is " << ((attrs.your_event_mask & SubstructureNotifyMask) ? "ON" : "OFF") << endl;*/ |