X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fwhitespace.cc;h=57c133db26d49672b40b3497d68a6362e8478bb7;hb=6f7112547658b01594d8cd81a0f52c4edc017e1d;hp=7fafd07c6f6367094d01728daf6e8129b108fce9;hpb=a4d9d09af5853f769e1143c2353806bfb7d89f58;p=ardour.git

diff --git a/libs/pbd/whitespace.cc b/libs/pbd/whitespace.cc
index 7fafd07c6f..57c133db26 100644
--- a/libs/pbd/whitespace.cc
+++ b/libs/pbd/whitespace.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,19 +18,18 @@
 */
 
 #include "pbd/whitespace.h"
-#include <glibmm/ustring.h>
 
 using namespace std;
 
 namespace PBD {
-	
+
 void
 strip_whitespace_edges (string& str)
-{   
-    string::size_type i; 
-    string::size_type len;    
+{
+    string::size_type i;
+    string::size_type len;
     string::size_type s = 0;
-			            
+
     len = str.length();
 
     if (len == 1) {
@@ -38,9 +37,9 @@ strip_whitespace_edges (string& str)
     }
 
     /* strip front */
-				        
+
     for (i = 0; i < len; ++i) {
-        if (isgraph (str[i])) {
+        if (!isspace (str[i])) {
             break;
         }
     }
@@ -52,25 +51,25 @@ strip_whitespace_edges (string& str)
     }
 
     /* strip back */
-    
+
     if (len > 1) {
-    
+
 	    s = i;
 	    i = len - 1;
 
 	    if (s == i) {
 		    return;
 	    }
-	    
+
 	    do {
-		    if (isgraph (str[i]) || i == 0) {
+		    if (!isspace (str[i]) || i == 0) {
 			    break;
 		    }
 
 		    --i;
 
-	    } while (true); 
-	    
+	    } while (true);
+
 	    str = str.substr (s, (i - s) + 1);
 
     } else {
@@ -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