From 4cfe5fde6a91222080eb6873d225ef90c3992c53 Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Mon, 27 Sep 2010 10:42:37 -0700 Subject: [PATCH] added adapter properties changed signals --- nearbydevicesmodel.cpp | 14 ++++++++++++++ nearbydevicesmodel.h | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/nearbydevicesmodel.cpp b/nearbydevicesmodel.cpp index bd280c3..0aa8c36 100644 --- a/nearbydevicesmodel.cpp +++ b/nearbydevicesmodel.cpp @@ -104,6 +104,11 @@ void NearbyDevicesModel::replyRequestPidCode(QString pidCode) if(agent) agent->replyRequestPidCode(pidCode); } +void NearbyDevicesModel::setAdapterProperty(QString name, QVariant value) +{ + if(adapter) adapter->setProperty(name.toAscii().data(),value); +} + void NearbyDevicesModel::deviceCreated(QString hwaddy, QVariantMap properties) { bool found = false; @@ -161,6 +166,10 @@ void NearbyDevicesModel::adapterAdded(QDBusObjectPath path) SIGNAL(DeviceDisappeared(QString)), this, SLOT(deviceRemoved(QString))); + connect(adapter, + SIGNAL(PropertyChanged(QString,QDBusVariant)), + this, + SLOT(adapterPropertiesChangedSlot(QString,QDBusVariant))); } void NearbyDevicesModel::adapterRemoved(QDBusObjectPath) @@ -174,3 +183,8 @@ void NearbyDevicesModel::adapterRemoved(QDBusObjectPath) return; } } + +void NearbyDevicesModel::adapterPropertiesChangedSlot(QString n,QDBusVariant v) +{ + adapterPropertiesChanged(n,v.variant()); +} diff --git a/nearbydevicesmodel.h b/nearbydevicesmodel.h index 3a647d6..10a5031 100644 --- a/nearbydevicesmodel.h +++ b/nearbydevicesmodel.h @@ -41,12 +41,16 @@ public slots: void replyPasskey(uint passkey); void replyRequestPidCode(QString pidCode); + void setAdapterProperty(QString name, QVariant value); + private slots: void adapterAdded(QDBusObjectPath); void adapterRemoved(QDBusObjectPath); void deviceCreated(QString hwaddy, QVariantMap properties); void deviceRemoved(QString hwaddy); + void adapterPropertiesChangedSlot(QString n,QDBusVariant v); + signals: void requestConfirmation(QString device, uint code); void requestPasskey(QString device); @@ -55,6 +59,8 @@ signals: void nearbyDeviceFound(int index); void nearbyDeviceRemoved(int index); + void adapterPropertiesChanged(QString name, QVariant value); + private: QList devicepathlist; QMap deviceAliasMap; -- 2.7.4