diff --git a/src/gui/server/guiserverimpl.cpp b/src/gui/server/guiserverimpl.cpp index bc721079f43c37b0aa04b01a41ad8dad5cd9a4ad..3d31da7a4f2ea2056e3acf5a4b9b38c9675b892a 100644 --- a/src/gui/server/guiserverimpl.cpp +++ b/src/gui/server/guiserverimpl.cpp @@ -286,9 +286,9 @@ GUIServerImpl::dtmfCall(const std::string& callId, const std::string& dtmfKey) std::string GUIServerImpl::version() { - std::ostringstream version; - version << PROGNAME << " " << SFLPHONED_VERSION; - return version.str(); + std::ostringstream programVersion; + programVersion << PROGNAME << " " << SFLPHONED_VERSION; + return programVersion.str(); } diff --git a/src/gui/server/request.h b/src/gui/server/request.h index 89fc97ad24344dc7ab147fb0e877ce924a7f07ce..5ad2f8947005149f2f5c4d31c6be4648b3d93e2d 100644 --- a/src/gui/server/request.h +++ b/src/gui/server/request.h @@ -49,7 +49,7 @@ public: ResponseMessage response(code, _sequenceId, arg); return response; } - std::string sequenceId () const { return _sequenceId; } + std::string getSequenceId () const { return _sequenceId; } protected: std::string _sequenceId; diff --git a/src/gui/server/requestmanager.cpp b/src/gui/server/requestmanager.cpp index 685993338478994e21a7420e58d4da7520eb1276..6511c88cfa224d1fbd217680a5aaa99bba89a64b 100644 --- a/src/gui/server/requestmanager.cpp +++ b/src/gui/server/requestmanager.cpp @@ -96,9 +96,9 @@ RequestManager::handleExecutedRequest(Request * request, const ResponseMessage& delete request; request = NULL; } else { ost::MutexLock lock(_waitingRequestsMutex); - if (_waitingRequests.find(request->sequenceId()) == _waitingRequests.end()) { + if (_waitingRequests.find(request->getSequenceId()) == _waitingRequests.end()) { // add the requests - _waitingRequests[response.sequenceId()] = request; + _waitingRequests[response.getSequenceId()] = request; } else { // we don't deal with requests with a sequenceId already send... delete request; request = NULL; @@ -137,7 +137,7 @@ RequestManager::sendResponse(const ResponseMessage& response) { // remove the request from the waiting requests list if (response.isFinal()) { ost::MutexLock lock(_waitingRequestsMutex); - std::map<std::string, Request*>::iterator iter = _waitingRequests.find(response.sequenceId()); + std::map<std::string, Request*>::iterator iter = _waitingRequests.find(response.getSequenceId()); if (iter != _waitingRequests.end()) { delete iter->second; iter->second = NULL; diff --git a/src/gui/server/responsemessage.h b/src/gui/server/responsemessage.h index 093c1f3ed0e0ba85d742b5388238f543be6e2b43..922e949eca0b0789f125fe2b69e595f473324ccd 100644 --- a/src/gui/server/responsemessage.h +++ b/src/gui/server/responsemessage.h @@ -37,7 +37,7 @@ public: ResponseMessage(const std::string& code,const std::string& seq, TokenList& arg); ~ResponseMessage(); - std::string sequenceId() const { return _seq; } + std::string getSequenceId() const { return _seq; } std::string toString() const; bool isFinal() const;