[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libmm-qt/mm08] /: fix API discrepancies, particularly async methods
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2013-09-30 17:58:45
Message-ID: E1VQhk5-000354-U2 () scm ! kde ! org
[Download RAW message or body]

Git commit a9f19f1b46934fe0179b90986500dee2664f7875 by Lukáš Tinkl.
Committed on 30/09/2013 at 17:58.
Pushed by lukas into branch 'mm08'.

fix API discrepancies, particularly async methods

M  +3    -0    manager.h
M  +4    -4    modemgsmcardinterface.cpp
M  +2    -2    modemgsmcardinterface.h
M  +1    -1    modemgsmnetworkinterface.cpp
M  +1    -1    modemgsmnetworkinterface.h
M  +2    -2    modeminterface.cpp
M  +1    -1    modeminterface.h

http://commits.kde.org/libmm-qt/a9f19f1b46934fe0179b90986500dee2664f7875

diff --git a/manager.h b/manager.h
index 4a64e12..ab5d7fb 100644
--- a/manager.h
+++ b/manager.h
@@ -90,6 +90,9 @@ MODEMMANAGERQT_EXPORT ModemInterface::List modemInterfaces();
   */
 MODEMMANAGERQT_EXPORT ModemInterface::Ptr findModemInterface(const QString &udi, \
ModemManager::ModemInterface::InterfaceType ifaceType);  
+/**
+  * Start a new scan for connected modem devices.
+  */
 MODEMMANAGERQT_EXPORT void scanDevices();
 
 MODEMMANAGERQT_EXPORT Notifier * notifier();
diff --git a/modemgsmcardinterface.cpp b/modemgsmcardinterface.cpp
index 73acb49..2452467 100644
--- a/modemgsmcardinterface.cpp
+++ b/modemgsmcardinterface.cpp
@@ -105,14 +105,14 @@ QDBusPendingReply<> ModemManager::ModemSimCardInterface::sendPin(const QString &
     return d->modemSimCardIface.SendPin(pin);
 }
 
-void ModemManager::ModemSimCardInterface::enablePin(const QString & pin, bool enabled)
+QDBusPendingReply<> ModemManager::ModemSimCardInterface::enablePin(const QString & pin, bool enabled)
 {
     Q_D(ModemSimCardInterface);
-    d->modemSimCardIface.EnablePin(pin, enabled);
+    return d->modemSimCardIface.EnablePin(pin, enabled);
 }
 
-void ModemManager::ModemSimCardInterface::changePin(const QString & oldPin, const QString & newPin)
+QDBusPendingReply<> ModemManager::ModemSimCardInterface::changePin(const QString & oldPin, const QString \
& newPin)  {
     Q_D(ModemSimCardInterface);
-    d->modemSimCardIface.ChangePin(oldPin, newPin);
+    return d->modemSimCardIface.ChangePin(oldPin, newPin);
 }
diff --git a/modemgsmcardinterface.h b/modemgsmcardinterface.h
index f81840b..f77320c 100644
--- a/modemgsmcardinterface.h
+++ b/modemgsmcardinterface.h
@@ -52,8 +52,8 @@ public:
     // methods
     QDBusPendingReply<> sendPin(const QString & pin);
     QDBusPendingReply<> sendPuk(const QString & puk, const QString & pin);
-    void enablePin(const QString & pin, bool enabled);
-    void changePin(const QString & oldPin, const QString & newPin);
+    QDBusPendingReply<> enablePin(const QString & pin, bool enabled);
+    QDBusPendingReply<> changePin(const QString & oldPin, const QString & newPin);
 
 #if 0
 Q_SIGNALS:
diff --git a/modemgsmnetworkinterface.cpp b/modemgsmnetworkinterface.cpp
index 88373b6..e770c08 100644
--- a/modemgsmnetworkinterface.cpp
+++ b/modemgsmnetworkinterface.cpp
@@ -81,7 +81,7 @@ void ModemManager::Modem3gppInterface::registerToNetwork(const QString &networkI
     d->modem3gppIface.Register(networkId);
 }
 
-ScanResultsType ModemManager::Modem3gppInterface::scan()
+QDBusPendingReply<ScanResultsType> ModemManager::Modem3gppInterface::scan()
 {
     Q_D(Modem3gppInterface);
     return d->modem3gppIface.Scan();
diff --git a/modemgsmnetworkinterface.h b/modemgsmnetworkinterface.h
index 6a8c0b6..40d6e1d 100644
--- a/modemgsmnetworkinterface.h
+++ b/modemgsmnetworkinterface.h
@@ -61,7 +61,7 @@ public:
     */
     void registerToNetwork(const QString & networkId = QString());
 
-    ScanResultsType scan(); // TODO return the scan results async
+    QDBusPendingReply<ScanResultsType> scan();
 
 Q_SIGNALS:
     void registrationStateChanged(MMModem3gppRegistrationState registrationState);
diff --git a/modeminterface.cpp b/modeminterface.cpp
index 63c69aa..7846dc6 100644
--- a/modeminterface.cpp
+++ b/modeminterface.cpp
@@ -511,10 +511,10 @@ void ModemManager::ModemInterface::onStateChanged(int oldState, int newState, ui
 
 /*** From org.freedesktop.ModemManager.Modem.Simple ***/
 
-void ModemManager::ModemInterface::connectModem(const QVariantMap & properties)
+QDBusObjectPath ModemManager::ModemInterface::connectModem(const QVariantMap & properties)
 {
     Q_D(ModemInterface);
-    d->modemSimpleIface.Connect(properties);
+    return d->modemSimpleIface.Connect(properties);
 }
 
 QVariantMap ModemManager::ModemInterface::status()
diff --git a/modeminterface.h b/modeminterface.h
index 58c50e8..abf0a57 100644
--- a/modeminterface.h
+++ b/modeminterface.h
@@ -159,7 +159,7 @@ public:
     //  "number": For POTS devices the number to dial,, given as a string value (signature "s").
     //  "allow-roaming": FALSE to allow only connections to home networks, given as a boolean value \
                (signature "b").
     //  "rm-protocol": For CDMA devices, the protocol of the Rm interface, given as a \
                MMModemCdmaRmProtocol value (signature "u").
-    void connectModem(const QVariantMap & properties);
+    QDBusObjectPath connectModem(const QVariantMap & properties);
 
     //  Dictionary of properties.
     //  Each implementation is free to add it's own specific key-value pairs. The predefined


[prev in list] [next in list] [prev in thread] [next in thread]