Remove unnecessary 'request' prefixes

diff --git a/lib/ofonocallbarring.cpp b/lib/ofonocallbarring.cpp
index 02333d8..dcb2ce6 100644 (file)
--- a/lib/ofonocallbarring.cpp
+++ b/lib/ofonocallbarring.cpp
@@ -104,7 +104,7 @@ void OfonoCallBarring::setPropertyErr(const QDBusError& error)
 }
 
 
-void OfonoCallBarring::requestChangePassword(const QString &old_password, 
+void OfonoCallBarring::changePassword(const QString &old_password, 
                                             const QString &new_password)
 {
     QDBusMessage request;
@@ -119,7 +119,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 +133,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 +147,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;
 

diff --git a/lib/ofonocallbarring.h b/lib/ofonocallbarring.h
index 6c0d3b6..d17089e 100644 (file)
--- a/lib/ofonocallbarring.h
+++ b/lib/ofonocallbarring.h
@@ -49,10 +49,10 @@ public:
     void setVoiceOutgoing(const QString &barrings, const QString &password);
 
     /* Methods */
-    void requestChangePassword(const QString &old_password, const QString &new_password);
-    void requestDisableAll(const QString &password);
-    void requestDisableAllIncoming(const QString &password);
-    void requestDisableAllOutgoing(const QString &password);
+    void changePassword(const QString &old_password, const QString &new_password);
+    void disableAll(const QString &password);
+    void disableAllIncoming(const QString &password);
+    void disableAllOutgoing(const QString &password);
 
 signals:
     void incomingBarringInEffect();

diff --git a/lib/ofonocallforwarding.cpp b/lib/ofonocallforwarding.cpp
index 2e15799..78e254c 100644 (file)
--- a/lib/ofonocallforwarding.cpp
+++ b/lib/ofonocallforwarding.cpp
@@ -43,7 +43,7 @@ OfonoCallForwarding::~OfonoCallForwarding()
 }
 
 
-void OfonoCallForwarding::requestDisableAll(const QString &type)
+void OfonoCallForwarding::disableAll(const QString &type)
 {
     QDBusMessage request;
 

diff --git a/lib/ofonocallforwarding.h b/lib/ofonocallforwarding.h
index ae1770b..b4a4638 100644 (file)
--- a/lib/ofonocallforwarding.h
+++ b/lib/ofonocallforwarding.h
@@ -55,7 +55,7 @@ public:
     void setVoiceNotReachable(const QString &property);
     
     /* Methods */
-    void requestDisableAll(const QString &type); /* "all" | "conditional" */
+    void disableAll(const QString &type); /* "all" | "conditional" */
     
 signals:
     void voiceUnconditionalComplete(bool success, const QString &property);

diff --git a/lib/ofononetworkoperator.cpp b/lib/ofononetworkoperator.cpp
index 568b93c..f517d21 100644 (file)
--- a/lib/ofononetworkoperator.cpp
+++ b/lib/ofononetworkoperator.cpp
@@ -41,7 +41,7 @@ OfonoNetworkOperator::~OfonoNetworkOperator()
 {
 }
 
-void OfonoNetworkOperator::requestRegister()
+void OfonoNetworkOperator::registerOp()
 {
     QDBusMessage request;
 

diff --git a/lib/ofononetworkoperator.h b/lib/ofononetworkoperator.h
index b21d5ef..f7cb5d0 100644 (file)
--- a/lib/ofononetworkoperator.h
+++ b/lib/ofononetworkoperator.h
@@ -60,7 +60,7 @@ public:
      */
     QString errorMessage() const;
 
-    void requestRegister();
+    void registerOp();
     
     QString name() const;
     QString status() const;

diff --git a/lib/ofononetworkregistration.cpp b/lib/ofononetworkregistration.cpp
index f3a1a7d..960872b 100644 (file)
--- a/lib/ofononetworkregistration.cpp
+++ b/lib/ofononetworkregistration.cpp
@@ -61,7 +61,7 @@ OfonoNetworkRegistration::~OfonoNetworkRegistration()
 {
 }
 
-void OfonoNetworkRegistration::requestRegister()
+void OfonoNetworkRegistration::registerOp()
 {
     QDBusMessage request;
 
@@ -75,7 +75,7 @@ void OfonoNetworkRegistration::requestRegister()
                                        REGISTER_TIMEOUT);
 }
 
-void OfonoNetworkRegistration::requestDeregister()
+void OfonoNetworkRegistration::deregister()
 {
     QDBusMessage request;
 
@@ -89,7 +89,7 @@ void OfonoNetworkRegistration::requestDeregister()
                                        REGISTER_TIMEOUT);
 }
 
-void OfonoNetworkRegistration::requestScan()
+void OfonoNetworkRegistration::scan()
 {
     QDBusMessage request;
 
@@ -103,7 +103,7 @@ void OfonoNetworkRegistration::requestScan()
                                        REGISTER_TIMEOUT);
 }
 
