From 6826b41b2ba2660bff5f67e0d3937187d787bec7 Mon Sep 17 00:00:00 2001
From: yanmorin <yanmorin>
Date: Mon, 17 Oct 2005 17:01:35 +0000
Subject: [PATCH] Remove warning in strict mode
---
src/gui/server/guiserverimpl.cpp | 6 +++---
src/gui/server/request.h | 2 +-
src/gui/server/requestmanager.cpp | 6 +++---
src/gui/server/responsemessage.h | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/gui/server/guiserverimpl.cpp b/src/gui/server/guiserverimpl.cpp
index bc721079f4..3d31da7a4f 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 89fc97ad24..5ad2f89470 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 6859933384..6511c88cfa 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 093c1f3ed0..922e949eca 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;
--
GitLab