Update MessageManager to match latest oFono

diff --git a/lib/ofonomessagemanager.cpp b/lib/ofonomessagemanager.cpp
index 8101cbc..dc32a12 100644 (file)
--- a/lib/ofonomessagemanager.cpp
+++ b/lib/ofonomessagemanager.cpp
@@ -193,13 +193,13 @@ void OfonoMessageManager::sendMessage(const QString &to, const QString &message)
 void OfonoMessageManager::requestPropertyComplete(bool success, const QString& property, const QVariant& value)
 {
     if (property == "ServiceCenterAddress") {
-        success ? emit serviceCenterAddressComplete(true, value.value<QString>()) : emit serviceCenterAddressComplete(false, QString());
+        emit serviceCenterAddressComplete(success, value.value<QString>());
     } else if (property == "UseDeliveryReports") {
-        success ? emit useDeliveryReportsComplete(true, value.value<bool>()) : emit useDeliveryReportsComplete(false, bool());
+        emit useDeliveryReportsComplete(success, value.value<bool>());
     } else if (property == "Bearer") {
-        success ? emit bearerComplete(true, value.value<QString>()) : emit bearerComplete(false, QString());
+        emit bearerComplete(success, value.value<QString>());
     } else if (property == "Alphabet") {
-        success ? emit alphabetComplete(true, value.value<QString>()) : emit alphabetComplete(false, QString());
+        emit alphabetComplete(success, value.value<QString>());
     }
 }
 
@@ -231,13 +231,13 @@ void OfonoMessageManager::setPropertyFailed(const QString& property)
 
 void OfonoMessageManager::sendMessageResp(const QDBusObjectPath& objectPath)
 {
-    emit sendMessageComplete(true, objectPath);
+    emit sendMessageComplete(true, objectPath.path());
 }
 
 void OfonoMessageManager::sendMessageErr(QDBusError error)
 {
     m_if->setError(error.name(), error.message());
-    emit sendMessageComplete(false, QDBusObjectPath());
+    emit sendMessageComplete(false, QString());
 }
 
 QStringList OfonoMessageManager::getMessages() const

diff --git a/lib/ofonomessagemanager.h b/lib/ofonomessagemanager.h
index ccd33eb..cb61874 100644 (file)
--- a/lib/ofonomessagemanager.h
+++ b/lib/ofonomessagemanager.h
@@ -76,7 +76,7 @@ signals:
     void useDeliveryReportsComplete(bool success, const bool &useDeliveryReports);
     void bearerComplete(bool success, const QString &bearer);
     void alphabetComplete(bool success, const QString &alphabet);
-    void sendMessageComplete(bool success, const QDBusObjectPath& objectPath);
+    void sendMessageComplete(bool success, const QString& path);
 
     void setServiceCenterAddressFailed();
     void setUseDeliveryReportsFailed();

diff --git a/tests/test_ofonomessagemanager.cpp b/tests/test_ofonomessagemanager.cpp
index 27f8b71..4e748e2 100644 (file)
--- a/tests/test_ofonomessagemanager.cpp
+++ b/tests/test_ofonomessagemanager.cpp
@@ -55,7 +55,7 @@ private slots:
 
     void testOfonoMessageManager()
     {
-        QSignalSpy sendMessage(m, SIGNAL(sendMessageComplete(bool, QDBusObjectPath)));
+        QSignalSpy sendMessage(m, SIGNAL(sendMessageComplete(bool, QString)));
         QSignalSpy messageAdded(m, SIGNAL(messageAdded(QString)));
         QSignalSpy messageRemoved(m, SIGNAL(messageRemoved(QString)));
         QSignalSpy immediateMessage(m, SIGNAL(immediateMessage(QString, QVariantMap)));
@@ -72,9 +72,9 @@ private slots:
         QCOMPARE(sendMessage.count(), 1);
         QVariantList params = sendMessage.takeFirst();
         QCOMPARE(params.at(0).toBool(), true);
-        QDBusObjectPath objectPath = params.at(1).value<QDBusObjectPath>();
-        QVERIFY(objectPath.path().length() > 0);
-        qDebug() << objectPath.path();
+        QString objectPath = params.at(1).value<QString>();
+        QVERIFY(objectPath.length() > 0);
+        qDebug() << objectPath;
 
         QCOMPARE(messageAdded.count(), 1);
         QCOMPARE(messageRemoved.count(), 1);
@@ -91,8 +91,8 @@ private slots:
         QCOMPARE(sendMessage.count(), 1);
         params = sendMessage.takeFirst();
         QCOMPARE(params.at(0).toBool(), false);
-        objectPath = params.at(1).value<QDBusObjectPath>();
-        QVERIFY(objectPath.path().length() == 0);
+        objectPath = params.at(1).value<QString>();
+        QVERIFY(objectPath.length() == 0);
     }
 
     void testOfonoMessageManagerSca()