-void OfonoNetworkRegistration::requestGetOperators()
+void OfonoNetworkRegistration::getOperators()
 {
     QDBusMessage request;
 

diff --git a/lib/ofononetworkregistration.h b/lib/ofononetworkregistration.h
index 9e9b525..7048459 100644 (file)
--- a/lib/ofononetworkregistration.h
+++ b/lib/ofononetworkregistration.h
@@ -64,10 +64,10 @@ public:
     uint strength() const;
     QString baseStation() const;
     
-    void requestRegister();
-    void requestDeregister();
-    void requestGetOperators();
-    void requestScan();
+    void registerOp();
+    void deregister();
+    void getOperators();
+    void scan();
     
 signals:
     void modeChanged(const QString &mode);

diff --git a/lib/ofonophonebook.cpp b/lib/ofonophonebook.cpp
index 24dafac..3cf5e1d 100644 (file)
--- a/lib/ofonophonebook.cpp
+++ b/lib/ofonophonebook.cpp
@@ -39,7 +39,7 @@ OfonoPhonebook::~OfonoPhonebook()
 {
 }
 
-void OfonoPhonebook::requestImport()
+void OfonoPhonebook::import()
 {
     QDBusMessage request;
 

diff --git a/lib/ofonophonebook.h b/lib/ofonophonebook.h
index 3d549b2..bc8a4b1 100644 (file)
--- a/lib/ofonophonebook.h
+++ b/lib/ofonophonebook.h
@@ -45,7 +45,7 @@ public:
 
     ~OfonoPhonebook();
 
-    void requestImport();
+    void import();
 
 signals:
     void importComplete(bool success, const QString &entries);

diff --git a/lib/ofonosimmanager.cpp b/lib/ofonosimmanager.cpp
index 326e250..6edf2b2 100644 (file)
--- a/lib/ofonosimmanager.cpp
+++ b/lib/ofonosimmanager.cpp
@@ -42,7 +42,7 @@ OfonoSimManager::~OfonoSimManager()
 {
 }
 
-void OfonoSimManager::requestChangePin(const QString &pintype, const QString &oldpin, const QString &newpin)
+void OfonoSimManager::changePin(const QString &pintype, const QString &oldpin, const QString &newpin)
 {
     QDBusMessage request;
 
@@ -56,7 +56,7 @@ void OfonoSimManager::requestChangePin(const QString &pintype, const QString &ol
                                        SLOT(changePinErr(const QDBusError&)));
 }
 
-void OfonoSimManager::requestEnterPin(const QString &pintype, const QString &pin)
+void OfonoSimManager::enterPin(const QString &pintype, const QString &pin)
 {
     QDBusMessage request;
 
@@ -70,7 +70,7 @@ void OfonoSimManager::requestEnterPin(const QString &pintype, const QString &pin
                                        SLOT(enterPinErr(const QDBusError&)));
 }
 
-void OfonoSimManager::requestResetPin(const QString &pintype, const QString &puk, const QString &newpin)
+void OfonoSimManager::resetPin(const QString &pintype, const QString &puk, const QString &newpin)
 {
     QDBusMessage request;
 
@@ -84,7 +84,7 @@ void OfonoSimManager::requestResetPin(const QString &pintype, const QString &puk
                                        SLOT(resetPinErr(const QDBusError&)));
 }
 
-void OfonoSimManager::requestLockPin(const QString &pintype, const QString &pin)
+void OfonoSimManager::lockPin(const QString &pintype, const QString &pin)
 {
     QDBusMessage request;
 
@@ -98,7 +98,7 @@ void OfonoSimManager::requestLockPin(const QString &pintype, const QString &pin)
                                        SLOT(lockPinErr(const QDBusError&)));
 }
 
-void OfonoSimManager::requestUnlockPin(const QString &pintype, const QString &pin)
+void OfonoSimManager::unlockPin(const QString &pintype, const QString &pin)
 {
     QDBusMessage request;
 

diff --git a/lib/ofonosimmanager.h b/lib/ofonosimmanager.h
index daea119..d48ffab 100644 (file)
--- a/lib/ofonosimmanager.h
+++ b/lib/ofonosimmanager.h
@@ -55,11 +55,11 @@ public:
     QString cardIdentifier() const;
     QStringList preferredLanguages() const;
 
-    void requestChangePin(const QString &pintype, const QString &oldpin, const QString &newpin);
-    void requestEnterPin(const QString &pintype, const QString &pin);
-    void requestResetPin(const QString &pintype, const QString &puk, const QString &newpin);
-    void requestLockPin(const QString &pintype, const QString &pin);
-    void requestUnlockPin(const QString &pintype, const QString &pin);
+    void changePin(const QString &pintype, const QString &oldpin, const QString &newpin);
+    void enterPin(const QString &pintype, const QString &pin);
+    void resetPin(const QString &pintype, const QString &puk, const QString &newpin);
+    void lockPin(const QString &pintype, const QString &pin);
+    void unlockPin(const QString &pintype, const QString &pin);
 
     void setSubscriberNumbers(const QStringList &numbers);
 

diff --git a/lib/ofonosupplementaryservices.cpp b/lib/ofonosupplementaryservices.cpp
index 92a50c5..58807f1 100644 (file)
--- a/lib/ofonosupplementaryservices.cpp
+++ b/lib/ofonosupplementaryservices.cpp
@@ -49,7 +49,7 @@ OfonoSupplementaryServices::~OfonoSupplementaryServices()
 {
 }
 
-void OfonoSupplementaryServices::requestInitiate(const QString &command)
+void OfonoSupplementaryServices::initiate(const QString &command)
 {
     QDBusMessage request;
 
@@ -64,7 +64,7 @@ void OfonoSupplementaryServices::requestInitiate(const QString &command)
                                        REQUEST_TIMEOUT);
 }
 
-void OfonoSupplementaryServices::requestRespond(const QString &reply)
+void OfonoSupplementaryServices::respond(const QString &reply)
 {
     QDBusMessage request;
 
@@ -79,7 +79,7 @@ void OfonoSupplementaryServices::requestRespond(const QString &reply)
                                        REQUEST_TIMEOUT);
 }
 
