diff --git a/main/libofono-qt/01-update_code_compatible_qt5.patch b/main/libofono-qt/01-update_code_compatible_qt5.patch deleted file mode 100644 index 1e7d34ae4..000000000 --- a/main/libofono-qt/01-update_code_compatible_qt5.patch +++ /dev/null @@ -1,516 +0,0 @@ -Description: Update to qt5 and compile without keywords -Author: Tiago Salem Herrmann -Forwarded: no - -diff: -=== modified file 'a/lib/lib.pro' ---- a/lib/lib.pro 2013-04-23 05:14:42 +0000 -+++ b/lib/lib.pro 2013-04-23 05:18:36 +0000 -@@ -69,7 +69,7 @@ - QMAKE_PKGCONFIG_DESTDIR = pkgconfig - QMAKE_PKGCONFIG_INCDIR = $$headers.path - --qtconfig.path = $$[QT_INSTALL_PREFIX]/share/qt4/mkspecs/features -+qtconfig.path = $$[QT_INSTALL_PREFIX]/share/qt5/mkspecs/features - qtconfig.files = ofono-qt.prf - - INSTALLS += target headers qtconfig - -=== modified file 'a/lib/ofonocallbarring.cpp' ---- a/lib/ofonocallbarring.cpp 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonocallbarring.cpp 2013-04-23 05:18:36 +0000 -@@ -163,44 +163,44 @@ - - void OfonoCallBarring::changePasswordResp() - { -- emit changePasswordComplete(TRUE); -+ emit changePasswordComplete(true); - } - - void OfonoCallBarring::changePasswordErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit changePasswordComplete(FALSE); -+ emit changePasswordComplete(false); - } - - void OfonoCallBarring::disableAllResp() - { -- emit disableAllComplete(TRUE); -+ emit disableAllComplete(true); - } - - void OfonoCallBarring::disableAllErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit disableAllComplete(FALSE); -+ emit disableAllComplete(false); - } - - void OfonoCallBarring::disableAllIncomingResp() - { -- emit disableAllIncomingComplete(TRUE); -+ emit disableAllIncomingComplete(true); - } - - void OfonoCallBarring::disableAllIncomingErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit disableAllIncomingComplete(FALSE); -+ emit disableAllIncomingComplete(false); - } - - void OfonoCallBarring::disableAllOutgoingResp() - { -- emit disableAllOutgoingComplete(TRUE); -+ emit disableAllOutgoingComplete(true); - } - - void OfonoCallBarring::disableAllOutgoingErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit disableAllOutgoingComplete(FALSE); -+ emit disableAllOutgoingComplete(false); - } - -=== modified file 'a/lib/ofonocallforwarding.cpp' ---- a/lib/ofonocallforwarding.cpp 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonocallforwarding.cpp 2013-04-23 05:18:36 +0000 -@@ -164,12 +164,12 @@ - - void OfonoCallForwarding::disableAllResp() - { -- emit disableAllComplete(TRUE); -+ emit disableAllComplete(true); - } - - void OfonoCallForwarding::disableAllErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit disableAllComplete(FALSE); -+ emit disableAllComplete(false); - } - - -=== modified file 'a/lib/ofonoconnman.cpp' ---- a/lib/ofonoconnman.cpp 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonoconnman.cpp 2013-04-23 05:18:36 +0000 -@@ -137,13 +137,13 @@ - - void OfonoConnMan::deactivateAllResp() - { -- emit deactivateAllComplete(TRUE); -+ emit deactivateAllComplete(true); - } - - void OfonoConnMan::deactivateAllErr(const QDBusError& error) - { - m_if->setError(error.name(), error.message()); -- emit deactivateAllComplete(FALSE); -+ emit deactivateAllComplete(false); - } - - void OfonoConnMan::addContext(const QString& type) -@@ -166,13 +166,13 @@ - - void OfonoConnMan::addContextResp(const QDBusObjectPath &path) - { -- emit addContextComplete(TRUE, path.path()); -+ emit addContextComplete(true, path.path()); - } - - void OfonoConnMan::addContextErr(const QDBusError& error) - { - m_if->setError(error.name(), error.message()); -- emit addContextComplete(FALSE, QString()); -+ emit addContextComplete(false, QString()); - } - - void OfonoConnMan::removeContext(const QString& contextpath) -@@ -195,13 +195,13 @@ - - void OfonoConnMan::removeContextResp() - { -- emit removeContextComplete(TRUE); -+ emit removeContextComplete(true); - } - - void OfonoConnMan::removeContextErr(const QDBusError& error) - { - m_if->setError(error.name(), error.message()); -- emit removeContextComplete(FALSE); -+ emit removeContextComplete(false); - } - - bool OfonoConnMan::attached() const - -=== modified file 'a/lib/ofononetworkoperator.cpp' ---- a/lib/ofononetworkoperator.cpp 2013-04-23 05:14:42 +0000 -+++ b/lib/ofononetworkoperator.cpp 2013-04-23 05:18:36 +0000 -@@ -70,13 +70,13 @@ - - void OfonoNetworkOperator::registerResp() - { -- emit registerComplete(TRUE); -+ emit registerComplete(true); - } - - void OfonoNetworkOperator::registerErr(const QDBusError& error) - { - m_if->setError(error.name(), error.message()); -- emit registerComplete(FALSE); -+ emit registerComplete(false); - } - - QString OfonoNetworkOperator::name() const - -=== modified file 'a/lib/ofononetworkregistration.cpp' ---- a/lib/ofononetworkregistration.cpp 2013-04-23 05:14:42 +0000 -+++ b/lib/ofononetworkregistration.cpp 2013-04-23 05:18:36 +0000 -@@ -180,13 +180,13 @@ - - void OfonoNetworkRegistration::registerResp() - { -- emit registerComplete(TRUE); -+ emit registerComplete(true); - } - - void OfonoNetworkRegistration::registerErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit registerComplete(FALSE); -+ emit registerComplete(false); - } - - void OfonoNetworkRegistration::getOperatorsResp(OfonoOperatorList list) -@@ -195,13 +195,13 @@ - foreach(OfonoOperatorStruct op, list) { - oplist << op.path.path(); - } -- emit getOperatorsComplete(TRUE, oplist); -+ emit getOperatorsComplete(true, oplist); - } - - void OfonoNetworkRegistration::getOperatorsErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit getOperatorsComplete(FALSE, QStringList()); -+ emit getOperatorsComplete(false, QStringList()); - } - - void OfonoNetworkRegistration::scanResp(OfonoOperatorList list) -@@ -210,12 +210,12 @@ - foreach(OfonoOperatorStruct op, list) { - oplist << op.path.path(); - } -- emit scanComplete(TRUE, oplist); -+ emit scanComplete(true, oplist); - } - - void OfonoNetworkRegistration::scanErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit scanComplete(FALSE, QStringList()); -+ emit scanComplete(false, QStringList()); - } - - -=== modified file 'a/lib/ofonosimmanager.cpp' ---- a/lib/ofonosimmanager.cpp 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonosimmanager.cpp 2013-04-23 05:18:36 +0000 -@@ -244,63 +244,63 @@ - - void OfonoSimManager::changePinResp() - { -- emit changePinComplete(TRUE); -+ emit changePinComplete(true); - } - - void OfonoSimManager::changePinErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit changePinComplete(FALSE); -+ emit changePinComplete(false); - } - - void OfonoSimManager::enterPinResp() - { -- emit enterPinComplete(TRUE); -+ emit enterPinComplete(true); - } - - void OfonoSimManager::enterPinErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit enterPinComplete(FALSE); -+ emit enterPinComplete(false); - } - - void OfonoSimManager::resetPinResp() - { -- emit resetPinComplete(TRUE); -+ emit resetPinComplete(true); - } - - void OfonoSimManager::resetPinErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit resetPinComplete(FALSE); -+ emit resetPinComplete(false); - } - - void OfonoSimManager::lockPinResp() - { -- emit lockPinComplete(TRUE); -+ emit lockPinComplete(true); - } - void OfonoSimManager::lockPinErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit lockPinComplete(FALSE); -+ emit lockPinComplete(false); - } - - void OfonoSimManager::unlockPinResp() - { -- emit unlockPinComplete(TRUE); -+ emit unlockPinComplete(true); - } - void OfonoSimManager::unlockPinErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit unlockPinComplete(FALSE); -+ emit unlockPinComplete(false); - } - - void OfonoSimManager::getIconResp(QByteArray icon) - { -- emit getIconComplete(TRUE, icon); -+ emit getIconComplete(true, icon); - } - void OfonoSimManager::getIconErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit getIconComplete(FALSE, QByteArray()); -+ emit getIconComplete(false, QByteArray()); - } - -=== modified file 'a/lib/ofonosupplementaryservices.cpp' ---- a/lib/ofonosupplementaryservices.cpp 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonosupplementaryservices.cpp 2013-04-23 05:18:36 +0000 -@@ -190,23 +190,23 @@ - - void OfonoSupplementaryServices::respondResp(QString message) - { -- emit respondComplete(TRUE, message); -+ emit respondComplete(true, message); - } - - void OfonoSupplementaryServices::respondErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit respondComplete(FALSE, QString()); -+ emit respondComplete(false, QString()); - } - - void OfonoSupplementaryServices::cancelResp() - { -- emit cancelComplete(TRUE); -+ emit cancelComplete(true); - } - - void OfonoSupplementaryServices::cancelErr(QDBusError error) - { - m_if->setError(error.name(), error.message()); -- emit cancelComplete(FALSE); -+ emit cancelComplete(false); - } - - -=== modified file 'a/lib/ofonovoicecall.cpp' ---- a/lib/ofonovoicecall.cpp 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonovoicecall.cpp 2013-04-23 05:18:36 +0000 -@@ -112,35 +112,35 @@ - - void OfonoVoiceCall::answerResp() - { -- emit answerComplete(TRUE); -+ emit answerComplete(true); - } - - void OfonoVoiceCall::answerErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit answerComplete(FALSE); -+ emit answerComplete(false); - } - - void OfonoVoiceCall::hangupResp() - { -- emit hangupComplete(TRUE); -+ emit hangupComplete(true); - } - - void OfonoVoiceCall::hangupErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit hangupComplete(FALSE); -+ emit hangupComplete(false); - } - - void OfonoVoiceCall::deflectResp() - { -- emit deflectComplete(TRUE); -+ emit deflectComplete(true); - } - - void OfonoVoiceCall::deflectErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit deflectComplete(FALSE); -+ emit deflectComplete(false); - } - - QString OfonoVoiceCall::incomingLine() const - -=== modified file 'a/lib/ofonovoicecallmanager.cpp' ---- a/lib/ofonovoicecallmanager.cpp 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonovoicecallmanager.cpp 2013-04-23 05:18:36 +0000 -@@ -280,13 +280,13 @@ - - void OfonoVoiceCallManager::hangupMultipartyResp() - { -- emit hangupMultipartyComplete(TRUE); -+ emit hangupMultipartyComplete(true); - } - - void OfonoVoiceCallManager::hangupMultipartyErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit hangupMultipartyComplete(FALSE); -+ emit hangupMultipartyComplete(false); - } - - void OfonoVoiceCallManager::createMultipartyResp(const QList &paths) -@@ -294,13 +294,13 @@ - QStringList calls; - foreach(QDBusObjectPath path, paths) - calls << path.path(); -- emit createMultipartyComplete(TRUE, calls); -+ emit createMultipartyComplete(true, calls); - } - - void OfonoVoiceCallManager::createMultipartyErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit createMultipartyComplete(FALSE, QStringList()); -+ emit createMultipartyComplete(false, QStringList()); - } - - void OfonoVoiceCallManager::privateChatResp(const QList &paths) -@@ -308,89 +308,89 @@ - QStringList calls; - foreach(QDBusObjectPath path, paths) - calls << path.path(); -- emit privateChatComplete(TRUE, calls); -+ emit privateChatComplete(true, calls); - } - - void OfonoVoiceCallManager::privateChatErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit privateChatComplete(FALSE, QStringList()); -+ emit privateChatComplete(false, QStringList()); - } - - void OfonoVoiceCallManager::holdAndAnswerResp() - { -- emit holdAndAnswerComplete(TRUE); -+ emit holdAndAnswerComplete(true); - } - - void OfonoVoiceCallManager::holdAndAnswerErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit holdAndAnswerComplete(FALSE); -+ emit holdAndAnswerComplete(false); - } - - void OfonoVoiceCallManager::releaseAndAnswerResp() - { -- emit releaseAndAnswerComplete(TRUE); -+ emit releaseAndAnswerComplete(true); - } - - void OfonoVoiceCallManager::releaseAndAnswerErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit releaseAndAnswerComplete(FALSE); -+ emit releaseAndAnswerComplete(false); - } - - void OfonoVoiceCallManager::swapCallsResp() - { -- emit swapCallsComplete(TRUE); -+ emit swapCallsComplete(true); - } - - void OfonoVoiceCallManager::swapCallsErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit swapCallsComplete(FALSE); -+ emit swapCallsComplete(false); - } - - void OfonoVoiceCallManager::dialResp() - { -- emit dialComplete(TRUE); -+ emit dialComplete(true); - } - - void OfonoVoiceCallManager::dialErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit dialComplete(FALSE); -+ emit dialComplete(false); - } - - void OfonoVoiceCallManager::hangupAllResp() - { -- emit hangupAllComplete(TRUE); -+ emit hangupAllComplete(true); - } - - void OfonoVoiceCallManager::hangupAllErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit hangupAllComplete(FALSE); -+ emit hangupAllComplete(false); - } - void OfonoVoiceCallManager::sendTonesResp() - { -- emit sendTonesComplete(TRUE); -+ emit sendTonesComplete(true); - } - - void OfonoVoiceCallManager::sendTonesErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit sendTonesComplete(FALSE); -+ emit sendTonesComplete(false); - } - - void OfonoVoiceCallManager::transferResp() - { -- emit transferComplete(TRUE); -+ emit transferComplete(true); - } - - void OfonoVoiceCallManager::transferErr(const QDBusError &error) - { - m_if->setError(error.name(), error.message()); -- emit transferComplete(FALSE); -+ emit transferComplete(false); - } - - QStringList OfonoVoiceCallManager::emergencyNumbers() const diff --git a/main/libofono-qt/02-change_signals_Q_SIGNALS_Q_SLOTS.patch b/main/libofono-qt/02-change_signals_Q_SIGNALS_Q_SLOTS.patch deleted file mode 100644 index d1bd82260..000000000 --- a/main/libofono-qt/02-change_signals_Q_SIGNALS_Q_SLOTS.patch +++ /dev/null @@ -1,614 +0,0 @@ -Description: Change signals by Q_SIGNALS and slots by Q_SLOTS -Author: Tiago Salem Herrmann -Forwarded: no - -diff: -=== modified file 'a/lib/ofonocallbarring.h' ---- a/lib/ofonocallbarring.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonocallbarring.h 2013-04-23 05:21:32 +0000 -@@ -42,7 +42,7 @@ - OfonoCallBarring(OfonoModem::SelectionSetting modemSetting, const QString &modemPath, QObject *parent=0); - ~OfonoCallBarring(); - --public slots: -+public Q_SLOTS: - /* Properties */ - void requestVoiceIncoming(); - void setVoiceIncoming(const QString &barrings, const QString &password); -@@ -55,7 +55,7 @@ - void disableAllIncoming(const QString &password); - void disableAllOutgoing(const QString &password); - --signals: -+Q_SIGNALS: - void voiceIncomingComplete(bool success, const QString &barrings); - void voiceOutgoingComplete(bool success, const QString &barrings); - void voiceIncomingChanged(const QString &barrings); -@@ -68,7 +68,7 @@ - void disableAllIncomingComplete(bool success); - void disableAllOutgoingComplete(bool success); - --private slots: -+private Q_SLOTS: - void pathChanged(const QString& path); - void propertyChanged(const QString& property, const QVariant& value); - void setPropertyFailed(const QString& property); - -=== modified file 'a/lib/ofonocallforwarding.h' ---- a/lib/ofonocallforwarding.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonocallforwarding.h 2013-04-23 05:21:32 +0000 -@@ -42,7 +42,7 @@ - OfonoCallForwarding(OfonoModem::SelectionSetting modemSetting, const QString &modemPath, QObject *parent=0); - ~OfonoCallForwarding(); - --public slots: -+public Q_SLOTS: - /* Properties */ - void requestVoiceUnconditional(); /* "" | phonenumber */ - void setVoiceUnconditional(const QString &property); -@@ -59,7 +59,7 @@ - /* Methods */ - void disableAll(const QString &type); /* "all" | "conditional" */ - --signals: -+Q_SIGNALS: - void voiceUnconditionalComplete(bool success, const QString &property); - void voiceBusyComplete(bool success, const QString &property); - void voiceNoReplyComplete(bool success, const QString &property); -@@ -82,7 +82,7 @@ - - void disableAllComplete(bool success); - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString& property, const QVariant& value); - void setPropertyFailed(const QString& property); - void requestPropertyComplete(bool success, const QString& property, const QVariant& value); - -=== modified file 'a/lib/ofonocallmeter.h' ---- a/lib/ofonocallmeter.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonocallmeter.h 2013-04-23 05:21:32 +0000 -@@ -41,16 +41,16 @@ - OfonoCallMeter(OfonoModem::SelectionSetting modemSetting, const QString &modemPath, QObject *parent=0); - ~OfonoCallMeter(); - --public slots: -+public Q_SLOTS: - /* Properties */ - void requestCallMeter(); - --signals: -+Q_SIGNALS: - void callMeterComplete(bool success, uint value); - - void callMeterChanged(uint value); - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString& property, const QVariant& value); - void requestPropertyComplete(bool success, const QString& property, const QVariant& value); - }; - -=== modified file 'a/lib/ofonocallsettings.h' ---- a/lib/ofonocallsettings.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonocallsettings.h 2013-04-23 05:21:32 +0000 -@@ -41,7 +41,7 @@ - OfonoCallSettings(OfonoModem::SelectionSetting modemSetting, const QString &modemPath, QObject *parent=0); - ~OfonoCallSettings(); - --public slots: -+public Q_SLOTS: - /* Properties */ - void requestCallingLinePresentation(); - void requestCalledLinePresentation(); -@@ -54,7 +54,7 @@ - void requestVoiceCallWaiting(); - void setVoiceCallWaiting(const QString &setting); - --signals: -+Q_SIGNALS: - void callingLinePresentationComplete(bool success, const QString &setting); - void calledLinePresentationComplete(bool success, const QString &setting); - void callingNamePresentationComplete(bool success, const QString &setting); -@@ -76,7 +76,7 @@ - void setHideCallerIdFailed(); - void setVoiceCallWaitingFailed(); - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString& property, const QVariant& value); - void setPropertyFailed(const QString& property); - void requestPropertyComplete(bool success, const QString& property, const QVariant& value); - -=== modified file 'a/lib/ofonocallvolume.h' ---- a/lib/ofonocallvolume.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonocallvolume.h 2013-04-23 05:21:32 +0000 -@@ -50,12 +50,12 @@ - quint8 speakerVolume() const; - quint8 microphoneVolume()const ; - --public slots: -+public Q_SLOTS: - void setMuted(const bool mute); - void setSpeakerVolume(const quint8 &spvolume); - void setMicrophoneVolume(const quint8 &mpvolume); - --signals: -+Q_SIGNALS: - void mutedChanged(const bool &muted); - void speakerVolumeChanged(const quint8 &volume); - void microphoneVolumeChanged(const quint8 &mvolume); -@@ -63,7 +63,7 @@ - void setSpeakerVolumeFailed(); - void setMicrophoneVolumeFailed(); - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString& property, const QVariant& value); - void setPropertyFailed(const QString& property); - - -=== modified file 'a/lib/ofonoconnman.h' ---- a/lib/ofonoconnman.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonoconnman.h 2013-04-23 05:21:32 +0000 -@@ -67,14 +67,14 @@ - bool roamingAllowed() const; - bool powered() const; - --public slots: -+public Q_SLOTS: - void setPowered(const bool); - void setRoamingAllowed(const bool); - void deactivateAll(); - void addContext(const QString& type); - void removeContext(const QString& path); - --signals: -+Q_SIGNALS: - void attachedChanged(const bool value); - void bearerChanged(const QString &bearer); - void suspendedChanged(const bool suspnd); -@@ -90,7 +90,7 @@ - void setPoweredFailed(); - void setRoamingAllowedFailed(); - --private slots: -+private Q_SLOTS: - void validityChanged(bool); - void pathChanged(const QString& path); - void propertyChanged(const QString& property, const QVariant& value); - -=== modified file 'a/lib/ofonoconnmancontext.h' ---- a/lib/ofonoconnmancontext.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonoconnmancontext.h 2013-04-23 05:21:32 +0000 -@@ -95,7 +95,7 @@ - QVariantMap settings() const; - QVariantMap IPv6Settings() const; - --public slots: -+public Q_SLOTS: - void setActive(const bool); - void setAccessPointName(const QString&); - void setType(const QString&); -@@ -106,7 +106,7 @@ - void setMessageProxy(const QString&); - void setMessageCenter(const QString&); - --signals: -+Q_SIGNALS: - void activeChanged(const bool); - void accessPointNameChanged(const QString &apn); - void nameChanged(const QString &name); -@@ -131,7 +131,7 @@ - void settingsChanged(const QVariantMap&); - void IPv6SettingsChanged(const QVariantMap&); - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString &property, const QVariant &value); - void setPropertyFailed(const QString& property); - - -=== modified file 'a/lib/ofonointerface.h' ---- a/lib/ofonointerface.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonointerface.h 2013-04-23 05:21:32 +0000 -@@ -94,7 +94,7 @@ - */ - QString errorMessage() const {return m_errorMessage;} - --public slots: -+public Q_SLOTS: - //! Changes the interface path - /*! - * This method changes the D-Bus path to the interface. -@@ -106,7 +106,7 @@ - //! Sets the last error explicitly - void setError(const QString &errorName, const QString &errorMessage); - --signals: -+Q_SIGNALS: - //! Issued when a property has changed - /*! - * \param name name of the property -@@ -128,13 +128,13 @@ - */ - void setPropertyFailed(const QString &name); - --private slots: -+private Q_SLOTS: - void onPropertyChanged(QString property, QDBusVariant value); - void getPropertiesAsyncResp(QVariantMap properties); - void getPropertiesAsyncErr(const QDBusError&); - void setPropertyResp(); - void setPropertyErr(const QDBusError& error); --protected slots: -+protected Q_SLOTS: - private: - QVariantMap getAllPropertiesSync(); - - -=== modified file 'a/lib/ofonomessage.h' ---- a/lib/ofonomessage.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonomessage.h 2013-04-23 05:21:32 +0000 -@@ -74,10 +74,10 @@ - - QString state() const; - --signals: -+Q_SIGNALS: - void stateChanged(const QString &state); - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString &property, const QVariant &value); - - private: - -=== modified file 'a/lib/ofonomessagemanager.h' ---- a/lib/ofonomessagemanager.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonomessagemanager.h 2013-04-23 05:21:32 +0000 -@@ -53,7 +53,7 @@ - ~OfonoMessageManager(); - - Q_INVOKABLE QStringList getMessages() const; --public slots: -+public Q_SLOTS: - /* Properties */ - void requestServiceCenterAddress(); - void setServiceCenterAddress(QString address); -@@ -66,7 +66,7 @@ - - void sendMessage(const QString &to, const QString &message); - --signals: -+Q_SIGNALS: - void serviceCenterAddressChanged(const QString &address); - void useDeliveryReportsChanged(const bool &useDeliveryReports); - void bearerChanged(const QString &bearer); -@@ -88,7 +88,7 @@ - void immediateMessage(const QString &message, const QVariantMap &info); - void incomingMessage(const QString &message, const QVariantMap &info); - --private slots: -+private Q_SLOTS: - void validityChanged(bool); - void pathChanged(const QString& path); - void propertyChanged(const QString &property, const QVariant &value); - -=== modified file 'a/lib/ofonomessagewaiting.h' ---- a/lib/ofonomessagewaiting.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonomessagewaiting.h 2013-04-23 05:21:32 +0000 -@@ -48,17 +48,17 @@ - bool voicemailWaiting() const; - int voicemailMessageCount() const; - QString voicemailMailboxNumber() const; --public slots: -+public Q_SLOTS: - void setVoicemailMailboxNumber(QString mailboxnumber); - --signals: -+Q_SIGNALS: - void voicemailWaitingChanged(bool waiting); - void voicemailMessageCountChanged(int count); - void voicemailMailboxNumberChanged(const QString &mailboxnumber); - - void setVoicemailMailboxNumberFailed(); - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString& property, const QVariant& value); - void setPropertyFailed(const QString& property); - }; - -=== modified file 'a/lib/ofonomodem.h' ---- a/lib/ofonomodem.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonomodem.h 2013-04-23 05:21:32 +0000 -@@ -119,12 +119,12 @@ - QStringList features() const; - QStringList interfaces() const; - --public slots: -+public Q_SLOTS: - void setPowered(bool powered); - void setOnline(bool online); - void setLockdown(bool lockdown); - --signals: -+Q_SIGNALS: - //! Issued when a modem becomes unavailable or available again - void validityChanged(bool validity); - //! Issued when the object has switched to another modem -@@ -149,7 +149,7 @@ - void interfacesChanged(const QStringList &interfaces); - - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString &property, const QVariant &value); - void setPropertyFailed(const QString& property); - void modemAdded(const QString &modem); - -=== modified file 'a/lib/ofonomodeminterface.h' ---- a/lib/ofonomodeminterface.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonomodeminterface.h 2013-04-23 05:21:32 +0000 -@@ -89,7 +89,7 @@ - */ - QString errorMessage() const; - --signals: -+Q_SIGNALS: - //! Interface validity has changed - /*! - * This may mean that modem has become unavailable -@@ -102,7 +102,7 @@ - bool checkValidity(); - void updateValidity(); - --private slots: -+private Q_SLOTS: - void modemValidityChanged(bool validity); - void interfacesChanged(const QStringList &interfaces); - - -=== modified file 'a/lib/ofonomodemmanager.h' ---- a/lib/ofonomodemmanager.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonomodemmanager.h 2013-04-23 05:21:32 +0000 -@@ -44,14 +44,14 @@ - //! Returns a list of d-bus object paths that represent available modems - Q_INVOKABLE QStringList modems() const; - --signals: -+Q_SIGNALS: - //! Issued when a modem has been added - void modemAdded(const QString &modemPath); - - //! Issued when a modem has been removed - void modemRemoved(const QString &modemPath); - --private slots: -+private Q_SLOTS: - void onModemAdded(const QDBusObjectPath &path, const QVariantMap &map); - void onModemRemoved(const QDBusObjectPath &path); - - -=== modified file 'a/lib/ofononetworkoperator.h' ---- a/lib/ofononetworkoperator.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofononetworkoperator.h 2013-04-23 05:21:32 +0000 -@@ -86,10 +86,10 @@ - QStringList technologies() const; - QString additionalInfo() const; - --public slots: -+public Q_SLOTS: - void registerOp(); - --signals: -+Q_SIGNALS: - void registerComplete(bool success); - - void nameChanged(const QString &name); -@@ -101,7 +101,7 @@ - - private: - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString& property, const QVariant& value); - - void registerResp(); - -=== modified file 'a/lib/ofononetworkregistration.h' ---- a/lib/ofononetworkregistration.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofononetworkregistration.h 2013-04-23 05:21:32 +0000 -@@ -75,12 +75,12 @@ - uint strength() const; - QString baseStation() const; - --public slots: -+public Q_SLOTS: - void registerOp(); - void getOperators(); - void scan(); - --signals: -+Q_SIGNALS: - void modeChanged(const QString &mode); - void statusChanged(const QString &status); - void locationAreaCodeChanged(uint locationAreaCode); -@@ -96,7 +96,7 @@ - void getOperatorsComplete(bool success, const QStringList &operatorIds); - void scanComplete(bool success, const QStringList &operatorIds); - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString& property, const QVariant& value); - void registerResp(); - void registerErr(QDBusError error); - -=== modified file 'a/lib/ofonophonebook.h' ---- a/lib/ofonophonebook.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonophonebook.h 2013-04-23 05:21:32 +0000 -@@ -45,13 +45,13 @@ - - ~OfonoPhonebook(); - --public slots: -+public Q_SLOTS: - void import(); - --signals: -+Q_SIGNALS: - void importComplete(bool success, const QString &entries); - --private slots: -+private Q_SLOTS: - void importResp(const QString &entries); - void importErr(const QDBusError &error); - - -=== modified file 'a/lib/ofonoradiosettings.h' ---- a/lib/ofonoradiosettings.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonoradiosettings.h 2013-04-23 05:21:32 +0000 -@@ -50,13 +50,13 @@ - QString gsmBand() const; - QString umtsBand() const; - bool fastDormancy() const; --public slots: -+public Q_SLOTS: - void setTechnologyPreference(QString preference); - void setGsmBand(QString gsmBand); - void setUmtsBand(QString umtsBand); - void setFastDormancy(bool fastDormancy); - --signals: -+Q_SIGNALS: - void technologyPreferenceChanged(const QString &preference); - void setTechnologyPreferenceFailed(); - void gsmBandChanged(const QString &gsmBand); -@@ -66,7 +66,7 @@ - void fastDormancyChanged(bool fastDormancy); - void setFastDormancyFailed(); - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString& property, const QVariant& value); - void setPropertyFailed(const QString& property); - }; - -=== modified file 'a/lib/ofonosimmanager.h' ---- a/lib/ofonosimmanager.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonosimmanager.h 2013-04-23 05:21:32 +0000 -@@ -77,7 +77,7 @@ - bool fixedDialing() const; - bool barredDialing() const; - --public slots: -+public Q_SLOTS: - 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); -@@ -87,7 +87,7 @@ - - void setSubscriberNumbers(const QStringList &numbers); - --signals: -+Q_SIGNALS: - void presenceChanged(bool ispresent); - void subscriberIdentityChanged(const QString &imsi); - void mobileCountryCodeChanged(const QString &mcc); -@@ -110,7 +110,7 @@ - void unlockPinComplete(bool success); - void getIconComplete(bool success, const QByteArray &icon); - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString& property, const QVariant& value); - void setPropertyFailed(const QString& property); - - -=== modified file 'a/lib/ofonosupplementaryservices.h' ---- a/lib/ofonosupplementaryservices.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonosupplementaryservices.h 2013-04-23 05:21:32 +0000 -@@ -48,12 +48,12 @@ - /* Properties */ - QString state() const; - --public slots: -+public Q_SLOTS: - void initiate(const QString &command); - void respond(const QString &reply); - void cancel(); - --signals: -+Q_SIGNALS: - void notificationReceived(const QString &message); - void requestReceived(const QString &message); - -@@ -71,7 +71,7 @@ - void respondComplete(bool success, const QString &message); - void cancelComplete(bool success); - --private slots: -+private Q_SLOTS: - void pathChanged(const QString& path); - void propertyChanged(const QString& property, const QVariant& value); - void initiateResp(QString message, QDBusVariant details); - -=== modified file 'a/lib/ofonovoicecall.h' ---- a/lib/ofonovoicecall.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonovoicecall.h 2013-04-23 05:21:32 +0000 -@@ -92,12 +92,12 @@ - bool remoteHeld() const; - bool remoteMultiparty() const; - --public slots: -+public Q_SLOTS: - void answer(); - void hangup(); - void deflect(const QString &number); - --signals: -+Q_SIGNALS: - void answerComplete(bool status); - void hangupComplete(bool status); - void deflectComplete(bool status); -@@ -114,7 +114,7 @@ - void remoteHeldChanged(const bool remoteHeld); - void remoteMultipartyChanged(const bool remoteMultiparty); - --private slots: -+private Q_SLOTS: - void propertyChanged(const QString &property, const QVariant &value); - void answerResp(); - void answerErr(const QDBusError &error); - -=== modified file 'a/lib/ofonovoicecallmanager.h' ---- a/lib/ofonovoicecallmanager.h 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonovoicecallmanager.h 2013-04-23 05:21:32 +0000 -@@ -64,7 +64,7 @@ - - Q_INVOKABLE QStringList getCalls() const; - --public slots: -+public Q_SLOTS: - void dial(const QString &number, const QString &callerid_hide); - void hangupAll(); - void sendTones(const QString &tonestring); -@@ -76,7 +76,7 @@ - void createMultiparty(); - void hangupMultiparty(); - --signals: -+Q_SIGNALS: - void emergencyNumbersChanged(const QStringList &numbers); - void callAdded(const QString &call); - void callRemoved(const QString &call); -@@ -94,7 +94,7 @@ - void barringActive(const QString &type); - void forwarded(const QString &type); - --private slots: -+private Q_SLOTS: - void validityChanged(bool); - void pathChanged(const QString& path); - void propertyChanged(const QString &property, const QVariant &value); diff --git a/main/libofono-qt/03-update_MessageManager_VoiceCallManager_to_match_latest_ofono_api.patch b/main/libofono-qt/03-update_MessageManager_VoiceCallManager_to_match_latest_ofono_api.patch deleted file mode 100644 index 5f6c061f6..000000000 --- a/main/libofono-qt/03-update_MessageManager_VoiceCallManager_to_match_latest_ofono_api.patch +++ /dev/null @@ -1,154 +0,0 @@ -Description: update MessageManager and VoiceCallManager interfaces to match latest ofono api -Author: Tiago Salem Herrmann -Forwarded: no - -diff: -=== modified file 'a/lib/ofonomessagemanager.cpp' ---- a/lib/ofonomessagemanager.cpp 2013-04-23 05:14:42 +0000 -+++ b/lib/ofonomessagemanager.cpp 2013-04-23 05:22:22 +0000 -@@ -175,19 +175,21 @@ - } - - --void OfonoMessageManager::sendMessage(const QString &to, const QString &message) -+QDBusObjectPath OfonoMessageManager::sendMessage(const QString &to, const QString &message) - { - QDBusMessage request; -+ QDBusReply reply; -+ QDBusObjectPath objpath; - - request = QDBusMessage::createMethodCall("org.ofono", - path(), m_if->ifname(), - "SendMessage"); -- - request << to << message; -- -- QDBusConnection::systemBus().callWithCallback(request, this, -- SLOT(sendMessageResp(const QDBusObjectPath&)), -- SLOT(sendMessageErr(const QDBusError&))); -+ reply = QDBusConnection::systemBus().call(request); -+ if (reply.isValid()) { -+ objpath = reply; -+ } -+ return objpath; - } - - void OfonoMessageManager::requestPropertyComplete(bool success, const QString& property, const QVariant& value) -@@ -229,17 +231,6 @@ - } - } - --void OfonoMessageManager::sendMessageResp(const QDBusObjectPath& objectPath) --{ -- emit sendMessageComplete(true, objectPath.path()); --} -- --void OfonoMessageManager::sendMessageErr(QDBusError error) --{ -- m_if->setError(error.name(), error.message()); -- emit sendMessageComplete(false, QString()); --} -- - QStringList OfonoMessageManager::getMessages() const - { - return m_messagelist; - -=== modified file 'a/lib/ofonomessagemanager.h' ---- a/lib/ofonomessagemanager.h 2013-04-23 05:21:32 +0000 -+++ b/lib/ofonomessagemanager.h 2013-04-23 05:22:22 +0000 -@@ -64,7 +64,7 @@ - void requestAlphabet(); - void setAlphabet(QString alphabet); - -- void sendMessage(const QString &to, const QString &message); -+ QDBusObjectPath sendMessage(const QString &to, const QString &message); - - Q_SIGNALS: - void serviceCenterAddressChanged(const QString &address); -@@ -96,8 +96,6 @@ - void requestPropertyComplete(bool success, const QString &property, const QVariant &value); - void onMessageAdded(const QDBusObjectPath &message, const QVariantMap &properties); - void onMessageRemoved(const QDBusObjectPath &message); -- void sendMessageResp(const QDBusObjectPath& objectPath); -- void sendMessageErr(QDBusError error); - - private: - QStringList getMessageList(); - -=== modified file 'a/lib/ofonovoicecallmanager.cpp' ---- a/lib/ofonovoicecallmanager.cpp 2013-04-23 05:18:36 +0000 -+++ b/lib/ofonovoicecallmanager.cpp 2013-04-23 05:22:22 +0000 -@@ -139,9 +139,11 @@ - SIGNAL(forwarded(const QString&))); - } - --void OfonoVoiceCallManager::dial(const QString &number, const QString &callerid_hide) -+QDBusObjectPath OfonoVoiceCallManager::dial(const QString &number, const QString &callerid_hide) - { - QDBusMessage request; -+ QDBusReply reply; -+ QDBusObjectPath objpath; - request = QDBusMessage::createMethodCall("org.ofono", - path(), m_if->ifname(), - "Dial"); -@@ -149,10 +151,12 @@ - arg.append(QVariant(number)); - arg.append(QVariant(callerid_hide)); - request.setArguments(arg); -- QDBusConnection::systemBus().callWithCallback(request, this, -- SLOT(dialResp()), -- SLOT(dialErr(const QDBusError&)), -- DIAL_TIMEOUT); -+ -+ reply = QDBusConnection::systemBus().call(request); -+ if (reply.isValid()) { -+ objpath = reply; -+ } -+ return objpath; - } - - void OfonoVoiceCallManager::hangupAll() -@@ -410,10 +414,10 @@ - return m_calllist; - } - --void OfonoVoiceCallManager::callAddedChanged(const QDBusObjectPath &path, const QVariantMap& /*values*/) -+void OfonoVoiceCallManager::callAddedChanged(const QDBusObjectPath &path, const QVariantMap& values) - { - m_calllist << path.path(); -- emit callAdded(path.path()); -+ emit callAdded(path.path(), values); - } - - void OfonoVoiceCallManager::callRemovedChanged(const QDBusObjectPath &path) - -=== modified file 'a/lib/ofonovoicecallmanager.h' ---- a/lib/ofonovoicecallmanager.h 2013-04-23 05:21:32 +0000 -+++ b/lib/ofonovoicecallmanager.h 2013-04-23 05:22:22 +0000 -@@ -65,7 +65,7 @@ - Q_INVOKABLE QStringList getCalls() const; - - public Q_SLOTS: -- void dial(const QString &number, const QString &callerid_hide); -+ QDBusObjectPath dial(const QString &number, const QString &callerid_hide); - void hangupAll(); - void sendTones(const QString &tonestring); - void transfer(); -@@ -78,7 +78,7 @@ - - Q_SIGNALS: - void emergencyNumbersChanged(const QStringList &numbers); -- void callAdded(const QString &call); -+ void callAdded(const QString &call, const QVariantMap &values); - void callRemoved(const QString &call); - void dialComplete(const bool status); - void hangupAllComplete(const bool status); -@@ -98,7 +98,7 @@ - void validityChanged(bool); - void pathChanged(const QString& path); - void propertyChanged(const QString &property, const QVariant &value); -- void callAddedChanged(const QDBusObjectPath &call, const QVariantMap &properties); -+ void callAddedChanged(const QDBusObjectPath &call, const QVariantMap &values); - void callRemovedChanged(const QDBusObjectPath &call); - void dialResp(); - void dialErr(const QDBusError &error); diff --git a/main/libofono-qt/04-set_errors_on_dial_and_sendMessage.patch b/main/libofono-qt/04-set_errors_on_dial_and_sendMessage.patch deleted file mode 100644 index 5bf418d76..000000000 --- a/main/libofono-qt/04-set_errors_on_dial_and_sendMessage.patch +++ /dev/null @@ -1,121 +0,0 @@ -Description: set errors on dial() and sendMessage() -Author: Tiago Salem Herrmann -Forwarded: no - -diff: -=== modified file 'a/lib/ofonomessagemanager.cpp' ---- a/lib/ofonomessagemanager.cpp 2013-04-23 05:22:22 +0000 -+++ b/lib/ofonomessagemanager.cpp 2013-05-13 18:02:33 +0000 -@@ -175,7 +175,7 @@ - } - - --QDBusObjectPath OfonoMessageManager::sendMessage(const QString &to, const QString &message) -+QDBusObjectPath OfonoMessageManager::sendMessage(const QString &to, const QString &message, bool &success) - { - QDBusMessage request; - QDBusReply reply; -@@ -188,6 +188,10 @@ - reply = QDBusConnection::systemBus().call(request); - if (reply.isValid()) { - objpath = reply; -+ success = true; -+ } else { -+ m_if->setError(reply.error().name(), reply.error().message()); -+ success = false; - } - return objpath; - } - -=== modified file 'a/lib/ofonomessagemanager.h' ---- a/lib/ofonomessagemanager.h 2013-04-23 05:22:22 +0000 -+++ b/lib/ofonomessagemanager.h 2013-05-13 18:02:33 +0000 -@@ -64,7 +64,7 @@ - void requestAlphabet(); - void setAlphabet(QString alphabet); - -- QDBusObjectPath sendMessage(const QString &to, const QString &message); -+ QDBusObjectPath sendMessage(const QString &to, const QString &message, bool &success); - - Q_SIGNALS: - void serviceCenterAddressChanged(const QString &address); -@@ -76,7 +76,6 @@ - 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 QString& path); - - void setServiceCenterAddressFailed(); - void setUseDeliveryReportsFailed(); - -=== modified file 'a/lib/ofonovoicecallmanager.cpp' ---- a/lib/ofonovoicecallmanager.cpp 2013-04-23 05:22:22 +0000 -+++ b/lib/ofonovoicecallmanager.cpp 2013-05-13 18:02:33 +0000 -@@ -139,7 +139,7 @@ - SIGNAL(forwarded(const QString&))); - } - --QDBusObjectPath OfonoVoiceCallManager::dial(const QString &number, const QString &callerid_hide) -+QDBusObjectPath OfonoVoiceCallManager::dial(const QString &number, const QString &callerid_hide, bool &success) - { - QDBusMessage request; - QDBusReply reply; -@@ -155,6 +155,10 @@ - reply = QDBusConnection::systemBus().call(request); - if (reply.isValid()) { - objpath = reply; -+ success = true; -+ } else { -+ m_if->setError(reply.error().name(), reply.error().message()); -+ success = false; - } - return objpath; - } -@@ -354,17 +358,6 @@ - emit swapCallsComplete(false); - } - --void OfonoVoiceCallManager::dialResp() --{ -- emit dialComplete(true); --} -- --void OfonoVoiceCallManager::dialErr(const QDBusError &error) --{ -- m_if->setError(error.name(), error.message()); -- emit dialComplete(false); --} -- - void OfonoVoiceCallManager::hangupAllResp() - { - emit hangupAllComplete(true); - -=== modified file 'a/lib/ofonovoicecallmanager.h' ---- a/lib/ofonovoicecallmanager.h 2013-04-23 05:22:22 +0000 -+++ b/lib/ofonovoicecallmanager.h 2013-05-13 18:02:33 +0000 -@@ -65,7 +65,7 @@ - Q_INVOKABLE QStringList getCalls() const; - - public Q_SLOTS: -- QDBusObjectPath dial(const QString &number, const QString &callerid_hide); -+ QDBusObjectPath dial(const QString &number, const QString &callerid_hide, bool &success); - void hangupAll(); - void sendTones(const QString &tonestring); - void transfer(); -@@ -80,7 +80,6 @@ - void emergencyNumbersChanged(const QStringList &numbers); - void callAdded(const QString &call, const QVariantMap &values); - void callRemoved(const QString &call); -- void dialComplete(const bool status); - void hangupAllComplete(const bool status); - void sendTonesComplete(const bool status); - void transferComplete(const bool status); -@@ -100,8 +99,6 @@ - void propertyChanged(const QString &property, const QVariant &value); - void callAddedChanged(const QDBusObjectPath &call, const QVariantMap &values); - void callRemovedChanged(const QDBusObjectPath &call); -- void dialResp(); -- void dialErr(const QDBusError &error); - void hangupAllResp(); - void hangupAllErr(const QDBusError &error); - void sendTonesResp(); diff --git a/main/libofono-qt/05-update_connman_interface_to_the_new_layout.patch b/main/libofono-qt/05-update_connman_interface_to_the_new_layout.patch deleted file mode 100644 index 744a1dc2a..000000000 --- a/main/libofono-qt/05-update_connman_interface_to_the_new_layout.patch +++ /dev/null @@ -1,54 +0,0 @@ -Description: update connman interface to the new layout -Author: Tiago Salem Herrmann -Forwarded: no - -diff: -=== modified file 'a/lib/ofonoconnman.cpp' ---- a/lib/ofonoconnman.cpp 2013-04-23 05:18:36 +0000 -+++ b/lib/ofonoconnman.cpp 2013-05-14 16:19:47 +0000 -@@ -146,9 +146,11 @@ - emit deactivateAllComplete(false); - } - --void OfonoConnMan::addContext(const QString& type) -+QDBusObjectPath OfonoConnMan::addContext(const QString& type, bool &success) - { - QDBusMessage request; -+ QDBusReply reply; -+ QDBusObjectPath objpath; - - request = QDBusMessage::createMethodCall("org.ofono", - path(), m_if->ifname(), -@@ -158,10 +160,15 @@ - arg.append(QVariant(type)); - request.setArguments(arg); - -- QDBusConnection::systemBus().callWithCallback(request, this, -- SLOT(addContextResp(const QDBusObjectPath &)), -- SLOT(addContextErr(const QDBusError&)), -- ADD_TIMEOUT); -+ reply = QDBusConnection::systemBus().call(request); -+ if (reply.isValid()) { -+ objpath = reply; -+ success = true; -+ } else { -+ m_if->setError(reply.error().name(), reply.error().message()); -+ success = false; -+ } -+ return objpath; - } - - void OfonoConnMan::addContextResp(const QDBusObjectPath &path) - -=== modified file 'a/lib/ofonoconnman.h' ---- a/lib/ofonoconnman.h 2013-04-23 05:21:32 +0000 -+++ b/lib/ofonoconnman.h 2013-05-14 16:19:47 +0000 -@@ -71,7 +71,7 @@ - void setPowered(const bool); - void setRoamingAllowed(const bool); - void deactivateAll(); -- void addContext(const QString& type); -+ QDBusObjectPath addContext(const QString& type, bool &success); - void removeContext(const QString& path); - - Q_SIGNALS: diff --git a/main/libofono-qt/06-fix_unit_tests.patch b/main/libofono-qt/06-fix_unit_tests.patch deleted file mode 100644 index 75b4014c9..000000000 --- a/main/libofono-qt/06-fix_unit_tests.patch +++ /dev/null @@ -1,353 +0,0 @@ -Description: Fix unity tests -Author: Tiago Salem Herrmann -Forwarded: no - -diff: -=== modified file 'a/tests/test_ofonoconnman.cpp' ---- a/tests/test_ofonoconnman.cpp 2013-04-23 05:14:42 +0000 -+++ b/tests/test_ofonoconnman.cpp 2013-05-14 21:27:29 +0000 -@@ -52,6 +52,7 @@ - - void testOfonoConnMan() - { -+ bool addContextSuccess = false; - QSignalSpy attch(m, SIGNAL(attachedChanged(const bool))); - QSignalSpy sus(m,SIGNAL(suspendedChanged(const bool))); - QSignalSpy ber(m, SIGNAL(bearerChanged(const QString&))); -@@ -59,7 +60,6 @@ - QSignalSpy pow(m,SIGNAL(poweredChanged(const bool))); - QSignalSpy add(m, SIGNAL(contextAdded(const QString&))); - QSignalSpy rem(m, SIGNAL(contextRemoved(const QString&))); -- QSignalSpy cadd(m,SIGNAL(addContextComplete(bool, const QString&))); - QSignalSpy crem(m,SIGNAL(removeContextComplete(bool))); - QSignalSpy deact(m,SIGNAL(deactivateAllComplete(bool))); - -@@ -71,19 +71,19 @@ - QTest::qWait(5000); - m->setRoamingAllowed(true); - QTest::qWait(5000); -- m->addContext(QString("internet")); -+ QDBusObjectPath objectPath = m->addContext(QString("internet"), addContextSuccess); - QTest::qWait(10000); - QCOMPARE(m->powered(),true); - QCOMPARE(m->attached(),true); - QCOMPARE(m->suspended(),false); - QCOMPARE(m->roamingAllowed(),true); - -- QCOMPARE(cadd.count(), 1); -+ QCOMPARE(addContextSuccess, true); - QCOMPARE(pow.count(), 2); - QCOMPARE(roam.count(), 2); - QCOMPARE(add.count(), 1); - QString path = add.takeFirst().at(0).toString(); -- QString path2 = cadd.takeFirst().at(1).toString(); -+ QString path2 = objectPath.path(); - QCOMPARE(path, path2); - m->removeContext(path); - QTest::qWait(10000); - -=== modified file 'a/tests/test_ofonoconnmancontext.cpp' ---- a/tests/test_ofonoconnmancontext.cpp 2013-04-23 05:14:42 +0000 -+++ b/tests/test_ofonoconnmancontext.cpp 2013-05-14 21:27:29 +0000 -@@ -51,19 +51,18 @@ - - void testOfonoConnmanContext () - { -+ bool success = false; - QSignalSpy addcon(m,SIGNAL(addContextComplete(bool, const QString&))); - QSignalSpy conadd(m, SIGNAL(contextAdded(const QString&))); - QSignalSpy conrem(m, SIGNAL(contextRemoved(const QString&))); - -- m->addContext("internet"); -+ QDBusObjectPath objectPath = m->addContext("internet", success); - QTest::qWait(1000); - -- QCOMPARE(addcon.count(), 1); -- QVariantList list = addcon.takeFirst(); -- QCOMPARE(list.at(0).toBool(),true); -+ QCOMPARE(success, true); - QCOMPARE(conadd.count(), 1); - QString contextid = conadd.takeFirst().at(0).toString(); -- QCOMPARE(contextid, list.at(1).toString()); -+ QCOMPARE(contextid, objectPath.path()); - - OfonoConnmanContext* context = new OfonoConnmanContext(contextid); - - -=== modified file 'a/tests/test_ofonointerface.cpp' ---- a/tests/test_ofonointerface.cpp 2013-04-23 05:14:42 +0000 -+++ b/tests/test_ofonointerface.cpp 2013-05-14 21:27:29 +0000 -@@ -98,12 +98,13 @@ - QVariantList list; - bool online; - bool online_found; -+ int lastSignalCount = -1; - - oi->setProperty("Online", qVariantFromValue(false)); -- while (spy_changed.count() != 3 && spy_failed.count() == 0) { -- QTest::qWait(100); -+ while (spy_failed.count() == 0 && spy_changed.count() != lastSignalCount) { -+ lastSignalCount = spy_changed.count(); -+ QTest::qWait(1000); - } -- QCOMPARE(spy_changed.count(), 3); - QCOMPARE(spy_failed.count(), 0); - online = false; - online_found = false; -@@ -116,12 +117,16 @@ - } - QCOMPARE(online_found, true); - QCOMPARE(online, false); -- -+ - oi->setProperty("Online", qVariantFromValue(true)); -- while (spy_changed.count() < 3 && spy_failed.count() == 0) { -- QTest::qWait(100); -+ -+ lastSignalCount = -1; -+ while (spy_failed.count() == 0 && spy_changed.count() != lastSignalCount) { -+ lastSignalCount = spy_changed.count(); -+ QTest::qWait(1000); - } -- QVERIFY(spy_changed.count() > 3); -+ -+ qDebug() << lastSignalCount; - QCOMPARE(spy_failed.count(), 0); - online = false; - online_found = false; - -=== modified file 'a/tests/test_ofonomessagemanager.cpp' ---- a/tests/test_ofonomessagemanager.cpp 2013-04-23 05:14:42 +0000 -+++ b/tests/test_ofonomessagemanager.cpp 2013-05-14 21:27:29 +0000 -@@ -55,7 +55,7 @@ - - void testOfonoMessageManager() - { -- QSignalSpy sendMessage(m, SIGNAL(sendMessageComplete(bool, QString))); -+ bool success = false; - QSignalSpy messageAdded(m, SIGNAL(messageAdded(QString))); - QSignalSpy messageRemoved(m, SIGNAL(messageRemoved(QString))); - QSignalSpy immediateMessage(m, SIGNAL(immediateMessage(QString, QVariantMap))); -@@ -65,16 +65,13 @@ - QStringList messages = m->getMessages(); - QVERIFY(messages.count() == 0); - -- m->sendMessage("99999", "success"); -+ QDBusObjectPath objectPath = m->sendMessage("99999", "success", success); - - QTest::qWait(1000); - -- QCOMPARE(sendMessage.count(), 1); -- QVariantList params = sendMessage.takeFirst(); -- QCOMPARE(params.at(0).toBool(), true); -- QString objectPath = params.at(1).value(); -- QVERIFY(objectPath.length() > 0); -- qDebug() << objectPath; -+ QCOMPARE(success, true); -+ QVERIFY(objectPath.path().length() > 0); -+ qDebug() << objectPath.path(); - - QCOMPARE(messageAdded.count(), 1); - QCOMPARE(messageRemoved.count(), 1); -@@ -84,15 +81,12 @@ - QSignalSpy state(message, SIGNAL(stateChanged(const QString))); - qDebug() << message->state(); - -- m->sendMessage("abc", "fail"); -+ objectPath = m->sendMessage("abc", "fail", success); - - QTest::qWait(1000); - -- QCOMPARE(sendMessage.count(), 1); -- params = sendMessage.takeFirst(); -- QCOMPARE(params.at(0).toBool(), false); -- objectPath = params.at(1).value(); -- QVERIFY(objectPath.length() == 0); -+ QCOMPARE(success, false); -+ QVERIFY(objectPath.path().length() == 0); - } - - void testOfonoMessageManagerSca() - -=== modified file 'a/tests/test_ofonomultipartycall.cpp' ---- a/tests/test_ofonomultipartycall.cpp 2013-04-23 05:14:42 +0000 -+++ b/tests/test_ofonomultipartycall.cpp 2013-05-14 21:27:29 +0000 -@@ -68,10 +68,10 @@ - // 12. Hangup all calls - - QVariantList variantList; -+ bool success = true; - - // VoiceCallManager Spy's -- QSignalSpy dialreg(m,SIGNAL(dialComplete(bool))); -- QSignalSpy dspy(m, SIGNAL(callAdded(QString))); -+ QSignalSpy dspy(m, SIGNAL(callAdded(QString, QVariantMap))); - QSignalSpy rspy(m, SIGNAL(callRemoved(QString))); - QSignalSpy haspy(m, SIGNAL(hangupAllComplete(bool))); - QSignalSpy haaspy(m, SIGNAL(holdAndAnswerComplete(bool))); -@@ -81,11 +81,10 @@ - QSignalSpy pcspy(m, SIGNAL(privateChatComplete(bool, QStringList))); - - // 1. Dial a call (outgoing) -- m->dial("123",""); -+ QDBusObjectPath objectPath = m->dial("123","", success); - QTest::qWait(1000); - -- QCOMPARE(dialreg.count(), 1); -- QCOMPARE(dialreg.takeFirst().at(0).toBool(),true); -+ QCOMPARE(success, true); - QCOMPARE(dspy.count(), 1); - QString c1id = dspy.takeFirst().at(0).toString(); - -@@ -122,11 +121,10 @@ - - // 2. Receive a call - // - dial "199" to trigger phonesim callback -- m->dial("199",""); -+ objectPath = m->dial("199","", success); - QTest::qWait(8000); - -- QCOMPARE(dialreg.count(), 1); -- QCOMPARE(dialreg.takeFirst().at(0).toBool(),false); -+ QCOMPARE(success,false); - QCOMPARE(dspy.count(),1); - QString c2id = dspy.takeFirst().at(0).toString(); - -@@ -207,11 +205,10 @@ - QCOMPARE(c2->state(),QString("held")); - - // 6. Dial a 3rd call -- m->dial("456",""); -+ objectPath = m->dial("456","", success); - QTest::qWait(1000); - -- QCOMPARE(dialreg.count(), 1); -- QCOMPARE(dialreg.takeFirst().at(0).toBool(),true); -+ QCOMPARE(success, true); - QCOMPARE(dspy.count(), 1); - QString c3id = dspy.takeFirst().at(0).toString(); - - -=== modified file 'a/tests/test_ofonovoicecall.cpp' ---- a/tests/test_ofonovoicecall.cpp 2013-04-23 05:14:42 +0000 -+++ b/tests/test_ofonovoicecall.cpp 2013-05-14 21:27:29 +0000 -@@ -51,17 +51,17 @@ - - void testOfonoVoiceCall() - { -- QSignalSpy dialreg(m,SIGNAL(dialComplete(bool))); -- QSignalSpy dspy(m, SIGNAL(callAdded(QString))); -+ bool success = false; -+ QSignalSpy dspy(m, SIGNAL(callAdded(QString, QVariantMap))); - - // Dial and hangup -- m->dial("123",""); -+ QDBusObjectPath objectPath = m->dial("123","", success); - QTest::qWait(1000); - -- QCOMPARE(dialreg.count(), 1); -- QCOMPARE(dialreg.takeFirst().at(0).toBool(),true); -+ QCOMPARE(objectPath.path().isEmpty(), false); -+ QCOMPARE(success,true); - QCOMPARE(dspy.count(), 1); -- QString callid = dspy.takeFirst().at(0).toString(); -+ QString callid = objectPath.path(); - - OfonoVoiceCall* call = new OfonoVoiceCall(callid); - -@@ -106,10 +106,11 @@ - - void testOfonoVoiceCallStep2() - { -+ bool success = false; - //Dial failure, incoming, answer and local hangup -- QSignalSpy callsignal(m, SIGNAL(callAdded(const QString))); -+ QSignalSpy callsignal(m, SIGNAL(callAdded(const QString, QVariantMap))); - -- m->dial("199",""); -+ QDBusObjectPath objectPath = m->dial("199","", success); - QTest::qWait(8000); - - QCOMPARE(callsignal.count(),1); -@@ -158,10 +159,11 @@ - - void testOfonoVoiceCallStep3() - { -+ bool success = false; - //Dial failed, incoming, no answer and state change to disconnect -- QSignalSpy callsignal(m, SIGNAL(callAdded(const QString))); -+ QSignalSpy callsignal(m, SIGNAL(callAdded(const QString, QVariantMap))); - -- m->dial("177",""); -+ QDBusObjectPath objectPath = m->dial("177","", success); - QTest::qWait(3000); - - QCOMPARE(callsignal.count(),1); -@@ -182,9 +184,10 @@ - } - void testOfonoVoiceCallStep4() - { -+ bool success = false; - //Deflect -- QSignalSpy callsignal(m, SIGNAL(callAdded(const QString))); -- m->dial("199",""); -+ QSignalSpy callsignal(m, SIGNAL(callAdded(const QString, QVariantMap))); -+ QDBusObjectPath objectPath = m->dial("199","", success); - QTest::qWait(8000); - - QCOMPARE(callsignal.count(),1); - -=== modified file 'a/tests/test_ofonovoicecallmanager.cpp' ---- a/tests/test_ofonovoicecallmanager.cpp 2013-04-23 05:14:42 +0000 -+++ b/tests/test_ofonovoicecallmanager.cpp 2013-05-14 21:27:29 +0000 -@@ -52,11 +52,11 @@ - - void testOfonoVoiceCallManager() - { -+ bool success = false; - QVERIFY(m->emergencyNumbers().count() > 0); - - QSignalSpy emergencyNumbers(m, SIGNAL(emergencyNumbersChanged(QStringList))); -- QSignalSpy dialreg(m,SIGNAL(dialComplete(bool))); -- QSignalSpy dspy(m, SIGNAL(callAdded(QString))); -+ QSignalSpy dspy(m, SIGNAL(callAdded(QString, QVariantMap))); - QSignalSpy hupreg(m,SIGNAL(hangupAllComplete(bool))); - QSignalSpy tonereg(m,SIGNAL(sendTonesComplete(bool))); - QSignalSpy hspy(m, SIGNAL(callRemoved(QString))); -@@ -71,11 +71,11 @@ - QCOMPARE(emergencyNumbers.count(), 1); - QVERIFY(emergencyNumbers.takeFirst().at(0).toStringList().count() > 0); - //Dial testing -- m->dial("123",""); -+ QDBusObjectPath objectPath = m->dial("123","", success); - qDebug() << "Please find a call in 'Dialing' state in phonesim window and press 'Active' button"; - QTest::qWait(15000); -- QCOMPARE(dialreg.count(), 1); -- QCOMPARE(dialreg.takeFirst().at(0).toBool(),true); -+ QCOMPARE(objectPath.path().isEmpty(), false); -+ QCOMPARE(success, true); - QCOMPARE(dspy.count(), 1); - //Tones testing - QTest::qWait(5000); -@@ -97,17 +97,17 @@ - - void testoFonoVoiceCallManagerStep2() - { -+ bool success = false; - // test dial failure and hangup of incoming alerting call -- QSignalSpy dialreg(m,SIGNAL(dialComplete(bool))); - QSignalSpy hupreg(m,SIGNAL(hangupAllComplete(bool))); -- QSignalSpy dspy(m, SIGNAL(callAdded(QString))); -+ QSignalSpy dspy(m, SIGNAL(callAdded(QString, QVariantMap))); - QSignalSpy hspy(m, SIGNAL(callRemoved(QString))); - - -- m->dial("199",""); -+ QDBusObjectPath objectPath = m->dial("199","", success); - QTest::qWait(5000); -- QCOMPARE(dialreg.count(), 1); -- QCOMPARE(dialreg.takeFirst().at(0).toBool(),false); -+ QCOMPARE(objectPath.path().isEmpty(), false); -+ QCOMPARE(success, false); - QTest::qWait(10000); - QCOMPARE(dspy.count(), 1); diff --git a/main/libofono-qt/07-simplify_code_logic.patch b/main/libofono-qt/07-simplify_code_logic.patch deleted file mode 100644 index 3cac67508..000000000 --- a/main/libofono-qt/07-simplify_code_logic.patch +++ /dev/null @@ -1,93 +0,0 @@ -Description: Simplify code logic -Author: Tiago Salem Herrmann -Forwarded: no - -diff: -=== modified file 'a/lib/ofonoconnman.cpp' ---- a/lib/ofonoconnman.cpp 2013-05-14 16:19:47 +0000 -+++ b/lib/ofonoconnman.cpp 2013-05-14 21:43:39 +0000 -@@ -150,7 +150,6 @@ - { - QDBusMessage request; - QDBusReply reply; -- QDBusObjectPath objpath; - - request = QDBusMessage::createMethodCall("org.ofono", - path(), m_if->ifname(), -@@ -161,14 +160,11 @@ - request.setArguments(arg); - - reply = QDBusConnection::systemBus().call(request); -- if (reply.isValid()) { -- objpath = reply; -- success = true; -- } else { -+ success = reply.isValid(); -+ if (!success) { - m_if->setError(reply.error().name(), reply.error().message()); -- success = false; - } -- return objpath; -+ return reply; - } - - void OfonoConnMan::addContextResp(const QDBusObjectPath &path) - -=== modified file 'a/lib/ofonomessagemanager.cpp' ---- a/lib/ofonomessagemanager.cpp 2013-05-13 18:02:33 +0000 -+++ b/lib/ofonomessagemanager.cpp 2013-05-14 21:43:39 +0000 -@@ -179,21 +179,17 @@ - { - QDBusMessage request; - QDBusReply reply; -- QDBusObjectPath objpath; - - request = QDBusMessage::createMethodCall("org.ofono", - path(), m_if->ifname(), - "SendMessage"); - request << to << message; - reply = QDBusConnection::systemBus().call(request); -- if (reply.isValid()) { -- objpath = reply; -- success = true; -- } else { -+ success = reply.isValid(); -+ if (!success) { - m_if->setError(reply.error().name(), reply.error().message()); -- success = false; - } -- return objpath; -+ return reply; - } - - void OfonoMessageManager::requestPropertyComplete(bool success, const QString& property, const QVariant& value) - -=== modified file 'a/lib/ofonovoicecallmanager.cpp' ---- a/lib/ofonovoicecallmanager.cpp 2013-05-13 18:02:33 +0000 -+++ b/lib/ofonovoicecallmanager.cpp 2013-05-14 21:43:39 +0000 -@@ -143,7 +143,6 @@ - { - QDBusMessage request; - QDBusReply reply; -- QDBusObjectPath objpath; - request = QDBusMessage::createMethodCall("org.ofono", - path(), m_if->ifname(), - "Dial"); -@@ -153,14 +152,11 @@ - request.setArguments(arg); - - reply = QDBusConnection::systemBus().call(request); -- if (reply.isValid()) { -- objpath = reply; -- success = true; -- } else { -+ success = reply.isValid(); -+ if (!success) { - m_if->setError(reply.error().name(), reply.error().message()); -- success = false; - } -- return objpath; -+ return reply; - } - - void OfonoVoiceCallManager::hangupAll() diff --git a/main/libofono-qt/08-add-delivery-report.patch b/main/libofono-qt/08-add-delivery-report.patch deleted file mode 100644 index 0abd5ab44..000000000 --- a/main/libofono-qt/08-add-delivery-report.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Add delivery report support -Author: Tiago Salem Herrmann -Forwarded: no - -diff: -=== modified file 'a/lib/ofonomessagemanager.cpp' ---- a/lib/ofonomessagemanager.cpp 2013-05-14 21:43:39 +0000 -+++ b/lib/ofonomessagemanager.cpp 2013-12-11 14:00:49 +0000 -@@ -115,6 +115,10 @@ - "ImmediateMessage", - this, - SIGNAL(immediateMessage(QString, QVariantMap))); -+ QDBusConnection::systemBus().disconnect("org.ofono", QString(), m_if->ifname(), -+ "StatusReport", -+ this, -+ SIGNAL(statusReport(QString, QVariantMap))); - - QDBusConnection::systemBus().connect("org.ofono", path, m_if->ifname(), - "MessageAdded", -@@ -132,6 +136,10 @@ - "ImmediateMessage", - this, - SIGNAL(immediateMessage(QString, QVariantMap))); -+ QDBusConnection::systemBus().connect("org.ofono", path, m_if->ifname(), -+ "StatusReport", -+ this, -+ SIGNAL(statusReport(QString, QVariantMap))); - } - - void OfonoMessageManager::requestServiceCenterAddress() - -=== modified file 'a/lib/ofonomessagemanager.h' ---- a/lib/ofonomessagemanager.h 2013-05-13 18:02:33 +0000 -+++ b/lib/ofonomessagemanager.h 2013-12-11 14:00:49 +0000 -@@ -86,6 +86,7 @@ - void messageRemoved(const QString &message); - void immediateMessage(const QString &message, const QVariantMap &info); - void incomingMessage(const QString &message, const QVariantMap &info); -+ void statusReport(const QString &message, const QVariantMap &info); - - private Q_SLOTS: - void validityChanged(bool); - diff --git a/main/libofono-qt/09-createMultiparty-synchronous.patch b/main/libofono-qt/09-createMultiparty-synchronous.patch deleted file mode 100644 index ea5e7b9cc..000000000 --- a/main/libofono-qt/09-createMultiparty-synchronous.patch +++ /dev/null @@ -1,51 +0,0 @@ -Description: Make createMultiparty() synchronous -Author: Tiago Salem Herrmann -Forwarded: no - -diff: -=== modified file 'lib/ofonovoicecallmanager.cpp' ---- a/lib/ofonovoicecallmanager.cpp 2013-05-14 21:43:39 +0000 -+++ b/lib/ofonovoicecallmanager.cpp 2014-02-07 20:33:22 +0000 -@@ -256,17 +256,23 @@ - PRIVATE_CHAT_TIMEOUT); - } - --void OfonoVoiceCallManager::createMultiparty() -+QList OfonoVoiceCallManager::createMultiparty() - { - QDBusMessage request; -+ QDBusReply > reply; - request = QDBusMessage::createMethodCall("org.ofono", - path(), m_if->ifname(), - "CreateMultiparty"); - -- QDBusConnection::systemBus().callWithCallback(request, this, -- SLOT(createMultipartyResp(const QList&)), -- SLOT(createMultipartyErr(const QDBusError&)), -- CREATE_MULTIPARTY_TIMEOUT); -+ request = QDBusMessage::createMethodCall("org.ofono", -+ path(), m_if->ifname(), -+ "CreateMultiparty"); -+ reply = QDBusConnection::systemBus().call(request); -+ bool success = reply.isValid(); -+ if (!success) { -+ m_if->setError(reply.error().name(), reply.error().message()); -+ } -+ return reply; - } - - void OfonoVoiceCallManager::hangupMultiparty() - -=== modified file 'lib/ofonovoicecallmanager.h' ---- a/lib/ofonovoicecallmanager.h 2013-05-13 18:02:33 +0000 -+++ b/lib/ofonovoicecallmanager.h 2014-02-07 20:33:22 +0000 -@@ -73,7 +73,7 @@ - void releaseAndAnswer(); - void holdAndAnswer(); - void privateChat(const QString &path); -- void createMultiparty(); -+ QList createMultiparty(); - void hangupMultiparty(); - - Q_SIGNALS: - diff --git a/main/libofono-qt/10-use_right_modem_objpath.patch b/main/libofono-qt/10-use_right_modem_objpath.patch deleted file mode 100644 index cf03a32ca..000000000 --- a/main/libofono-qt/10-use_right_modem_objpath.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: do not fallback to / when using ManualSelect -Author: Tiago Salem Herrmann -Forwarded: no - -diff: -Index: ofono-qt-1.5+git20120419+bcf0c04/lib/ofonomodem.cpp -=================================================================== ---- ofono-qt-1.5+git20120419+bcf0c04.orig/lib/ofonomodem.cpp 2012-04-19 12:03:52.000000000 -0300 -+++ ofono-qt-1.5+git20120419+bcf0c04/lib/ofonomodem.cpp 2014-03-26 10:24:13.250630065 -0300 -@@ -41,8 +41,7 @@ - if (setting == AutomaticSelect) - finalModemPath = m_mm->modems().value(0); - else if (setting == ManualSelect) -- if (m_mm->modems().contains(modemPath)) -- finalModemPath = modemPath; -+ finalModemPath = modemPath; - - if (finalModemPath.isEmpty()) { - finalModemPath = "/"; -@@ -122,8 +121,6 @@ - } - m_if->setPath(modemPath); - emit pathChanged(modemPath); -- } else if (m_selectionSetting == ManualSelect) { -- m_if->setPath("/"); - } - } - // validity has changed diff --git a/main/libofono-qt/11_use_libdir.patch b/main/libofono-qt/11_use_libdir.patch deleted file mode 100644 index dd5d2ef1b..000000000 --- a/main/libofono-qt/11_use_libdir.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Install libraries and pkg-config file into (multiarch on Ubuntu) libdir -Author: Iain Lane - -Index: b/lib/lib.pro -=================================================================== ---- a/lib/lib.pro -+++ b/lib/lib.pro -@@ -60,12 +60,13 @@ - SOURCES += ofonoconnman.cpp - SOURCES += ofonoconnmancontext.cpp - --target.path = $$[QT_INSTALL_PREFIX]/lib -+target.path = $$[QT_INSTALL_LIBS] - headers.files = $$PUBLIC_HEADERS - headers.path = $$[QT_INSTALL_PREFIX]/include/ofono-qt - - CONFIG += create_pc create_prl - -+QMAKE_PKGCONFIG_PREFIX = $$[QT_INSTALL_LIBS] - QMAKE_PKGCONFIG_DESTDIR = pkgconfig - QMAKE_PKGCONFIG_INCDIR = $$headers.path -