diff options
Diffstat (limited to 'src/tdebluez/devicewizard.cpp')
-rw-r--r-- | src/tdebluez/devicewizard.cpp | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/src/tdebluez/devicewizard.cpp b/src/tdebluez/devicewizard.cpp index e190804..26b1de6 100644 --- a/src/tdebluez/devicewizard.cpp +++ b/src/tdebluez/devicewizard.cpp @@ -103,54 +103,54 @@ DeviceWizard::DeviceWizard(TDEBluetoothApp* a) : // connect signals // devicedlg_ext - connect(devicedlg_ext->setupButton, SIGNAL(clicked()), - this, TQT_SLOT(slotSetupNewDevice())); - connect(devicedlg_ext->newdevList, SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotChangeSetupButton(TQListViewItem*))); + connect(devicedlg_ext->setupButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSetupNewDevice())); + connect(devicedlg_ext->newdevList, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotChangeSetupButton(TQListViewItem*))); // deviceBox - connect(deviceBox, SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotDeviceBoxClicked(TQListViewItem*))); + connect(deviceBox, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotDeviceBoxClicked(TQListViewItem*))); // this wizard - connect(addButton, SIGNAL(toggled(bool)), - this, TQT_SLOT(showExtension(bool))); - connect(addButton, SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSearch(bool))); + connect(addButton, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(showExtension(bool))); + connect(addButton, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSearch(bool))); - connect(okButton, SIGNAL(clicked()), - this, SLOT(slotCloseDialog())); + connect(okButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCloseDialog())); - connect(configureButton, SIGNAL(clicked()), - this, TQT_SLOT(slotConfigDevice())); - connect(connectButton, SIGNAL(clicked()), - this, TQT_SLOT(slotConnectButton())); - connect(deleteButton, SIGNAL(clicked()), - this, TQT_SLOT(slotDeleteDevice())); + connect(configureButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotConfigDevice())); + connect(connectButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotConnectButton())); + connect(deleteButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeleteDevice())); // ADAPTER -> DIALOG - connect(app->manager, SIGNAL(adapterDiscoveringChanged(const TQString&, bool)), - this, TQT_SLOT(slotAdapterDiscoveringChanged(const TQString&, bool))); + connect(app->manager, TQ_SIGNAL(adapterDiscoveringChanged(const TQString&, bool)), + this, TQ_SLOT(slotAdapterDiscoveringChanged(const TQString&, bool))); // DEVICE -> DIALOG - connect(app->manager, SIGNAL(deviceConnectedChanged(const TQString&, bool)), - this, TQT_SLOT(slotDeviceConnectedChanged(const TQString&, bool))); - connect(app->manager, SIGNAL(deviceAdded(const TQString&)), - this, TQT_SLOT(slotInsertDevice(const TQString&))); - connect(app->manager, SIGNAL(deviceRemoved(const TQString&)), - this, TQT_SLOT(slotDeviceRemoved(const TQString&))); - connect(app->manager, SIGNAL(deviceNameChanged(const TQString&, const TQString&)), - this, TQT_SLOT(slotDeviceNameChanged(const TQString&, const TQString&))); - connect(app->manager, SIGNAL(deviceAliasChanged(const TQString&, const TQString&)), - this, TQT_SLOT(slotDeviceNameChanged(const TQString&, const TQString&))); - connect(app->manager, SIGNAL(devicePairedChanged(const TQString&,bool)), - this, TQT_SLOT(slotDevicePairedChanged(const TQString&,bool))); - - // connect(app->manager, SIGNAL(mediaControlConnectedChanged(const TQString&,bool)), - // TQT_SLOT(slotMediaControlConnectedChanged(const TQString&,bool))); + connect(app->manager, TQ_SIGNAL(deviceConnectedChanged(const TQString&, bool)), + this, TQ_SLOT(slotDeviceConnectedChanged(const TQString&, bool))); + connect(app->manager, TQ_SIGNAL(deviceAdded(const TQString&)), + this, TQ_SLOT(slotInsertDevice(const TQString&))); + connect(app->manager, TQ_SIGNAL(deviceRemoved(const TQString&)), + this, TQ_SLOT(slotDeviceRemoved(const TQString&))); + connect(app->manager, TQ_SIGNAL(deviceNameChanged(const TQString&, const TQString&)), + this, TQ_SLOT(slotDeviceNameChanged(const TQString&, const TQString&))); + connect(app->manager, TQ_SIGNAL(deviceAliasChanged(const TQString&, const TQString&)), + this, TQ_SLOT(slotDeviceNameChanged(const TQString&, const TQString&))); + connect(app->manager, TQ_SIGNAL(devicePairedChanged(const TQString&,bool)), + this, TQ_SLOT(slotDevicePairedChanged(const TQString&,bool))); + + // connect(app->manager, TQ_SIGNAL(mediaControlConnectedChanged(const TQString&,bool)), + // TQ_SLOT(slotMediaControlConnectedChanged(const TQString&,bool))); chgLogoTimer = new TQTimer(this); - TQObject::connect(chgLogoTimer, SIGNAL(timeout()), this, SLOT(slotUpdateLogo())); + TQObject::connect(chgLogoTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateLogo())); timer = false; } @@ -323,7 +323,7 @@ void DeviceWizard::slotConnectNextProfile() connectingDevice.profiles.pop_front(); if (!connectingDevice.profiles.isEmpty()) - TQTimer::singleShot(CONTIMEOUT, this, TQT_SLOT(slotConnectNextProfile())); + TQTimer::singleShot(CONTIMEOUT, this, TQ_SLOT(slotConnectNextProfile())); } else { @@ -337,7 +337,7 @@ void DeviceWizard::slotConnectNextProfile() i18n("Connection attempts will be interrupted"), KStdGuiItem::quit()); if (status == KMessageBox::Continue) - TQTimer::singleShot(CONTIMEOUT, this, TQT_SLOT(slotConnectNextProfile())); + TQTimer::singleShot(CONTIMEOUT, this, TQ_SLOT(slotConnectNextProfile())); else connectingDevice = {ConState::IDLE, TQString(), TQStringList()}; } @@ -558,8 +558,8 @@ void DeviceWizard::slotAdapterDiscoveringChanged(const TQString& path, bool stat // but also the device should be removed from the bluetooth cache // this means iterate over devicedlg_ext->newdevList and call // adapter->RemoveDevice(object_path, error) on the device - disconnect(app->manager, SIGNAL(deviceRemoved(const TQString&)), - this, TQT_SLOT(slotDeviceRemoved(const TQString&))); + disconnect(app->manager, TQ_SIGNAL(deviceRemoved(const TQString&)), + this, TQ_SLOT(slotDeviceRemoved(const TQString&))); TQListViewItemIterator it2(devicedlg_ext->newdevList); while (it2.current()) { @@ -583,8 +583,8 @@ void DeviceWizard::slotAdapterDiscoveringChanged(const TQString& path, bool stat ++it2; } devicedlg_ext->newdevList->clear(); - connect(app->manager, SIGNAL(deviceRemoved(const TQString&)), - this, TQT_SLOT(slotDeviceRemoved(const TQString&))); + connect(app->manager, TQ_SIGNAL(deviceRemoved(const TQString&)), + this, TQ_SLOT(slotDeviceRemoved(const TQString&))); devicedlg_ext->statusbar->setText(i18n("Device Discovery started")); chgLogoTimer->start(LOGOTIMEOUT); } @@ -615,14 +615,14 @@ void DeviceWizard::slotInsertDevice(const TQString& path) tqDebug(i18n("Device getConnected failed: %1").arg(dbuserr.message())); - connect(app->devices[path], SIGNAL(AsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError)), - this, TQT_SLOT(slotAsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError))); -// connect(app->devices[path], SIGNAL(ConnectAsyncReply(int /*asyncCallId*/)), -// this, TQT_SLOT(slotConnectAsyncReply(int /*asyncCallId*/))); -// connect(app->devices[path], SIGNAL(DisonnectAsyncReply(int /*asyncCallId*/)), -// this, TQT_SLOT(slotDisconnectAsyncReply(int /*asyncCallId*/))); -// connect(app->devices[path], SIGNAL(ConnectProfileAsyncReply(int /*asyncCallId*/)), -// this, TQT_SLOT(slotConnectProfileAsyncReply(int /*asyncCallId*/))); + connect(app->devices[path], TQ_SIGNAL(AsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError)), + this, TQ_SLOT(slotAsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError))); +// connect(app->devices[path], TQ_SIGNAL(ConnectAsyncReply(int /*asyncCallId*/)), +// this, TQ_SLOT(slotConnectAsyncReply(int /*asyncCallId*/))); +// connect(app->devices[path], TQ_SIGNAL(DisonnectAsyncReply(int /*asyncCallId*/)), +// this, TQ_SLOT(slotDisconnectAsyncReply(int /*asyncCallId*/))); +// connect(app->devices[path], TQ_SIGNAL(ConnectProfileAsyncReply(int /*asyncCallId*/)), +// this, TQ_SLOT(slotConnectProfileAsyncReply(int /*asyncCallId*/))); TQListViewItem *devItem = deviceBox->findItem(addr, 2, TQt::ExactMatch); |