diff --git a/linphone-app/src/components/core/CoreHandlers.cpp b/linphone-app/src/components/core/CoreHandlers.cpp index af35c824c..e7cfb19dd 100644 --- a/linphone-app/src/components/core/CoreHandlers.cpp +++ b/linphone-app/src/components/core/CoreHandlers.cpp @@ -185,11 +185,11 @@ void CoreHandlers::onChatRoomStateChanged( void CoreHandlers::onConfiguringStatus( const std::shared_ptr & core, - linphone::Config::ConfiguringState status, + linphone::ConfiguringState status, const std::string & message){ Q_UNUSED(core) emit setLastRemoteProvisioningState(status); - if(status == linphone::Config::ConfiguringState::Failed){ + if(status == linphone::ConfiguringState::Failed){ qWarning() << "Remote provisioning has failed and was removed : "<< QString::fromStdString(message); core->setProvisioningUri(""); } diff --git a/linphone-app/src/components/core/CoreHandlers.hpp b/linphone-app/src/components/core/CoreHandlers.hpp index e2d790e0f..64fe884b2 100644 --- a/linphone-app/src/components/core/CoreHandlers.hpp +++ b/linphone-app/src/components/core/CoreHandlers.hpp @@ -58,7 +58,7 @@ signals: void presenceStatusReceived(std::shared_ptr contact); void registrationStateChanged (const std::shared_ptr &account, linphone::RegistrationState state); void ecCalibrationResult(linphone::EcCalibratorStatus status, int delayMs); - void setLastRemoteProvisioningState(const linphone::Config::ConfiguringState &state); + void setLastRemoteProvisioningState(const linphone::ConfiguringState &state); void conferenceInfoReceived(const std::shared_ptr & conferenceInfo); void foundQRCode(const std::string & result); @@ -77,7 +77,7 @@ public slots: void onCallCreated(const std::shared_ptr & lc,const std::shared_ptr & call); void onChatRoomRead(const std::shared_ptr & core, const std::shared_ptr & chatRoom); void onChatRoomStateChanged(const std::shared_ptr & core, const std::shared_ptr & chatRoom,linphone::ChatRoom::State state); - void onConfiguringStatus(const std::shared_ptr & core,linphone::Config::ConfiguringState status,const std::string & message); + void onConfiguringStatus(const std::shared_ptr & core,linphone::ConfiguringState status,const std::string & message); void onDtmfReceived(const std::shared_ptr & lc,const std::shared_ptr & call,int dtmf); void onGlobalStateChanged (const std::shared_ptr &core,linphone::GlobalState gstate,const std::string &message); void onIsComposingReceived (const std::shared_ptr &core,const std::shared_ptr &room); diff --git a/linphone-app/src/components/core/CoreListener.cpp b/linphone-app/src/components/core/CoreListener.cpp index 00aecdb42..1c7df2701 100644 --- a/linphone-app/src/components/core/CoreListener.cpp +++ b/linphone-app/src/components/core/CoreListener.cpp @@ -57,7 +57,7 @@ void CoreListener::onChatRoomRead(const std::shared_ptr & core, void CoreListener::onChatRoomStateChanged(const std::shared_ptr & core, const std::shared_ptr & chatRoom,linphone::ChatRoom::State state){ emit chatRoomStateChanged(core, chatRoom,state); } -void CoreListener::onConfiguringStatus(const std::shared_ptr & core,linphone::Config::ConfiguringState status,const std::string & message){ +void CoreListener::onConfiguringStatus(const std::shared_ptr & core,linphone::ConfiguringState status,const std::string & message){ emit configuringStatus(core,status,message); } void CoreListener::onDtmfReceived(const std::shared_ptr & lc,const std::shared_ptr & call,int dtmf){ diff --git a/linphone-app/src/components/core/CoreListener.hpp b/linphone-app/src/components/core/CoreListener.hpp index b9293a6f5..6edef18ed 100644 --- a/linphone-app/src/components/core/CoreListener.hpp +++ b/linphone-app/src/components/core/CoreListener.hpp @@ -44,7 +44,7 @@ public: virtual void onCallCreated(const std::shared_ptr & lc,const std::shared_ptr & call) override; virtual void onChatRoomRead(const std::shared_ptr & core, const std::shared_ptr & chatRoom) override; virtual void onChatRoomStateChanged(const std::shared_ptr & core, const std::shared_ptr & chatRoom,linphone::ChatRoom::State state) override; - virtual void onConfiguringStatus(const std::shared_ptr & core,linphone::Config::ConfiguringState status,const std::string & message) override; + virtual void onConfiguringStatus(const std::shared_ptr & core,linphone::ConfiguringState status,const std::string & message) override; virtual void onDtmfReceived(const std::shared_ptr & lc,const std::shared_ptr & call,int dtmf) override; virtual void onGlobalStateChanged (const std::shared_ptr &core,linphone::GlobalState gstate,const std::string &message) override; virtual void onIsComposingReceived (const std::shared_ptr &core,const std::shared_ptr &room) override; @@ -72,7 +72,7 @@ signals: void callCreated(const std::shared_ptr & lc,const std::shared_ptr & call); void chatRoomRead(const std::shared_ptr & core, const std::shared_ptr & chatRoom); void chatRoomStateChanged(const std::shared_ptr & core, const std::shared_ptr & chatRoom,linphone::ChatRoom::State state); - void configuringStatus(const std::shared_ptr & core,linphone::Config::ConfiguringState status,const std::string & message); + void configuringStatus(const std::shared_ptr & core,linphone::ConfiguringState status,const std::string & message); void dtmfReceived(const std::shared_ptr & lc,const std::shared_ptr & call,int dtmf); void globalStateChanged (const std::shared_ptr &core,linphone::GlobalState gstate,const std::string &message); void isComposingReceived (const std::shared_ptr &core,const std::shared_ptr &room); diff --git a/linphone-app/src/components/core/CoreManager.cpp b/linphone-app/src/components/core/CoreManager.cpp index c9c9f7f12..daf3d0471 100644 --- a/linphone-app/src/components/core/CoreManager.cpp +++ b/linphone-app/src/components/core/CoreManager.cpp @@ -70,7 +70,7 @@ CoreManager::CoreManager (QObject *parent, const QString &configPath) : QObject(parent) { mHandlers = QSharedPointer::create(this); mCore = nullptr; - mLastRemoteProvisioningState = linphone::Config::ConfiguringState::Skipped; + mLastRemoteProvisioningState = linphone::ConfiguringState::Skipped; CoreHandlers *coreHandlers = mHandlers.get(); QObject::connect(coreHandlers, &CoreHandlers::coreStarting, this, &CoreManager::startIterate, Qt::QueuedConnection); QObject::connect(coreHandlers, &CoreHandlers::setLastRemoteProvisioningState, this, &CoreManager::setLastRemoteProvisioningState); @@ -462,14 +462,14 @@ QString CoreManager::getDownloadUrl () { return Constants::DownloadUrl; } -void CoreManager::setLastRemoteProvisioningState(const linphone::Config::ConfiguringState& state){ +void CoreManager::setLastRemoteProvisioningState(const linphone::ConfiguringState& state){ mLastRemoteProvisioningState = state; - if (state == linphone::Config::ConfiguringState::Failed) + if (state == linphone::ConfiguringState::Failed) emit remoteProvisioningFailed(); } bool CoreManager::isLastRemoteProvisioningGood(){ - return mLastRemoteProvisioningState != linphone::Config::ConfiguringState::Failed; + return mLastRemoteProvisioningState != linphone::ConfiguringState::Failed; } QString CoreManager::getUserAgent()const { diff --git a/linphone-app/src/components/core/CoreManager.hpp b/linphone-app/src/components/core/CoreManager.hpp index 6a32f578a..a4703b940 100644 --- a/linphone-app/src/components/core/CoreManager.hpp +++ b/linphone-app/src/components/core/CoreManager.hpp @@ -177,7 +177,7 @@ public slots: void initCoreManager(); void startIterate(); void stopIterate(); - void setLastRemoteProvisioningState(const linphone::Config::ConfiguringState& state); + void setLastRemoteProvisioningState(const linphone::ConfiguringState& state); void createLinphoneCore (const QString &configPath);// In order to delay creation void handleChatRoomCreated(const QSharedPointer &chatRoomModel); @@ -219,7 +219,7 @@ private: QSharedPointer mHandlers; bool mStarted = false; - linphone::Config::ConfiguringState mLastRemoteProvisioningState; + linphone::ConfiguringState mLastRemoteProvisioningState; CallsListModel *mCallsListModel = nullptr; ContactsListModel *mContactsListModel = nullptr; diff --git a/linphone-app/src/utils/LinphoneEnums.cpp b/linphone-app/src/utils/LinphoneEnums.cpp index d14748e0e..fd119d8fc 100644 --- a/linphone-app/src/utils/LinphoneEnums.cpp +++ b/linphone-app/src/utils/LinphoneEnums.cpp @@ -42,7 +42,7 @@ void LinphoneEnums::registerMetaTypes(){ qRegisterMetaType>(); qRegisterMetaType(); qRegisterMetaType>(); - qRegisterMetaType(); + qRegisterMetaType(); qRegisterMetaType(); qRegisterMetaType(); qRegisterMetaType>(); diff --git a/linphone-app/src/utils/LinphoneEnums.hpp b/linphone-app/src/utils/LinphoneEnums.hpp index 0c14563bb..b90b2c392 100644 --- a/linphone-app/src/utils/LinphoneEnums.hpp +++ b/linphone-app/src/utils/LinphoneEnums.hpp @@ -234,7 +234,7 @@ Q_DECLARE_METATYPE(LinphoneEnums::TransportType) Q_DECLARE_METATYPE(std::shared_ptr) Q_DECLARE_METATYPE(linphone::Call::State) Q_DECLARE_METATYPE(std::shared_ptr) -Q_DECLARE_METATYPE(linphone::Config::ConfiguringState) +Q_DECLARE_METATYPE(linphone::ConfiguringState) Q_DECLARE_METATYPE(std::string) Q_DECLARE_METATYPE(linphone::GlobalState) Q_DECLARE_METATYPE(std::shared_ptr)