diff options
Diffstat (limited to 'src/tdebluez/devicesetupwizard.cpp')
| -rw-r--r-- | src/tdebluez/devicesetupwizard.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/src/tdebluez/devicesetupwizard.cpp b/src/tdebluez/devicesetupwizard.cpp index 521214d..c4e15d0 100644 --- a/src/tdebluez/devicesetupwizard.cpp +++ b/src/tdebluez/devicesetupwizard.cpp @@ -88,16 +88,16 @@ DeviceSetupWizard::DeviceSetupWizard(ObjectManagerImpl* _manager) : pairingTimer = new TQTimer(this); connectTimer = new TQTimer(this); - connect(pairingTimer, SIGNAL(timeout()), this, TQT_SLOT(slotAdvancePairingProgressBar())); - connect(connectTimer, SIGNAL(timeout()), this, TQT_SLOT(slotAdvanceConnectProgressBar())); + connect(pairingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAdvancePairingProgressBar())); + connect(connectTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAdvanceConnectProgressBar())); - connect(manager, SIGNAL(deviceServicesResolvedChanged(const TQString&, bool)), - this, TQT_SLOT(slotDeviceServicesResolvedChanged(const TQString&, bool))); + connect(manager, TQ_SIGNAL(deviceServicesResolvedChanged(const TQString&, bool)), + this, TQ_SLOT(slotDeviceServicesResolvedChanged(const TQString&, bool))); - connect(buttonSrc2Dst, SIGNAL(clicked()), this, SLOT(slotCopySrc2Dst())); - connect(buttonDst2Src, SIGNAL(clicked()), this, SLOT(slotCopyDst2Src())); - connect(cancelPairingButton, SIGNAL(clicked()), this, SLOT(slotCancelPairing())); - connect(cancelConnectButton, SIGNAL(clicked()), this, SLOT(slotCancelConnecting())); + connect(buttonSrc2Dst, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopySrc2Dst())); + connect(buttonDst2Src, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyDst2Src())); + connect(cancelPairingButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCancelPairing())); + connect(cancelConnectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCancelConnecting())); } DeviceSetupWizard::~DeviceSetupWizard() @@ -255,20 +255,20 @@ void DeviceSetupWizard::setDevice(DeviceImpl *_device) if (error.isValid()) tqDebug(i18n("Failed to get trusted status of the new device: %1").arg(error.message())); - connect(device, SIGNAL(PairAsyncReply(int /*asyncCallId*/)), - this, TQT_SLOT(slotPairAsyncReply(int /*asyncCallId*/))); - connect(device, SIGNAL(CancelPairingAsyncReply(int /*asyncCallId*/)), - this, TQT_SLOT(slotCancelPairingAsyncReply(int /*asyncCallId*/))); - connect(device, SIGNAL(AsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError)), - this, TQT_SLOT(slotAsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError))); - connect(device, SIGNAL(ConnectAsyncReply(int /*asyncCallId*/)), - this, TQT_SLOT(slotConnectAsyncReply(int /*asyncCallId*/))); -// connect(device, SIGNAL(DisonnectAsyncReply(int /*asyncCallId*/)), -// this, TQT_SLOT(slotDisconnectAsyncReply(int /*asyncCallId*/))); - connect(device, SIGNAL(ConnectProfileAsyncReply(int /*asyncCallId*/)), - this, TQT_SLOT(slotConnectProfileAsyncReply(int /*asyncCallId*/))); -// connect(device, SIGNAL(DisconnectProfileAsyncReply(int /*asyncCallId*/)), -// this, TQT_SLOT(slotDisconnectProfileAsyncReply(int /*asyncCallId*/))); + connect(device, TQ_SIGNAL(PairAsyncReply(int /*asyncCallId*/)), + this, TQ_SLOT(slotPairAsyncReply(int /*asyncCallId*/))); + connect(device, TQ_SIGNAL(CancelPairingAsyncReply(int /*asyncCallId*/)), + this, TQ_SLOT(slotCancelPairingAsyncReply(int /*asyncCallId*/))); + connect(device, TQ_SIGNAL(AsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError)), + this, TQ_SLOT(slotAsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError))); + connect(device, TQ_SIGNAL(ConnectAsyncReply(int /*asyncCallId*/)), + this, TQ_SLOT(slotConnectAsyncReply(int /*asyncCallId*/))); +// connect(device, TQ_SIGNAL(DisonnectAsyncReply(int /*asyncCallId*/)), +// this, TQ_SLOT(slotDisconnectAsyncReply(int /*asyncCallId*/))); + connect(device, TQ_SIGNAL(ConnectProfileAsyncReply(int /*asyncCallId*/)), + this, TQ_SLOT(slotConnectProfileAsyncReply(int /*asyncCallId*/))); +// connect(device, TQ_SIGNAL(DisconnectProfileAsyncReply(int /*asyncCallId*/)), +// this, TQ_SLOT(slotDisconnectProfileAsyncReply(int /*asyncCallId*/))); } void DeviceSetupWizard::updateServiceList() @@ -421,20 +421,20 @@ void DeviceSetupWizard::closeDevice() if (!device) return; - disconnect(device, SIGNAL(PairAsyncReply(int /*asyncCallId*/)), - this, TQT_SLOT(slotPairAsyncReply(int /*asyncCallId*/))); - disconnect(device, SIGNAL(CancelPairingAsyncReply(int /*asyncCallId*/)), - this, TQT_SLOT(slotCancelPairingAsyncReply(int /*asyncCallId*/))); - disconnect(device, SIGNAL(AsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError)), - this, TQT_SLOT(slotAsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError))); - disconnect(device, SIGNAL(ConnectAsyncReply(int /*asyncCallId*/)), - this, TQT_SLOT(slotConnectAsyncReply(int /*asyncCallId*/))); -// disconnect(device, SIGNAL(DisonnectAsyncReply(int /*asyncCallId*/)), -// this, TQT_SLOT(slotDisconnectAsyncReply(int /*asyncCallId*/))); - disconnect(device, SIGNAL(ConnectProfileAsyncReply(int /*asyncCallId*/)), - this, TQT_SLOT(slotConnectProfileAsyncReply(int /*asyncCallId*/))); -// connect(device, SIGNAL(DisconnectProfileAsyncReply(int /*asyncCallId*/)), -// this, TQT_SLOT(slotDisconnectProfileAsyncReply(int /*asyncCallId*/))); + disconnect(device, TQ_SIGNAL(PairAsyncReply(int /*asyncCallId*/)), + this, TQ_SLOT(slotPairAsyncReply(int /*asyncCallId*/))); + disconnect(device, TQ_SIGNAL(CancelPairingAsyncReply(int /*asyncCallId*/)), + this, TQ_SLOT(slotCancelPairingAsyncReply(int /*asyncCallId*/))); + disconnect(device, TQ_SIGNAL(AsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError)), + this, TQ_SLOT(slotAsyncErrorResponseDetected(int /*asyncCallId*/, const TQT_DBusError))); + disconnect(device, TQ_SIGNAL(ConnectAsyncReply(int /*asyncCallId*/)), + this, TQ_SLOT(slotConnectAsyncReply(int /*asyncCallId*/))); +// disconnect(device, TQ_SIGNAL(DisonnectAsyncReply(int /*asyncCallId*/)), +// this, TQ_SLOT(slotDisconnectAsyncReply(int /*asyncCallId*/))); + disconnect(device, TQ_SIGNAL(ConnectProfileAsyncReply(int /*asyncCallId*/)), + this, TQ_SLOT(slotConnectProfileAsyncReply(int /*asyncCallId*/))); +// connect(device, TQ_SIGNAL(DisconnectProfileAsyncReply(int /*asyncCallId*/)), +// this, TQ_SLOT(slotDisconnectProfileAsyncReply(int /*asyncCallId*/))); preferredProfiles.clear(); address = TQString(); @@ -533,7 +533,7 @@ void DeviceSetupWizard::slotConnectProfileAsyncReply(int asyncCallId) if (!preferredProfiles.isEmpty() && connectTimer->isActive()) // delay connecting next profile to prevent error InProgress - TQTimer::singleShot(CONNECT_TIMEOUT, this, TQT_SLOT(slotConnectNextProfile())); + TQTimer::singleShot(CONNECT_TIMEOUT, this, TQ_SLOT(slotConnectNextProfile())); else slotConnectTimeOut(); } |