add EPA stuff from 2.X

[ardour.git] / libs / pbd / whitespace.cc

diff --git a/libs/pbd/whitespace.cc b/libs/pbd/whitespace.cc
index 7fafd07c6f6367094d01728daf6e8129b108fce9..00d47523db184bcfdeaeaaeca5616e0e32c0cb6b 100644 (file)
--- a/libs/pbd/whitespace.cc
+++ b/libs/pbd/whitespace.cc
@@ -18,7 +18,6 @@
 */
 
 #include "pbd/whitespace.h"
-#include <glibmm/ustring.h>
 
 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