remove duplicate/unnecessary header inclusions

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

diff --git a/libs/pbd/whitespace.cc b/libs/pbd/whitespace.cc
index 7f74940457423833f4a316861f9870b448269c4a..57c133db26d49672b40b3497d68a6362e8478bb7 100644 (file)
--- a/libs/pbd/whitespace.cc
+++ b/libs/pbd/whitespace.cc
@@ -1,30 +1,80 @@
-#include <pbd/whitespace.h>
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "pbd/whitespace.h"
 
 using namespace std;
 
+namespace PBD {
+
 void
 strip_whitespace_edges (string& str)
-{   
-    string::size_type i; 
-    string::size_type len;    
-       string::size_type s;
-                                   
+{
+    string::size_type i;
+    string::size_type len;
+    string::size_type s = 0;
+
     len = str.length();
-                                       
-    for (i = 0; i < len; ++i) {
-        if (isgraph (str[i])) {
-            break;
-        }
+
+    if (len == 1) {
+           return;
     }
 
-    s = i;
+    /* strip front */
 
-    for (i = len - 1; i >= 0; --i) {
-        if (isgraph (str[i])) {
+    for (i = 0; i < len; ++i) {
+        if (!isspace (str[i])) {
             break;
         }
     }
 
-    str = str.substr (s, (i - s) + 1);
+    if (i == len) {
+           /* it's all whitespace, not much we can do */
+               str = "";
+           return;
+    }
+
+    /* strip back */
+
+    if (len > 1) {
+
+           s = i;
+           i = len - 1;
+
+           if (s == i) {
+                   return;
+           }
+
+           do {
+                   if (!isspace (str[i]) || i == 0) {
+                           break;
+                   }
+
+                   --i;
+
+           } while (true);
+
+           str = str.substr (s, (i - s) + 1);
+
+    } else {
+           str = str.substr (s);
+    }
 }
 
+} // namespace PBD