-void OfonoSupplementaryServices::requestCancel()
+void OfonoSupplementaryServices::cancel()
 {
     QDBusMessage request;
 

diff --git a/lib/ofonosupplementaryservices.h b/lib/ofonosupplementaryservices.h
index 5fd5126..f65e6d4 100644 (file)
--- a/lib/ofonosupplementaryservices.h
+++ b/lib/ofonosupplementaryservices.h
@@ -47,9 +47,9 @@ public:
     /* Properties */
     QString state() const;
     
-    void requestInitiate(const QString &command);
-    void requestRespond(const QString &reply);
-    void requestCancel();
+    void initiate(const QString &command);
+    void respond(const QString &reply);
+    void cancel();
     
 signals:
     void notificationReceived(const QString &message);

diff --git a/tests/test_ofonocallbarring.cpp b/tests/test_ofonocallbarring.cpp
index e3e2609..1de132d 100644 (file)
--- a/tests/test_ofonocallbarring.cpp
+++ b/tests/test_ofonocallbarring.cpp
@@ -135,7 +135,7 @@ private slots:
 
        connect(m, SIGNAL(disableAllComplete(bool)), 
                this, SLOT(disableAllComplete(bool)));
-       m->requestDisableAll("3579");
+       m->disableAll("3579");
        QTest::qWait(1000);
        m->requestVoiceIncoming();
        QTest::qWait(5000);
@@ -144,9 +144,9 @@ private slots:
 
        connect(m, SIGNAL(changePasswordComplete(bool)), 
                this, SLOT(changePasswordComplete(bool)));
-       m->requestChangePassword("3579", "1234");
+       m->changePassword("3579", "1234");
        QTest::qWait(1000);
-       m->requestChangePassword("1234", "3579");
+       m->changePassword("1234", "3579");
 
        QTest::qWait(2000);
     }

diff --git a/tests/test_ofonocallforwarding.cpp b/tests/test_ofonocallforwarding.cpp
index 150d4ca..3eeb639 100644 (file)
--- a/tests/test_ofonocallforwarding.cpp
+++ b/tests/test_ofonocallforwarding.cpp
@@ -152,7 +152,7 @@ private slots:
 
        connect(m, SIGNAL(disableAllComplete(bool)), 
                this, SLOT(disableAllComplete(bool)));
-       m->requestDisableAll("all");
+       m->disableAll("all");
 
        QTest::qWait(120000);
     }

