summaryrefslogtreecommitdiffstats
path: root/src/tdebluez/trayicon.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tdebluez/trayicon.cpp')
-rw-r--r--src/tdebluez/trayicon.cpp100
1 files changed, 50 insertions, 50 deletions
diff --git a/src/tdebluez/trayicon.cpp b/src/tdebluez/trayicon.cpp
index 9185da7..2e0ee05 100644
--- a/src/tdebluez/trayicon.cpp
+++ b/src/tdebluez/trayicon.cpp
@@ -59,7 +59,7 @@ TrayIcon::TrayIcon(TDEBluetoothApp* _app)
bool autostart = app->getAutoStart();
// blinkTimer = new TQTimer(this);
-// connect(blinkTimer, SIGNAL(timeout()), this, TQT_SLOT(slotSearchIcon()));
+// connect(blinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSearchIcon()));
// This following commented out lines are also part of the old code
// They represent features that were not migrated to Bluez5
@@ -67,19 +67,19 @@ TrayIcon::TrayIcon(TDEBluetoothApp* _app)
//// kbluemonAction = new TDEAction(i18n("KBlue&Mon"),
//// TDEGlobal::iconLoader()->loadIcon("info", TDEIcon::Small, 16),
//// TDEShortcut::null(), this, "kbluemon");
-//// connect(kbluemonAction, SIGNAL(activated()), this, SLOT(slotkbluemonitor()));
+//// connect(kbluemonAction, TQ_SIGNAL(activated()), this, TQ_SLOT(slotkbluemonitor()));
////
//// // KBlueLock
//// kbluelockAction = new TDEAction(i18n("KBlue&Lock"),
//// TDEGlobal::iconLoader()->loadIcon("kbluelock", TDEIcon::Small, 16),
//// TDEShortcut::null(), this, "kbluelock");
-//// connect(kbluelockAction, SIGNAL(activated()), this, SLOT(slotkbluelock()));
+//// connect(kbluelockAction, TQ_SIGNAL(activated()), this, TQ_SLOT(slotkbluelock()));
////
//// // KBtobexclient
//// kbtobexclientAction = new TDEAction(i18n("&Send File..."),
//// TDEGlobal::iconLoader()->loadIcon("attach", TDEIcon::Small, 16),
//// TDEShortcut::null(), this, "kbtobexclient");
-//// connect(kbtobexclientAction, SIGNAL(activated()), this, SLOT(slotkbtobexclient()));
+//// connect(kbtobexclientAction, TQ_SIGNAL(activated()), this, TQ_SLOT(slotkbtobexclient()));
////
// // BT switch
bool anyPowered = false;
@@ -110,7 +110,7 @@ TrayIcon::TrayIcon(TDEBluetoothApp* _app)
ad_a->setChecked(powered);
showPowerOnActionMap.insert(it.key(), ad_a);
- connect(ad_a, SIGNAL(toggled(bool)), this, TQT_SLOT(slotPowerOn(bool)));
+ connect(ad_a, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPowerOn(bool)));
}
@@ -121,47 +121,47 @@ TrayIcon::TrayIcon(TDEBluetoothApp* _app)
helpActionMenu = new TDEActionMenu(i18n("&Help"), TDEGlobal::iconLoader()->loadIcon("help", TDEIcon::Small, 16), this, "help_menu");
// show documentation
- showHelpAction = KStdAction::help(this, TQT_SLOT(slotShowHelp()), actionCollection());
+ showHelpAction = KStdAction::help(this, TQ_SLOT(slotShowHelp()), actionCollection());
// "About" menu item
- aboutAction = KStdAction::aboutApp(this, TQT_SLOT(slotAbout()), actionCollection());
+ aboutAction = KStdAction::aboutApp(this, TQ_SLOT(slotAbout()), actionCollection());
// // Inputdevice configuration
// inputConfigAction = new TDEAction(i18n("&Input Devices..."),
// TDEGlobal::iconLoader()->loadIcon("configure", TDEIcon::Small, 16),
// TDEShortcut::null(), this, "input_config");
-// connect(inputConfigAction, SIGNAL(activated()), this, SLOT(slotInputConfig()));
+// connect(inputConfigAction, TQ_SIGNAL(activated()), this, TQ_SLOT(slotInputConfig()));
// Bluetooth Device configuration
// from 06_rev748007.patch
deviceConfigAction = new TDEAction(i18n("&Devices..."), TDEGlobal::iconLoader()->loadIcon("configure", TDEIcon::Small, 16), TDEShortcut::null(), this, "device_config");
- connect(deviceConfigAction, SIGNAL(activated()), this, TQT_SLOT(slotDeviceConfig()));
+ connect(deviceConfigAction, TQ_SIGNAL(activated()), this, TQ_SLOT(slotDeviceConfig()));
// Bluetooth Adapter configuration
adapterConfigAction = new TDEAction(i18n("&Adapters..."), TDEGlobal::iconLoader()->loadIcon("configure", TDEIcon::Small, 16), TDEShortcut::null(), this, "adapter_config");
- connect(adapterConfigAction, SIGNAL(activated()), this, TQT_SLOT(slotAdapterConfig()));
+ connect(adapterConfigAction, TQ_SIGNAL(activated()), this, TQ_SLOT(slotAdapterConfig()));
// // Paired device configuration
// pairedConfigAction = new TDEAction(i18n("&Paired/Trusted Devices..."),
// TDEGlobal::iconLoader()->loadIcon("configure", TDEIcon::Small, 16),
// TDEShortcut::null(), this, "paired_config");
-// connect(pairedConfigAction, SIGNAL(activated()), this, SLOT(slotPairedConfig()));
+// connect(pairedConfigAction, TQ_SIGNAL(activated()), this, TQ_SLOT(slotPairedConfig()));
// Autostart switch
autostartIconAction = new TDEToggleAction(this, "autostart");
- connect(autostartIconAction, SIGNAL(toggled(bool)), this, TQT_SLOT(slotIconAutostartToggled(bool)));
+ connect(autostartIconAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotIconAutostartToggled(bool)));
autostartIconAction->setChecked(autostart);
autostartIconAction->setText(i18n("&Auto Start"));
// Agent switch
agentIconAction = new TDEToggleAction(this, "tdeauthagent");
- connect(agentIconAction, SIGNAL(toggled(bool)), this, TQT_SLOT(slotIconAgentToggled(bool)));
+ connect(agentIconAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotIconAgentToggled(bool)));
agentIconAction->setChecked(agentstate);
agentIconAction->setText(i18n("Auth A&gent"));
// Obexsrv switch
obexIconAction = new TDEToggleAction(this, "tdebtobexsrv");
- connect(obexIconAction, SIGNAL(toggled(bool)), this, TQT_SLOT(slotIconObexToggled(bool)));
+ connect(obexIconAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotIconObexToggled(bool)));
obexIconAction->setChecked(obexserver);
obexIconAction->setText(i18n("&Obex Server"));
@@ -170,7 +170,7 @@ TrayIcon::TrayIcon(TDEBluetoothApp* _app)
// // Always-visible switch
// showIconAction = new TDEToggleAction(this, "always_visible");
-// connect(showIconAction, SIGNAL(toggled(bool)), this, SLOT(slotShowIconToggled(bool)));
+// connect(showIconAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotShowIconToggled(bool)));
// showIconAction->setChecked(alwaysVisible);
// showIconAction->setText(i18n("Always &Visible"));
// configActionMenu->insert(showIconAction);
@@ -188,46 +188,46 @@ TrayIcon::TrayIcon(TDEBluetoothApp* _app)
setupTray(anyPowered);
- connect(app, SIGNAL(signalAdapterAdded(const TQString&)), this, TQT_SLOT(slotAddAdapter(const TQString&)));
- connect(app, SIGNAL(signalAdapterRemoved(const TQString&)), this, TQT_SLOT(slotRemoveAdapter(const TQString&)));
+ connect(app, TQ_SIGNAL(signalAdapterAdded(const TQString&)), this, TQ_SLOT(slotAddAdapter(const TQString&)));
+ connect(app, TQ_SIGNAL(signalAdapterRemoved(const TQString&)), this, TQ_SLOT(slotRemoveAdapter(const TQString&)));
- connect(app->manager, SIGNAL(adapterPowerOnChanged(const TQString&, bool)), this, TQT_SLOT(slotPowerOnChanged(const TQString&, bool)));
- connect(app->manager, SIGNAL(adapterNameChanged(const TQString&, const TQString&)), this, TQT_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
- connect(app->manager, SIGNAL(adapterAliasChanged(const TQString&, const TQString&)), this, TQT_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
- connect(app->manager, SIGNAL(adapterNameChanged(const TQString&, const TQString&)), this, TQT_SLOT(slotAdapterAliasChanged(const TQString&, const TQString&)));
- connect(app->manager, SIGNAL(adapterAliasChanged(const TQString&, const TQString&)), this, TQT_SLOT(slotAdapterAliasChanged(const TQString&, const TQString&)));
+ connect(app->manager, TQ_SIGNAL(adapterPowerOnChanged(const TQString&, bool)), this, TQ_SLOT(slotPowerOnChanged(const TQString&, bool)));
+ connect(app->manager, TQ_SIGNAL(adapterNameChanged(const TQString&, const TQString&)), this, TQ_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
+ connect(app->manager, TQ_SIGNAL(adapterAliasChanged(const TQString&, const TQString&)), this, TQ_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
+ connect(app->manager, TQ_SIGNAL(adapterNameChanged(const TQString&, const TQString&)), this, TQ_SLOT(slotAdapterAliasChanged(const TQString&, const TQString&)));
+ connect(app->manager, TQ_SIGNAL(adapterAliasChanged(const TQString&, const TQString&)), this, TQ_SLOT(slotAdapterAliasChanged(const TQString&, const TQString&)));
-// connect(app->manager, SIGNAL(adapterModeChanged(const TQString&, const TQString&)), this, TQT_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
-// connect(app->manager, SIGNAL(adapterPowerOnChanged(const TQString&, bool)), this, TQT_SLOT(slotPowerOnChanged(const TQString&, bool)));
- connect(app->manager, SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)),
- this, TQT_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)));
- connect(app->manager, SIGNAL(adapterDiscoverableChanged(const TQString&, bool)),
- this, TQT_SLOT(slotDiscoverableChanged(const TQString&, bool)));
-// connect(app->manager, SIGNAL(adapterDiscoveringChanged(const TQString&, bool)), this, TQT_SLOT(slotDiscoveringChanged(const TQString&, bool)));
- connect(app->manager, SIGNAL(deviceConnectedChanged(const TQString&, bool)), this, TQT_SLOT(slotDeviceConnectedChanged(const TQString&, bool)));
+// connect(app->manager, TQ_SIGNAL(adapterModeChanged(const TQString&, const TQString&)), this, TQ_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
+// connect(app->manager, TQ_SIGNAL(adapterPowerOnChanged(const TQString&, bool)), this, TQ_SLOT(slotPowerOnChanged(const TQString&, bool)));
+ connect(app->manager, TQ_SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)),
+ this, TQ_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)));
+ connect(app->manager, TQ_SIGNAL(adapterDiscoverableChanged(const TQString&, bool)),
+ this, TQ_SLOT(slotDiscoverableChanged(const TQString&, bool)));
+// connect(app->manager, TQ_SIGNAL(adapterDiscoveringChanged(const TQString&, bool)), this, TQ_SLOT(slotDiscoveringChanged(const TQString&, bool)));
+ connect(app->manager, TQ_SIGNAL(deviceConnectedChanged(const TQString&, bool)), this, TQ_SLOT(slotDeviceConnectedChanged(const TQString&, bool)));
- connect(adapterConfigDialog, SIGNAL(signalAdapterSelected(const TQString&, const TQString&)),
- deviceWizard, TQT_SLOT(slotSetAdapter(const TQString&, const TQString&)));
- connect(adapterConfigDialog, SIGNAL(signalAdapterSelected(const TQString&, const TQString&)),
- this, TQT_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
+ connect(adapterConfigDialog, TQ_SIGNAL(signalAdapterSelected(const TQString&, const TQString&)),
+ deviceWizard, TQ_SLOT(slotSetAdapter(const TQString&, const TQString&)));
+ connect(adapterConfigDialog, TQ_SIGNAL(signalAdapterSelected(const TQString&, const TQString&)),
+ this, TQ_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
- connect(this, SIGNAL(quitSelected()), this, SLOT(slotQuitSelected()));
+ connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuitSelected()));
}
TrayIcon::~TrayIcon()
{
-// disconnect(app->manager, SIGNAL(deviceConnectedChanged(const TQString&, bool)), this, TQT_SLOT(slotDeviceConnectedChanged(const TQString&, bool)));
-// disconnect(app->manager, SIGNAL(adapterNameChanged(const TQString&, const TQString&)), this, TQT_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
-// disconnect(app->manager, SIGNAL(adapterAliasChanged(const TQString&, const TQString&)), this, TQT_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
-//// disconnect(app->manager, SIGNAL(adapterModeChanged(const TQString&, const TQString&)), this, SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
-//// disconnect(app->manager, SIGNAL(adapterPowerOnChanged(const TQString&, bool)), this, TQT_SLOT(slotPowerOnChanged(const TQString&, bool)));
-// disconnect(app->manager, SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)),
-// this, SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)));
-// disconnect(app->manager, SIGNAL(adapterDiscoverableChanged(const TQString&, bool)),
-// this, SLOT(slotDiscoverableChanged(const TQString&, bool)));
-//// disconnect(app->manager, SIGNAL(adapterDiscoveringChanged(const TQString&, bool)), this, SLOT(slotDiscoveringChanged(const TQString&, bool)));
+// disconnect(app->manager, TQ_SIGNAL(deviceConnectedChanged(const TQString&, bool)), this, TQ_SLOT(slotDeviceConnectedChanged(const TQString&, bool)));
+// disconnect(app->manager, TQ_SIGNAL(adapterNameChanged(const TQString&, const TQString&)), this, TQ_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
+// disconnect(app->manager, TQ_SIGNAL(adapterAliasChanged(const TQString&, const TQString&)), this, TQ_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
+//// disconnect(app->manager, TQ_SIGNAL(adapterModeChanged(const TQString&, const TQString&)), this, TQ_SLOT(slotUpdateToolTip(const TQString&, const TQString&)));
+//// disconnect(app->manager, TQ_SIGNAL(adapterPowerOnChanged(const TQString&, bool)), this, TQ_SLOT(slotPowerOnChanged(const TQString&, bool)));
+// disconnect(app->manager, TQ_SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)),
+// this, TQ_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)));
+// disconnect(app->manager, TQ_SIGNAL(adapterDiscoverableChanged(const TQString&, bool)),
+// this, TQ_SLOT(slotDiscoverableChanged(const TQString&, bool)));
+//// disconnect(app->manager, TQ_SIGNAL(adapterDiscoveringChanged(const TQString&, bool)), this, TQ_SLOT(slotDiscoveringChanged(const TQString&, bool)));
if (deviceWizard)
delete deviceWizard;
@@ -299,7 +299,7 @@ void TrayIcon::setupTray(bool enable)
// Report bug menu item
/*
TDEAction* reportBugAction = KStdAction::reportBug(this,
- SLOT(slotReportBug()), actionCollection());
+ TQ_SLOT(slotReportBug()), actionCollection());
helpActionMenu->insert(reportBugAction);
*/
@@ -319,7 +319,7 @@ void TrayIcon::setupTray(bool enable)
serviceConfigAction = new TDEAction(i18n("Configure &Services..."),
TDEGlobal::iconLoader()->loadIcon("configure", TDEIcon::Small, 16),
TDEShortcut::null(), this, "service_config");
- connect(serviceConfigAction, SIGNAL(activated()), this, SLOT(slotServiceConfig()));
+ connect(serviceConfigAction, TQ_SIGNAL(activated()), this, TQ_SLOT(slotServiceConfig()));
configActionMenu->insert(serviceConfigAction);
*/
@@ -328,7 +328,7 @@ void TrayIcon::setupTray(bool enable)
// configure notifications
/*
TDEAction* notificationAction = KStdAction::configureNotifications(this,
- SLOT(slotConfigureNotifications()), actionCollection());
+ TQ_SLOT(slotConfigureNotifications()), actionCollection());
configActionMenu->insert(notificationAction);
*/
@@ -683,7 +683,7 @@ void TrayIcon::slotAddAdapter(const TQString& path)
ad_a->setChecked(powered);
showPowerOnActionMap.insert(path, ad_a);
- connect(ad_a, SIGNAL(toggled(bool)), this, SLOT(slotPowerOn(bool)));
+ connect(ad_a, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPowerOn(bool)));
KNotifyClient::event(TDEApplication::kApplication()->mainWidget()->winId(),
"AdapterAttached", i18n("BT adapter <b>%1</b> attached<br/>(<b>%2</b>)").arg(name).arg(addr));
@@ -720,7 +720,7 @@ void TrayIcon::slotAddAdapter(const TQString& path)
void TrayIcon::slotRemoveAdapter(const TQString& path)
{
kdDebug() << k_funcinfo << endl; // for debugging MicheleC report
- disconnect(showPowerOnActionMap[path], SIGNAL(toggled(bool)), this, SLOT(slotPowerOn(bool)));
+ disconnect(showPowerOnActionMap[path], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPowerOn(bool)));
if (showPowerOnActionMap[path]->isPlugged())
showPowerOnActionMap[path]->unplug(contextMenu());
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 14:34:45 +0000