Switched from custom Trim() function to CStdString Trim()

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@626 09dcff7a-b715-0410-9601-b79a96267cd0

3 files changed, 11 insertions, 50 deletions

diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
index 7ade769..aec9ba2 100644
--- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
+++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
@@ -2684,16 +2684,10 @@ void RtpSessions::PauseCaptureOrkuid(CStdString& orkuid)
 	LOG4CXX_INFO(m_log, logMsg);
 }
 
-void RtpSessions::SaveLocalPartyMap(char *oldparty, char *newparty)
+void RtpSessions::SaveLocalPartyMap(CStdString& oldparty, CStdString& newparty)
 {
-	CStdString oldp;
-	CStdString newp;
-
-	oldp = oldparty;
-	newp = newparty;
-
 	m_localPartyMap.insert(std::make_pair(oldparty, newparty));
-	LOG4CXX_DEBUG(m_log, "Saved map oldparty:" + oldp + " newparty:" + newp);
+	LOG4CXX_DEBUG(m_log, "Saved map oldparty:" + oldparty + " newparty:" + newparty);
 }
 
 CStdString RtpSessions::GetLocalPartyMap(CStdString& oldlocalparty)
diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.h b/orkaudio/audiocaptureplugins/voip/RtpSession.h
index 42fe9e7..101a441 100644
--- a/orkaudio/audiocaptureplugins/voip/RtpSession.h
+++ b/orkaudio/audiocaptureplugins/voip/RtpSession.h
@@ -267,7 +267,7 @@ public:
 	void StartCaptureOrkuid(CStdString& orkuid);
 	void PauseCapture(CStdString& party);
 	void PauseCaptureOrkuid(CStdString& orkuid);
-	void SaveLocalPartyMap(char *oldparty, char *newparty);
+	void SaveLocalPartyMap(CStdString& oldparty, CStdString& newparty);
 	CStdString GetLocalPartyMap(CStdString& oldlocalparty);
 
 private:
diff --git a/orkaudio/audiocaptureplugins/voip/VoIp.cpp b/orkaudio/audiocaptureplugins/voip/VoIp.cpp
index 3045501..909b3d1 100644
--- a/orkaudio/audiocaptureplugins/voip/VoIp.cpp
+++ b/orkaudio/audiocaptureplugins/voip/VoIp.cpp
@@ -97,7 +97,6 @@ public:
 	CStdString GetPcapDeviceName(pcap_t* pcapHandle);
 	void ProcessLocalPartyMap(char *line, int ln);
 	void LoadPartyMaps();
-	void TrimCString(char **s);
 
 private:
 	void OpenDevices();
@@ -3293,43 +3292,6 @@ void VoIp::OpenDevices()
 	}
 }
 
-void VoIp::TrimCString(char **s)
-{
-	char *x = NULL;
-	char *y = NULL;
-
-	if(*s == NULL || !strlen(*s))
-	{
-		*s = "";
-		return;
-	}
-
-	x = *s;
-	y = *s+strlen(*s);
-
-	while(x < y && isblank(*x))
-	{
-		x += 1;
-	}
-
-	if(!strlen(x))
-	{
-		*s = x;
-		return;
-	}
-
-	y -= 1;
-	while(y >= x && isblank(*y))
-	{
-		*y = '\0';
-		y -= 1;
-	}
-
-	*s = x;
-	return;
-
-}
-
 void VoIp::ProcessLocalPartyMap(char *line, int ln)
 {
 	char *oldparty = NULL;
@@ -3349,10 +3311,15 @@ void VoIp::ProcessLocalPartyMap(char *line, int ln)
 
 	*(newparty++) = '\0';
 
-	TrimCString(&oldparty);
-	TrimCString(&newparty);
+	CStdString oldpty, newpty;
+
+	oldpty = oldparty;
+	newpty = newparty;
+
+	oldpty.Trim();
+	newpty.Trim();
 
-	RtpSessionsSingleton::instance()->SaveLocalPartyMap(oldparty, newparty);
+	RtpSessionsSingleton::instance()->SaveLocalPartyMap(oldpty, newpty);
 }
 
 void VoIp::LoadPartyMaps()