Merge commit 'refs/merge-requests/1' of gitorious.org:meego-cellular/ofono-qt into...

diff --git a/lib/ofonomodem.h b/lib/ofonomodem.h
index d0e6865..5d2f213 100644 (file)
--- a/lib/ofonomodem.h
+++ b/lib/ofonomodem.h
@@ -26,6 +26,7 @@
 #define OFONOMODEM_H
 
 #include <QtCore/QObject>
+#include <QtCore/QStringList>
 #include "libofono-qt_global.h"
 
 class OfonoModemManager;
@@ -41,6 +42,19 @@ class OFONO_QT_EXPORT OfonoModem : public QObject
 
 Q_OBJECT
 
+Q_PROPERTY(bool powered READ powered WRITE setPowered NOTIFY poweredChanged)
+Q_PROPERTY(bool online READ online WRITE setOnline NOTIFY onlineChanged)
+Q_PROPERTY(bool emergency READ emergency NOTIFY emergencyChanged)
+
+Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+Q_PROPERTY(QString manufacturer READ manufacturer NOTIFY manufacturerChanged)
+Q_PROPERTY(QString model READ model NOTIFY modelChanged)
+Q_PROPERTY(QString revision READ revision NOTIFY revisionChanged)
+Q_PROPERTY(QString serial READ serial NOTIFY serialChanged)
+
+Q_PROPERTY(QStringList features READ features NOTIFY featuresChanged)
+Q_PROPERTY(QStringList interfaces READ interfaces NOTIFY interfacesChanged)
+
 public:
 
     //! How the modem object should select a modem

diff --git a/lib/ofononetworkoperator.h b/lib/ofononetworkoperator.h
index a3201e7..99c0b53 100644 (file)
--- a/lib/ofononetworkoperator.h
+++ b/lib/ofononetworkoperator.h
@@ -42,6 +42,14 @@ class OfonoInterface;
 class OFONO_QT_EXPORT OfonoNetworkOperator : public QObject
 {
     Q_OBJECT
+    
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+    Q_PROPERTY(QString status READ status NOTIFY statusChanged)
+    Q_PROPERTY(QString mcc READ mcc NOTIFY mccChanged)
+    Q_PROPERTY(QString mnc READ mnc NOTIFY mncChanged)
+    Q_PROPERTY(QStringList technologies READ technologies NOTIFY technologiesChanged)
+    Q_PROPERTY(QString additionalInfo READ additionalInfo NOTIFY additionalInfoChanged)
+    
 public:
     OfonoNetworkOperator(const QString& operatorId, QObject *parent=0);
     OfonoNetworkOperator(const OfonoNetworkOperator& op);

diff --git a/lib/ofononetworkregistration.h b/lib/ofononetworkregistration.h
index cc61698..bd1920b 100644 (file)
--- a/lib/ofononetworkregistration.h
+++ b/lib/ofononetworkregistration.h
@@ -48,6 +48,17 @@ class OFONO_QT_EXPORT OfonoNetworkRegistration : public OfonoModemInterface
 {
     Q_OBJECT
 
+    Q_PROPERTY(QString mode READ mode NOTIFY modeChanged)
+    Q_PROPERTY(QString status READ status NOTIFY statusChanged)
+    Q_PROPERTY(uint locationAreaCode READ locationAreaCode NOTIFY locationAreaCodeChanged)
+    Q_PROPERTY(uint cellId READ cellId NOTIFY cellIdChanged)
+    Q_PROPERTY(QString mcc READ mcc NOTIFY mccChanged)
+    Q_PROPERTY(QString mnc READ mnc NOTIFY mncChanged)
+    Q_PROPERTY(QString technology READ technology NOTIFY technologyChanged)
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+    Q_PROPERTY(uint strength READ strength NOTIFY strengthChanged)
+    Q_PROPERTY(QString baseStation READ baseStation NOTIFY baseStationChanged)
+    
 public:
     OfonoNetworkRegistration(OfonoModem::SelectionSetting modemSetting, const QString &modemPath, QObject *parent=0);
     ~OfonoNetworkRegistration();

diff --git a/lib/ofonoradiosettings.h b/lib/ofonoradiosettings.h
index ec7eb87..69395bc 100644 (file)
--- a/lib/ofonoradiosettings.h
+++ b/lib/ofonoradiosettings.h
@@ -37,6 +37,8 @@ class OFONO_QT_EXPORT OfonoRadioSettings : public OfonoModemInterface
 {
     Q_OBJECT
 
+    Q_PROPERTY(QString technologyPreference READ technologyPreference WRITE setTechnologyPreference NOTIFY technologyPreferenceChanged)
+
 public:
     OfonoRadioSettings(OfonoModem::SelectionSetting modemSetting, const QString &modemPath, QObject *parent=0);
     ~OfonoRadioSettings();

diff --git a/lib/ofonosimmanager.h b/lib/ofonosimmanager.h
index 63615ca..b95295d 100644 (file)
--- a/lib/ofonosimmanager.h
+++ b/lib/ofonosimmanager.h
@@ -45,6 +45,16 @@ class OFONO_QT_EXPORT OfonoSimManager : public OfonoModemInterface
 {
     Q_OBJECT
 
+    Q_PROPERTY(bool present READ present NOTIFY presenceChanged)
+    Q_PROPERTY(QString subscriberIdentity READ subscriberIdentity NOTIFY subscriberIdentityChanged)
+    Q_PROPERTY(QString mobileCountryCode READ mobileCountryCode NOTIFY mobileCountryCodeChanged)
+    Q_PROPERTY(QString mobileNetworkCode READ mobileNetworkCode NOTIFY mobileNetworkCodeChanged)
+    Q_PROPERTY(QStringList subscriberNumbers READ subscriberNumbers WRITE setSubscriberNumbers NOTIFY subscriberNumbersChanged)
+    Q_PROPERTY(QString pinRequired READ pinRequired NOTIFY pinRequiredChanged)
+    Q_PROPERTY(QStringList lockedPins READ lockedPins NOTIFY lockedPinsChanged)
+    Q_PROPERTY(QString cardIdentifier READ cardIdentifier NOTIFY cardIdentifierChanged)
+    Q_PROPERTY(QStringList preferredLanguages READ preferredLanguages NOTIFY preferredLanguagesChanged)
+
 public:
     OfonoSimManager(OfonoModem::SelectionSetting modemSetting, const QString &modemPath, QObject *parent=0);
     ~OfonoSimManager();