diff options
Diffstat (limited to 'src/libtdebluez/objectmanagerImpl.cpp')
| -rw-r--r-- | src/libtdebluez/objectmanagerImpl.cpp | 26 |
1 files changed, 13 insertions, 13 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)); } |