Adding CallVolume interface support in ofono-qt Bindings Signed-off-by: Arun Ravindra...

[profile/ivi/ofono-qt.git] / lib / ofonocallbarring.cpp

diff --git a/lib/ofonocallbarring.cpp b/lib/ofonocallbarring.cpp
index 02333d8..f78c714 100644 (file)
--- a/lib/ofonocallbarring.cpp
+++ b/lib/ofonocallbarring.cpp
@@ -45,66 +45,13 @@ OfonoCallBarring::OfonoCallBarring(OfonoModem::SelectionSetting modemSetting, co
                                         "OutgoingBarringInEffect",
                                         this,
                                         SIGNAL(outgoingBarringInEffect()));
-    m_pendingProperty = QString();
 }
 
 OfonoCallBarring::~OfonoCallBarring()
 {
 }
 
-void OfonoCallBarring::setProperty(const QString& name, 
-                                  const QVariant& property, 
-                                  const QString& password)
-{
-    if (m_pendingProperty.length() > 0) {
-        // FIXME: should indicate that a setProperty is already in progress
-        m_if->setError(QString(), QString("Operation already in progress"));
-        emit setPropertyFailed(name);
-        return;
-    }
-
-
-    QDBusMessage request;
-
-    request = QDBusMessage::createMethodCall("org.ofono",
-                                            path(), m_if->ifname(),
-                                            "SetProperty");
-    request.setArguments(QList<QVariant>() 
-                        << QVariant(name) 
-                        << QVariant::fromValue(QDBusVariant(property))
-                        << QVariant(password));
-
-    bool result = QDBusConnection::systemBus().callWithCallback(request, this,
-                                       SLOT(setPropertyResp()),
-                                       SLOT(setPropertyErr(const QDBusError&)),
-                                       SET_PROPERTY_TIMEOUT);
-    if (!result) {
-        // FIXME: should indicate that sending a message failed
-        m_if->setError(QString(), QString("DBUS sending failed"));
-       emit setPropertyFailed(name);
-       return;
-    }
-    m_pendingProperty = name;
-
-
-}
-
-void OfonoCallBarring::setPropertyResp()
-{
-    m_pendingProperty = QString();
-    // emit nothing; we will get a PropertyChanged signal
-}
-
-void OfonoCallBarring::setPropertyErr(const QDBusError& error)
-{
-    QString prop = m_pendingProperty;
-    m_if->setError(error.name(), error.message());
-    m_pendingProperty = QString();
-    emit setPropertyFailed(prop);
-}
-
-
-void OfonoCallBarring::requestChangePassword(const QString &old_password, 
+void OfonoCallBarring::changePassword(const QString &old_password, 
                                             const QString &new_password)
 {
     QDBusMessage request;
@@ -119,7 +66,7 @@ void OfonoCallBarring::requestChangePassword(const QString &old_password,
                                        SLOT(changePasswordErr(const QDBusError&)));
 }
 
-void OfonoCallBarring::requestDisableAll(const QString &password)
+void OfonoCallBarring::disableAll(const QString &password)
 {
     QDBusMessage request;
 
@@ -133,7 +80,7 @@ void OfonoCallBarring::requestDisableAll(const QString &password)
                                        SLOT(disableAllErr(const QDBusError&)));
 }
 
-void OfonoCallBarring::requestDisableAllIncoming(const QString &password)
+void OfonoCallBarring::disableAllIncoming(const QString &password)
 {
     QDBusMessage request;
 
@@ -147,7 +94,7 @@ void OfonoCallBarring::requestDisableAllIncoming(const QString &password)
                                        SLOT(disableAllIncomingErr(const QDBusError&)));
 }
 
-void OfonoCallBarring::requestDisableAllOutgoing(const QString &password)
+void OfonoCallBarring::disableAllOutgoing(const QString &password)
 {
     QDBusMessage request;
 
@@ -169,7 +116,7 @@ void OfonoCallBarring::requestVoiceIncoming()
 
 void OfonoCallBarring::setVoiceIncoming(const QString &barrings, const QString &password)
 {
-    setProperty("VoiceIncoming", qVariantFromValue(barrings), password);
+    m_if->setProperty("VoiceIncoming", qVariantFromValue(barrings), password);
 }
 
 void OfonoCallBarring::requestVoiceOutgoing()
@@ -179,7 +126,7 @@ void OfonoCallBarring::requestVoiceOutgoing()
 
 void OfonoCallBarring::setVoiceOutgoing(const QString &barrings, const QString &password)
 {
-    setProperty("VoiceOutgoing", qVariantFromValue(barrings), password);
+    m_if->setProperty("VoiceOutgoing", qVariantFromValue(barrings), password);
 }
 
 void OfonoCallBarring::propertyChanged(const QString& property, const QVariant& value)