From c1ee2c6943623e43181d56eed0de18b608fff86a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 14 Sep 2010 16:50:22 +0000 Subject: use isspace() and not isgraph() to identify whitespace; remove Glib::ustring version of strip_whitespace_edges() git-svn-id: svn://localhost/ardour2/branches/3.0@7773 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/pbd/pbd/whitespace.h | 5 ----- libs/pbd/whitespace.cc | 13 ++----------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/libs/pbd/pbd/whitespace.h b/libs/pbd/pbd/whitespace.h index dcdb4e5f27..444be112b0 100644 --- a/libs/pbd/pbd/whitespace.h +++ b/libs/pbd/pbd/whitespace.h @@ -22,16 +22,11 @@ #include -namespace Glib { - class ustring; -} - namespace PBD { // returns the empty string if the entire string is whitespace // so check length after calling. extern void strip_whitespace_edges (std::string& str); -extern void strip_whitespace_edges (Glib::ustring& str); } // namespace PBD diff --git a/libs/pbd/whitespace.cc b/libs/pbd/whitespace.cc index 7fafd07c6f..00d47523db 100644 --- a/libs/pbd/whitespace.cc +++ b/libs/pbd/whitespace.cc @@ -18,7 +18,6 @@ */ #include "pbd/whitespace.h" -#include using namespace std; @@ -40,7 +39,7 @@ strip_whitespace_edges (string& str) /* strip front */ for (i = 0; i < len; ++i) { - if (isgraph (str[i])) { + if (!isspace (str[i])) { break; } } @@ -63,7 +62,7 @@ strip_whitespace_edges (string& str) } do { - if (isgraph (str[i]) || i == 0) { + if (!isspace (str[i]) || i == 0) { break; } @@ -78,12 +77,4 @@ strip_whitespace_edges (string& str) } } -void -strip_whitespace_edges (Glib::ustring& str) -{ - string copy (str.raw()); - strip_whitespace_edges (copy); - str = copy; -} - } // namespace PBD -- cgit v1.2.3