From b05bbf90f3b7b82b722dfc584e9b040b0803d771 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 5 Jan 2024 10:36:11 +0900 Subject: [PATCH] Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- src/libtdebluez/objectmanagerImpl.cpp | 26 ++-- src/libtdeobex/obexobjectmanagerImpl.cpp | 6 +- src/tdebluez/adapterconfig.cpp | 130 +++++++++--------- src/tdebluez/adapterconfigdialog.cpp | 16 +-- src/tdebluez/application.cpp | 14 +- src/tdebluez/devicesetupwizard.cpp | 74 +++++----- src/tdebluez/devicewizard.cpp | 100 +++++++------- src/tdebluez/mediacontrol.cpp | 16 +-- src/tdebluez/trayicon.cpp | 100 +++++++------- src/tdebluezauth/application.cpp | 12 +- src/tdebluezauth/authorize.cpp | 2 +- src/tdebluezauth/pindialog.cpp | 2 +- src/tdebluezioclient/commandhandler.cpp | 22 +-- .../bluetooth/tdeiobluetooth.cpp | 12 +- src/tdebluezioslave/obex/obex.cpp | 2 +- src/tdebluezioslave/obex/tdeio_obex.cpp | 4 +- 16 files changed, 269 insertions(+), 269 deletions(-) diff --git a/src/libtdebluez/objectmanagerImpl.cpp b/src/libtdebluez/objectmanagerImpl.cpp index 96cb83e..f75d173 100644 --- a/src/libtdebluez/objectmanagerImpl.cpp +++ b/src/libtdebluez/objectmanagerImpl.cpp @@ -106,10 +106,10 @@ TQT_DBusConnection* ObjectManagerImpl::getConnection() */ bool ObjectManagerImpl::close() { - disconnect(this, SIGNAL(InterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >&)), - this, SLOT(slotInterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >& ))); - disconnect(this, SIGNAL(InterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& )), - this, SLOT(slotInterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& ))); + disconnect(this, TQ_SIGNAL(InterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >&)), + this, TQ_SLOT(slotInterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >& ))); + disconnect(this, TQ_SIGNAL(InterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& )), + this, TQ_SLOT(slotInterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& ))); for (PropertiesMap::iterator it = adapters.begin(); it != adapters.end(); ++it) @@ -259,7 +259,7 @@ bool ObjectManagerImpl::initDBUS() if (!dBusConn.isConnected()) { tqDebug(i18n("Failed to open connection to system message bus: %1").arg(dBusConn.lastError().message())); - TQTimer::singleShot(4000, this, TQT_SLOT(reconnect())); + TQTimer::singleShot(4000, this, TQ_SLOT(reconnect())); return false; } setConnection(dBusConn); @@ -281,10 +281,10 @@ bool ObjectManagerImpl::initDBUS() tqWarning(i18n("Failed to convert dbus data to string map: %1").arg(it.key())); } - connect(this, SIGNAL(InterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >&)), - this, SLOT(slotInterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >& ))); - connect(this, SIGNAL(InterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& )), - this, SLOT(slotInterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& ))); + connect(this, TQ_SIGNAL(InterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >&)), + this, TQ_SLOT(slotInterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >& ))); + connect(this, TQ_SIGNAL(InterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& )), + this, TQ_SLOT(slotInterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& ))); return true; } @@ -418,7 +418,7 @@ void ObjectManagerImpl::slotInterfacesAdded(const TQT_DBusObjectPath& object, co org::freedesktop::DBus::PropertiesProxy *properties; properties = new org::freedesktop::DBus::PropertiesProxy("org.bluez", object); properties->setConnection(dBusConn); - connect(properties, SIGNAL(PropertiesChanged ( const TQString&, const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& )), this, SLOT(slotPropertiesChanged ( const TQString& , const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& ))); + connect(properties, TQ_SIGNAL(PropertiesChanged ( const TQString&, const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& )), this, TQ_SLOT(slotPropertiesChanged ( const TQString& , const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& ))); adapters.insert(TQString(object), properties); //notify others emit adapterAdded(TQString(object)); @@ -443,7 +443,7 @@ void ObjectManagerImpl::slotInterfacesAdded(const TQT_DBusObjectPath& object, co org::freedesktop::DBus::PropertiesProxy *properties; properties = new org::freedesktop::DBus::PropertiesProxy("org.bluez", object); properties->setConnection(dBusConn); - connect(properties, SIGNAL(PropertiesChanged ( const TQString&, const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& )), this, SLOT(slotPropertiesChanged ( const TQString& , const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& ))); + connect(properties, TQ_SIGNAL(PropertiesChanged ( const TQString&, const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& )), this, TQ_SLOT(slotPropertiesChanged ( const TQString& , const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& ))); devices.insert(TQString(object), properties); //notify others emit deviceAdded(TQString(object)); @@ -497,7 +497,7 @@ void ObjectManagerImpl::slotInterfacesRemoved(const TQT_DBusObjectPath& object, else if ((*it) == "org.bluez.Adapter1") { kdDebug() << "Remove org.bluez.Adapter1" << endl; - disconnect(adapters[object], SIGNAL(PropertiesChanged ( const TQString&, const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& )), this, SLOT(slotPropertiesChanged ( const TQString& , const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& ))); + disconnect(adapters[object], TQ_SIGNAL(PropertiesChanged ( const TQString&, const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& )), this, TQ_SLOT(slotPropertiesChanged ( const TQString& , const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& ))); adapters.remove(object); emit adapterRemoved(TQString(object)); } @@ -519,7 +519,7 @@ void ObjectManagerImpl::slotInterfacesRemoved(const TQT_DBusObjectPath& object, else if ((*it) == "org.bluez.Device1") { kdDebug() << "Remove org.bluez.Device1" << endl; - disconnect(devices[object], SIGNAL(PropertiesChanged ( const TQString&, const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& )), this, SLOT(slotPropertiesChanged ( const TQString& , const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& ))); + disconnect(devices[object], TQ_SIGNAL(PropertiesChanged ( const TQString&, const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& )), this, TQ_SLOT(slotPropertiesChanged ( const TQString& , const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& ))); devices.remove(object); emit deviceRemoved(TQString(object)); } diff --git a/src/libtdeobex/obexobjectmanagerImpl.cpp b/src/libtdeobex/obexobjectmanagerImpl.cpp index 50c59fe..a310869 100644 --- a/src/libtdeobex/obexobjectmanagerImpl.cpp +++ b/src/libtdeobex/obexobjectmanagerImpl.cpp @@ -130,7 +130,7 @@ bool ObexObjectManagerImpl::initDBUS() if (!dBusConn.isConnected()) { kdError() << "Failed to open connection to system message bus: " << dBusConn.lastError().message() << endl; - TQTimer::singleShot(4000, this, TQT_SLOT(reconnect())); + TQTimer::singleShot(4000, this, TQ_SLOT(reconnect())); return false; } setConnection(dBusConn); @@ -156,8 +156,8 @@ bool ObexObjectManagerImpl::initDBUS() slotInterfacesAdded(it.key(), tqMap1); } - connect(this, SIGNAL(InterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >&)), this, SLOT(slotInterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >& ))); - connect(this, SIGNAL(InterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& )), this, SLOT(slotInterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& ))); + connect(this, TQ_SIGNAL(InterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >&)), this, TQ_SLOT(slotInterfacesAdded(const TQT_DBusObjectPath&, const TQT_DBusDataMap< TQString >& ))); + connect(this, TQ_SIGNAL(InterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& )), this, TQ_SLOT(slotInterfacesRemoved(const TQT_DBusObjectPath& , const TQStringList& ))); return true; } diff --git a/src/tdebluez/adapterconfig.cpp b/src/tdebluez/adapterconfig.cpp index c0e354a..f8932c2 100644 --- a/src/tdebluez/adapterconfig.cpp +++ b/src/tdebluez/adapterconfig.cpp @@ -53,26 +53,26 @@ AdapterConfig::AdapterConfig(ObjectManagerImpl *mgr, AdapterImpl *a) addAdapterDialogInfo(); // ADAPTER -> MANAGER -> DIALOG - connect(manager, SIGNAL(adapterNameChanged(const TQString&,const TQString&)), - this, TQT_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); - connect(manager, SIGNAL(adapterAliasChanged(const TQString&,const TQString&)), - this, TQT_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); + connect(manager, TQ_SIGNAL(adapterNameChanged(const TQString&,const TQString&)), + this, TQ_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); + connect(manager, TQ_SIGNAL(adapterAliasChanged(const TQString&,const TQString&)), + this, TQ_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); - connect(manager, SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)), - this, TQT_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32))); - connect(manager, SIGNAL(adapterDiscoverableChanged(const TQString&, bool)), - this, TQT_SLOT(slotDiscoverableChanged(const TQString&, bool))); - connect(manager, SIGNAL(adapterPowerOnChanged(const TQString&, bool)), this, TQT_SLOT(slotPowerOnChanged(const TQString&, bool))); + connect(manager, TQ_SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)), + this, TQ_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32))); + connect(manager, TQ_SIGNAL(adapterDiscoverableChanged(const TQString&, bool)), + this, TQ_SLOT(slotDiscoverableChanged(const TQString&, bool))); + connect(manager, TQ_SIGNAL(adapterPowerOnChanged(const TQString&, bool)), this, TQ_SLOT(slotPowerOnChanged(const TQString&, bool))); // DIALOG -> ADAPTER - connect(adapterDialog->adapterName, SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotChangeName(const TQString &))); - connect(adapterDialog->deviceModes, SIGNAL(activated(int)), - this, TQT_SLOT(slotSetMode(int))); -// connect(adapterDialog->deviceClass, SIGNAL(activated(const TQString &)), - // this, TQT_SLOT(slotSetClass(const TQString &))); - connect(adapterDialog->sliderTimeout, SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotChangeTimeout(int))); + connect(adapterDialog->adapterName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotChangeName(const TQString &))); + connect(adapterDialog->deviceModes, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSetMode(int))); +// connect(adapterDialog->deviceClass, TQ_SIGNAL(activated(const TQString &)), + // this, TQ_SLOT(slotSetClass(const TQString &))); + connect(adapterDialog->sliderTimeout, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotChangeTimeout(int))); adapterDialog->setModal(false); } @@ -161,13 +161,13 @@ void AdapterConfig::slotAdapterNameChanged(const TQString &path, const TQString if (path != adapter->getPath()) return; name = n; - disconnect(adapterDialog->adapterName, SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotChangeName(const TQString &))); + disconnect(adapterDialog->adapterName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotChangeName(const TQString &))); adapterDialog->adapterName->setText(name); - connect(adapterDialog->adapterName, SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotChangeName(const TQString &))); + connect(adapterDialog->adapterName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotChangeName(const TQString &))); } void AdapterConfig::slotPowerOnChanged(const TQString &path, bool state) @@ -189,10 +189,10 @@ void AdapterConfig::slotDiscoverableChanged(const TQString &path, bool changed) TQ_UINT32 timeout = adapter->getDiscoverableTimeout(dbuserr); if (dbuserr.isValid()) tqDebug(i18n("Get discoverable timeout for the adapter failed: %1").arg(dbuserr.message())); - disconnect(adapterDialog->deviceModes, SIGNAL(activated(int)), - this, TQT_SLOT(slotSetMode(int))); - disconnect(adapterDialog->sliderTimeout, SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotChangeTimeout(int))); + disconnect(adapterDialog->deviceModes, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSetMode(int))); + disconnect(adapterDialog->sliderTimeout, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotChangeTimeout(int))); if (changed) { @@ -226,10 +226,10 @@ void AdapterConfig::slotDiscoverableChanged(const TQString &path, bool changed) adapterDialog->timeout->setEnabled(false); adapterDialog->textLabel9->setEnabled(false); } - connect(adapterDialog->deviceModes, SIGNAL(activated(int)), - this, TQT_SLOT(slotSetMode(int))); - connect(adapterDialog->sliderTimeout, SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotChangeTimeout(int))); + connect(adapterDialog->deviceModes, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSetMode(int))); + connect(adapterDialog->sliderTimeout, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotChangeTimeout(int))); } void AdapterConfig::slotDiscoverableTimeoutChanged(const TQString &path, TQ_UINT32 timeout) @@ -237,8 +237,8 @@ void AdapterConfig::slotDiscoverableTimeoutChanged(const TQString &path, TQ_UINT if (path != adapter->getPath()) return; - disconnect(adapterDialog->sliderTimeout, SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotChangeTimeout(int))); + disconnect(adapterDialog->sliderTimeout, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotChangeTimeout(int))); if (timeout == 0) { @@ -257,8 +257,8 @@ void AdapterConfig::slotDiscoverableTimeoutChanged(const TQString &path, TQ_UINT adapterDialog->timeout->setEnabled(true); adapterDialog->textLabel9->setEnabled(true); } - connect(adapterDialog->sliderTimeout, SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotChangeTimeout(int))); + connect(adapterDialog->sliderTimeout, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotChangeTimeout(int))); } // from dialog @@ -270,20 +270,20 @@ void AdapterConfig::slotChangeName(const TQString &n) { //otherwise signal textchanged() from the dialog and slot nameChanged //from the adapter will end in a endless loop. - disconnect(manager, SIGNAL(adapterNameChanged(const TQString&,const TQString&)), - this, TQT_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); - disconnect(manager, SIGNAL(adapterAliasChanged(const TQString&,const TQString&)), - this, TQT_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); + disconnect(manager, TQ_SIGNAL(adapterNameChanged(const TQString&,const TQString&)), + this, TQ_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); + disconnect(manager, TQ_SIGNAL(adapterAliasChanged(const TQString&,const TQString&)), + this, TQ_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); // adapterDialog->adapterName->setText(name); adapter->setAlias(name, dbuserr); if (dbuserr.isValid()) tqDebug(i18n("Set alias for the adapter failed: %1").arg(dbuserr.message())); - connect(manager, SIGNAL(adapterNameChanged(const TQString&,const TQString&)), - this, TQT_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); - connect(manager, SIGNAL(adapterAliasChanged(const TQString&,const TQString&)), - this, TQT_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); + connect(manager, TQ_SIGNAL(adapterNameChanged(const TQString&,const TQString&)), + this, TQ_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); + connect(manager, TQ_SIGNAL(adapterAliasChanged(const TQString&,const TQString&)), + this, TQ_SLOT(slotAdapterNameChanged(const TQString&, const TQString&))); } } @@ -293,10 +293,10 @@ void AdapterConfig::slotChangeTimeout(int timeout) // D-Bus signal get emmited immeditaly .. // and would trigger a endless loop of signals! TQT_DBusError dbuserr; - disconnect(manager, SIGNAL(adapterDiscoverableChanged(const TQString&, bool)), - this, TQT_SLOT(slotDiscoverableChanged(const TQString&, bool))); - disconnect(manager, SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)), - this, TQT_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32))); + disconnect(manager, TQ_SIGNAL(adapterDiscoverableChanged(const TQString&, bool)), + this, TQ_SLOT(slotDiscoverableChanged(const TQString&, bool))); + disconnect(manager, TQ_SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)), + this, TQ_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32))); adapterDialog->timeout->setNum(int(timeout) / 60); adapterDialog->sliderTimeout->setValue(int(timeout)); @@ -305,10 +305,10 @@ void AdapterConfig::slotChangeTimeout(int timeout) if (dbuserr.isValid()) tqDebug(i18n("Set discoverable timeout for the adapter failed: %1").arg(dbuserr.message())); - connect(manager, SIGNAL(adapterDiscoverableChanged(const TQString&, bool)), - this, TQT_SLOT(slotDiscoverableChanged(const TQString&, bool))); - connect(manager, SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)), - this, TQT_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32))); + connect(manager, TQ_SIGNAL(adapterDiscoverableChanged(const TQString&, bool)), + this, TQ_SLOT(slotDiscoverableChanged(const TQString&, bool))); + connect(manager, TQ_SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)), + this, TQ_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32))); } void AdapterConfig::slotSetMode(int modenr) @@ -322,14 +322,14 @@ void AdapterConfig::slotSetMode(int modenr) // Disconnect signal of valueChanged! // D-Bus signal get emmited immeditaly .. // and would trigger a endless loop of signals! - disconnect(adapterDialog->deviceModes, SIGNAL(activated(int)), - this, TQT_SLOT(slotSetMode(int))); - disconnect(adapterDialog->sliderTimeout, SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotChangeTimeout(int))); - disconnect(manager, SIGNAL(adapterDiscoverableChanged(const TQString&, bool)), - this, TQT_SLOT(slotDiscoverableChanged(const TQString&, bool))); - disconnect(manager, SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)), - this, TQT_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32))); + disconnect(adapterDialog->deviceModes, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSetMode(int))); + disconnect(adapterDialog->sliderTimeout, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotChangeTimeout(int))); + disconnect(manager, TQ_SIGNAL(adapterDiscoverableChanged(const TQString&, bool)), + this, TQ_SLOT(slotDiscoverableChanged(const TQString&, bool))); + disconnect(manager, TQ_SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)), + this, TQ_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32))); switch (modenr) { @@ -360,15 +360,15 @@ void AdapterConfig::slotSetMode(int modenr) if (dbuserr.isValid()) tqDebug(i18n("Get discoverable for the adapter failed: %1").arg(dbuserr.message())); - connect(adapterDialog->deviceModes, SIGNAL(activated(int)), - this, TQT_SLOT(slotSetMode(int))); - connect(adapterDialog->sliderTimeout, SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotChangeTimeout(int))); + connect(adapterDialog->deviceModes, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSetMode(int))); + connect(adapterDialog->sliderTimeout, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotChangeTimeout(int))); - connect(manager, SIGNAL(adapterDiscoverableChanged(const TQString&, bool)), - this, TQT_SLOT(slotDiscoverableChanged(const TQString&, bool))); - connect(manager, SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)), - this, TQT_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32))); + connect(manager, TQ_SIGNAL(adapterDiscoverableChanged(const TQString&, bool)), + this, TQ_SLOT(slotDiscoverableChanged(const TQString&, bool))); + connect(manager, TQ_SIGNAL(adapterDiscoverableTimeoutChanged(const TQString&, TQ_UINT32)), + this, TQ_SLOT(slotDiscoverableTimeoutChanged(const TQString&, TQ_UINT32))); } void AdapterConfig::slotSetClass(const TQString & deviceClass) diff --git a/src/tdebluez/adapterconfigdialog.cpp b/src/tdebluez/adapterconfigdialog.cpp index 31caa27..fc3bd5e 100644 --- a/src/tdebluez/adapterconfigdialog.cpp +++ b/src/tdebluez/adapterconfigdialog.cpp @@ -48,10 +48,10 @@ AdapterConfigDialog::AdapterConfigDialog(TDEBluetoothApp *_app) : setMainWidget(tabWidget); setModal(false); - connect(this, SIGNAL(okClicked()), this, TQT_SLOT(hide())); - connect(manager, SIGNAL(adapterAdded(const TQString&)), TQT_SLOT(addAdapter(const TQString&))); - connect(manager, SIGNAL(adapterRemoved(const TQString&)), TQT_SLOT(removeAdapter(const TQString&))); - connect(tabWidget, SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(slotCurrentChanged(TQWidget *))); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(hide())); + connect(manager, TQ_SIGNAL(adapterAdded(const TQString&)), TQ_SLOT(addAdapter(const TQString&))); + connect(manager, TQ_SIGNAL(adapterRemoved(const TQString&)), TQ_SLOT(removeAdapter(const TQString&))); + connect(tabWidget, TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(slotCurrentChanged(TQWidget *))); } AdapterConfigDialog::~AdapterConfigDialog() @@ -81,10 +81,10 @@ void AdapterConfigDialog::addAdapter(const TQString &path) // } adapterList.insert(path, aconfig); - connect(aconfig->dialog()->adapterName, SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotChangeName(const TQString &))); - connect(aconfig->dialog()->adapterName, SIGNAL(textChanged(const TQString &)), - app->adapters[path], TQT_SLOT(slotSetAlias(const TQString &))); + connect(aconfig->dialog()->adapterName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotChangeName(const TQString &))); + connect(aconfig->dialog()->adapterName, TQ_SIGNAL(textChanged(const TQString &)), + app->adapters[path], TQ_SLOT(slotSetAlias(const TQString &))); if (nodevice) { diff --git a/src/tdebluez/application.cpp b/src/tdebluez/application.cpp index bd08437..6ddeb85 100644 --- a/src/tdebluez/application.cpp +++ b/src/tdebluez/application.cpp @@ -193,11 +193,11 @@ TDEBluetoothApp::TDEBluetoothApp() : } // connect to manager signals - connect(manager, SIGNAL(adapterAdded(const TQString&)), TQT_SLOT(slotAdapterAdded(const TQString&))); - connect(manager, SIGNAL(adapterRemoved(const TQString&)), TQT_SLOT(slotAdapterRemoved(const TQString&))); - connect(manager, SIGNAL(deviceAdded(const TQString&)), TQT_SLOT(slotDeviceAdded(const TQString&))); - connect(manager, SIGNAL(deviceRemoved(const TQString&)), TQT_SLOT(slotDeviceRemoved(const TQString&))); -// connect(manager, SIGNAL(adapterPowerOnChanged(const TQString&, bool)), SLOT(slotPowerOnChanged(const TQString&, bool))); + connect(manager, TQ_SIGNAL(adapterAdded(const TQString&)), TQ_SLOT(slotAdapterAdded(const TQString&))); + connect(manager, TQ_SIGNAL(adapterRemoved(const TQString&)), TQ_SLOT(slotAdapterRemoved(const TQString&))); + connect(manager, TQ_SIGNAL(deviceAdded(const TQString&)), TQ_SLOT(slotDeviceAdded(const TQString&))); + connect(manager, TQ_SIGNAL(deviceRemoved(const TQString&)), TQ_SLOT(slotDeviceRemoved(const TQString&))); +// connect(manager, TQ_SIGNAL(adapterPowerOnChanged(const TQString&, bool)), TQ_SLOT(slotPowerOnChanged(const TQString&, bool))); trayIcon = new TrayIcon(this); setMainWidget(trayIcon); @@ -270,7 +270,7 @@ bool TDEBluetoothApp::stopAuthAgent() if (authAgent->isRunning()) { authAgent->tryTerminate(); - TQTimer::singleShot(m_waitBeforeKill, authAgent, SLOT(kill())); + TQTimer::singleShot(m_waitBeforeKill, authAgent, TQ_SLOT(kill())); } return true; } @@ -290,7 +290,7 @@ bool TDEBluetoothApp::stopObexSrv() if (obexServer->isRunning()) { obexServer->tryTerminate(); - TQTimer::singleShot(m_waitBeforeKill, obexServer, SLOT(kill())); + TQTimer::singleShot(m_waitBeforeKill, obexServer, TQ_SLOT(kill())); } return true; } 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(); } 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); diff --git a/src/tdebluez/mediacontrol.cpp b/src/tdebluez/mediacontrol.cpp index 523ba56..2a8b585 100644 --- a/src/tdebluez/mediacontrol.cpp +++ b/src/tdebluez/mediacontrol.cpp @@ -53,15 +53,15 @@ MediaControl::MediaControl(TQString path, TQT_DBusConnection *conn) : mediaCtlProxy = new org::bluez::MediaControl1Proxy("org.bluez", path); mediaCtlProxy->setConnection((*(conn))); - connect((TQObject*) tQPushButtonPlay, SIGNAL(clicked()), this, TQT_SLOT(slotPlay())); - connect((TQObject*) tQPushButtonPlay, SIGNAL(toggled(bool)), this, TQT_SLOT(slotPlayToggled(bool))); - connect((TQObject*) tQPushButtonSeekForward, SIGNAL(clicked()), this, TQT_SLOT(slotFastForward())); - connect((TQObject*) tQPushButtonSeekBackward, SIGNAL(clicked()), this, TQT_SLOT(slotRewind())); - connect((TQObject*) tQPushButtonForward, SIGNAL(clicked()), this, TQT_SLOT(slotNext())); - connect((TQObject*) tQPushButtonBackward, SIGNAL(clicked()), this, TQT_SLOT(slotPrevious())); - connect((TQObject*) tQPushButtonStop, SIGNAL(clicked()), this, TQT_SLOT(slotStop())); + connect((TQObject*) tQPushButtonPlay, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPlay())); + connect((TQObject*) tQPushButtonPlay, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPlayToggled(bool))); + connect((TQObject*) tQPushButtonSeekForward, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFastForward())); + connect((TQObject*) tQPushButtonSeekBackward, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRewind())); + connect((TQObject*) tQPushButtonForward, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNext())); + connect((TQObject*) tQPushButtonBackward, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrevious())); + connect((TQObject*) tQPushButtonStop, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStop())); // tQProgressSlider - connect((TQObject*) tQVolumeSlider, SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVolumeValueChanged(int))); + connect((TQObject*) tQVolumeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVolumeValueChanged(int))); // tQPushButtonRepeat show(); } 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 %1 attached
(%2)").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()); diff --git a/src/tdebluezauth/application.cpp b/src/tdebluezauth/application.cpp index b546a89..b419e43 100644 --- a/src/tdebluezauth/application.cpp +++ b/src/tdebluezauth/application.cpp @@ -72,16 +72,16 @@ TDEBluezAuth::TDEBluezAuth() : disableSessionManagement(); // connect to manager signals -// connect(manager, SIGNAL(adapterAdded(const TQString&)), SLOT(slotAdapterAdded(const TQString&))); -// connect(manager, SIGNAL(adapterRemoved(const TQString&)), SLOT(slotAdapterRemoved(const TQString&))); - connect(manager, SIGNAL(adapterPowerOnChanged(const TQString&, bool)), - this, SLOT(slotPowerOnChanged(const TQString&, bool))); +// connect(manager, TQ_SIGNAL(adapterAdded(const TQString&)), TQ_SLOT(slotAdapterAdded(const TQString&))); +// connect(manager, TQ_SIGNAL(adapterRemoved(const TQString&)), TQ_SLOT(slotAdapterRemoved(const TQString&))); + connect(manager, TQ_SIGNAL(adapterPowerOnChanged(const TQString&, bool)), + this, TQ_SLOT(slotPowerOnChanged(const TQString&, bool))); } TDEBluezAuth::~TDEBluezAuth() { - disconnect(manager, SIGNAL(adapterPowerOnChanged(const TQString&, bool)), - this, SLOT(slotPowerOnChanged(const TQString&, bool))); + disconnect(manager, TQ_SIGNAL(adapterPowerOnChanged(const TQString&, bool)), + this, TQ_SLOT(slotPowerOnChanged(const TQString&, bool))); // close D-Bus connection unconfigureAgent(); diff --git a/src/tdebluezauth/authorize.cpp b/src/tdebluezauth/authorize.cpp index 739c344..98165fa 100644 --- a/src/tdebluezauth/authorize.cpp +++ b/src/tdebluezauth/authorize.cpp @@ -41,7 +41,7 @@ AuthorizeDialog::AuthorizeDialog(const TQString &addr, const TQString &devName, authDlg = new AuthDialog(this); authDlg->messageLabel->setText(authDlg->messageLabel->text().arg(action)); - connect(this, SIGNAL(okClicked()), SLOT(close())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(close())); setMainWidget(authDlg); } diff --git a/src/tdebluezauth/pindialog.cpp b/src/tdebluezauth/pindialog.cpp index 7f31b89..cca5197 100644 --- a/src/tdebluezauth/pindialog.cpp +++ b/src/tdebluezauth/pindialog.cpp @@ -35,7 +35,7 @@ PinDialog::PinDialog(const TQString &addr, const TQString &devName) : pinDlg->pinEdit->setFocus(); - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(setPin())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(setPin())); setMainWidget(pinDlg); } diff --git a/src/tdebluezioclient/commandhandler.cpp b/src/tdebluezioclient/commandhandler.cpp index ca1fde1..0de5254 100644 --- a/src/tdebluezioclient/commandhandler.cpp +++ b/src/tdebluezioclient/commandhandler.cpp @@ -111,11 +111,11 @@ void CommandHandler::start() void CommandHandler::commonConnect(TDEIO::Job* job) { - connect(job, SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - this, SLOT(slotInfoMessage(TDEIO::Job*,const TQString&))); - connect(job, SIGNAL(percent (TDEIO::Job*, unsigned long)), - this, SLOT(slotPercent(TDEIO::Job*, unsigned long))); - connect(job, SIGNAL(result(TDEIO::Job*)), this, SLOT(slotFinished(TDEIO::Job*))); + connect(job, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + this, TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&))); + connect(job, TQ_SIGNAL(percent (TDEIO::Job*, unsigned long)), + this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotFinished(TDEIO::Job*))); } KURL::List CommandHandler::urlList(const TQStringList& sources) @@ -136,8 +136,8 @@ void CommandHandler::list(const TQString& target) TDEIO::ListJob* job = TDEIO::listDir(KURL(target), showProgressWindow, showHidden); this->job = job; commonConnect(job); - connect(job, SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), - this, SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(job, TQ_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), + this, TQ_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))); } void CommandHandler::get(const TQString& target) @@ -146,8 +146,8 @@ void CommandHandler::get(const TQString& target) TDEIO::TransferJob* job = TDEIO::get(KURL(target), reload, showProgressWindow); this->job = job; commonConnect(job); - connect(job, SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - this, SLOT(slotData(TDEIO::Job*,const TQByteArray&))); + connect(job, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*,const TQByteArray&))); } void CommandHandler::put(const TQString& target) @@ -158,8 +158,8 @@ void CommandHandler::put(const TQString& target) overwrite, resume, showProgressWindow); this->job = job; commonConnect(job); - connect(job, SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), - this, SLOT(slotDataReq(TDEIO::Job*,TQByteArray&))); + connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), + this, TQ_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&))); } void CommandHandler::mkdir(const TQString& target) diff --git a/src/tdebluezioslave/bluetooth/tdeiobluetooth.cpp b/src/tdebluezioslave/bluetooth/tdeiobluetooth.cpp index cbeead4..d6d6b84 100644 --- a/src/tdebluezioslave/bluetooth/tdeiobluetooth.cpp +++ b/src/tdebluezioslave/bluetooth/tdeiobluetooth.cpp @@ -93,12 +93,12 @@ TDEioBluetooth::TDEioBluetooth(const TQCString &protocol, const TQCString &pool_ break; } } - connect(manager, SIGNAL(deviceAdded(const TQString &)), - this, SLOT(slotAddDevice(const TQString &))); - connect(manager, SIGNAL(deviceRemoved(const TQString &)), - this, SLOT(slotRemoveDevice(const TQString &))); - connect(manager, SIGNAL(adapterPowerOnChanged(const TQString&, bool )), - this, SLOT(slotAdapterPowerOnChanged(const TQString &, bool ))); + connect(manager, TQ_SIGNAL(deviceAdded(const TQString &)), + this, TQ_SLOT(slotAddDevice(const TQString &))); + connect(manager, TQ_SIGNAL(deviceRemoved(const TQString &)), + this, TQ_SLOT(slotRemoveDevice(const TQString &))); + connect(manager, TQ_SIGNAL(adapterPowerOnChanged(const TQString&, bool )), + this, TQ_SLOT(slotAdapterPowerOnChanged(const TQString &, bool ))); } else { diff --git a/src/tdebluezioslave/obex/obex.cpp b/src/tdebluezioslave/obex/obex.cpp index fb1d81b..63d6082 100644 --- a/src/tdebluezioslave/obex/obex.cpp +++ b/src/tdebluezioslave/obex/obex.cpp @@ -279,7 +279,7 @@ UDSEntry Obex::extractUrlInfos(const KURL &url) m_entryBuffer.clear(); StatJob *job = stat(url, false); - connect(job, TQT_SIGNAL(result(Job *)), this, TQT_SLOT(slotStatResult(Job *))); + connect(job, TQ_SIGNAL(result(Job *)), this, TQ_SLOT(slotStatResult(Job *))); tqApp->eventLoop()->enterLoop(); UDSEntry::iterator it = m_entryBuffer.begin(); diff --git a/src/tdebluezioslave/obex/tdeio_obex.cpp b/src/tdebluezioslave/obex/tdeio_obex.cpp index 4d682ca..cc461e1 100644 --- a/src/tdebluezioslave/obex/tdeio_obex.cpp +++ b/src/tdebluezioslave/obex/tdeio_obex.cpp @@ -198,8 +198,8 @@ bool ObexProtocol::connectObex() mSessionProperties = new org::freedesktop::DBus::PropertiesProxy("org.bluez", mSessionPath); mSessionProperties->setConnection((*(mManager->getConnection()))); - connect(mSessionProperties, SIGNAL(PropertiesChanged ( const TQString&, const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& )), - this, SLOT(slotPropertiesChanged ( const TQString& , const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& ))); + connect(mSessionProperties, TQ_SIGNAL(PropertiesChanged ( const TQString&, const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& )), + this, TQ_SLOT(slotPropertiesChanged ( const TQString& , const TQMap< TQString, TQT_DBusVariant >&, const TQStringList& ))); mFileTransfer = new org::bluez::obex::FileTransfer1Proxy("org.bluez.obex", mSessionPath); mFileTransfer->setConnection((*(mManager->getConnection())));