diff --git a/tests/test_ofononetworkoperator.cpp b/tests/test_ofononetworkoperator.cpp
index a3d9381..e08e74b 100644 (file)
--- a/tests/test_ofononetworkoperator.cpp
+++ b/tests/test_ofononetworkoperator.cpp
@@ -63,7 +63,7 @@ private slots:
        qDebug() << "mobileNetworkCode():" << m->mnc();
        qDebug() << "technologies():" << m->technologies();
        qDebug() << "additionalInfo():" << m->additionalInfo();
-       m->requestRegister();
+       m->registerOp();
 
        QTest::qWait(120000);
     }

diff --git a/tests/test_ofononetworkregistration.cpp b/tests/test_ofononetworkregistration.cpp
index 92d9611..2abeead 100644 (file)
--- a/tests/test_ofononetworkregistration.cpp
+++ b/tests/test_ofononetworkregistration.cpp
@@ -154,15 +154,15 @@ private slots:
        qDebug() << "strength():" << m->strength();
        qDebug() << "baseStation():" << m->baseStation();
        
-       m->requestGetOperators();
+       m->getOperators();
        QTest::qWait(5000);
 
-       m->requestScan();
+       m->scan();
        QTest::qWait(10000);
        
-       m->requestDeregister();
+       m->deregister();
        QTest::qWait(10000);
-       m->requestRegister();
+       m->registerOp();
 
        QTest::qWait(120000);
     }

diff --git a/tests/test_ofonophonebook.cpp b/tests/test_ofonophonebook.cpp
index 79bd118..672bf23 100644 (file)
--- a/tests/test_ofonophonebook.cpp
+++ b/tests/test_ofonophonebook.cpp
@@ -55,7 +55,7 @@ private slots:
     void testOfonoPhonebook()
     {
        qDebug() << "validity" << m->isValid();
-       m->requestImport();
+       m->import();
     QTest::qWait(120000);
     }
 

diff --git a/tests/test_ofonosimmanager.cpp b/tests/test_ofonosimmanager.cpp
index a82741e..8837e3d 100644 (file)
--- a/tests/test_ofonosimmanager.cpp
+++ b/tests/test_ofonosimmanager.cpp
@@ -163,30 +163,30 @@ private slots:
            if (m->pinRequired() == "pin") {
                connect(m, SIGNAL(enterPinComplete(bool)), 
                        this, SLOT(enterPinComplete(bool)));
-               m->requestEnterPin("pin", "2468");
+               m->enterPin("pin", "2468");
                QTest::qWait(1000);
            } else if (m->pinRequired() == "puk") {
                connect(m, SIGNAL(resetPinComplete(bool)), 
                        this, SLOT(resetPinComplete(bool)));
-               m->requestResetPin("puk", "13243546", "2468");      
+               m->resetPin("puk", "13243546", "2468");     
            }
 
            if (m->lockedPins().contains("pin")) {
-               m->requestUnlockPin("pin", "2468");
+               m->unlockPin("pin", "2468");
                QTest::qWait(1000);
-               m->requestLockPin("pin", "2468");
+               m->lockPin("pin", "2468");
                QTest::qWait(1000);
-               m->requestChangePin("pin", "2468", "1234");
+               m->changePin("pin", "2468", "1234");
                QTest::qWait(1000);
-               m->requestChangePin("pin", "1234", "2468");
+               m->changePin("pin", "1234", "2468");
            } else {
-               m->requestLockPin("pin", "2468");
+               m->lockPin("pin", "2468");
                QTest::qWait(1000);
-               m->requestChangePin("pin", "2468", "1234");
+               m->changePin("pin", "2468", "1234");
                QTest::qWait(1000);
-               m->requestChangePin("pin", "1234", "2468");
+               m->changePin("pin", "1234", "2468");
                QTest::qWait(1000);
-               m->requestUnlockPin("pin", "2468");
+               m->unlockPin("pin", "2468");
            }
        }
        QTest::qWait(120000);

diff --git a/tests/test_ofonosupplementaryservices.cpp b/tests/test_ofonosupplementaryservices.cpp
index 3691a5b..7e7b10b 100644 (file)
--- a/tests/test_ofonosupplementaryservices.cpp
+++ b/tests/test_ofonosupplementaryservices.cpp
@@ -72,7 +72,7 @@ private slots:
     void testOfonoNetworkOperator()
     {
        qDebug() << "state():" << m->state();
-       m->requestInitiate("*#002**11#");
+       m->initiate("*#002**11#");
 
        QTest::qWait(120000);
     }