Changeset 13041 for OpenSceneGraph/trunk/src/osgText/String.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgText/String.cpp (modified) (10 diffs)

OpenSceneGraph/trunk/src/osgText/String.cpp

@@ -18 +18 @@
         _index(0),
         _nullCharacter(0) {}
-        
+
     bool valid() const { return _index<_string.length(); }
-    
+
     look_ahead_iterator& operator ++ ()
     {
-        if (_index<_string.length()) ++_index; 
+        if (_index<_string.length()) ++_index;
         return *this;
     }
-    
+
     look_ahead_iterator operator ++ (int)
     {
-        look_ahead_iterator tmp(*this); 
-        if (_index<_string.length()) ++_index; 
+        look_ahead_iterator tmp(*this);
+        if (_index<_string.length()) ++_index;
         return tmp;
     }
@@ -39 +39 @@
         return *this;
     }
-    
+
     unsigned char operator * () const
     {
@@ -52 +52 @@
         else return _nullCharacter;
     }
-    
+
 
     const std::string&      _string;
     unsigned int            _index;
     unsigned char           _nullCharacter;
-    
+
 protected:
 
@@ -125 +125 @@
 unsigned int getNextCharacter(look_ahead_iterator& charString,String::Encoding encoding)
 {
-    // For more info on unicode encodings see: 
+    // For more info on unicode encodings see:
     // http://www-106.ibm.com/developerworks/unicode/library/u-encode.html
     switch(encoding)
@@ -169 +169 @@
                 int char2 = *charString++;
                 int char3 = *charString++;
-                int highSurrogate = (char0<<8) | char1; 
+                int highSurrogate = (char0<<8) | char1;
                 int lowSurrogate = (char2<<8) | char3;
                 if ((char2>=0xDC)&&(char2<=0xDF)) //only for the valid range of low surrogate
@@ -191 +191 @@
                 int char3 = *charString++;
                 int char2 = *charString++;
-                int highSurrogate = (char0<<8) | char1; 
+                int highSurrogate = (char0<<8) | char1;
                 int lowSurrogate = (char2<<8) | char3;
                 if ((char2>=0xDC)&&(char2<=0xDF)) //only for the valid range of low surrogate
@@ -206 +206 @@
                             (((int)charString[2])<<8) | charString[3]);
             charString+=4;
-            if (character<0x110000) 
-            { 
-                // Character is constrained to the range set by the unicode standard 
+            if (character<0x110000)
+            {
+                // Character is constrained to the range set by the unicode standard
                 return character;
             }
@@ -218 +218 @@
                             (((int)charString[1])<<8) | charString[0]);
             charString+=4;
-            if (character<0x110000) 
-            { 
-                // Character is constrained to the range set by the unicode standard 
+            if (character<0x110000)
+            {
+                // Character is constrained to the range set by the unicode standard
                 return character;
             }
@@ -250 +250 @@
 {
     if (&str==this) return *this;
-    
+
     clear();
     std::copy(str.begin(),str.end(),std::back_inserter(*this));
-    
+
     return *this;
 }
@@ -282 +282 @@
     look_ahead_iterator itr(text);
 
-    if ((encoding == ENCODING_SIGNATURE) || 
-        (encoding == ENCODING_UTF16) || 
+    if ((encoding == ENCODING_SIGNATURE) ||
+        (encoding == ENCODING_UTF16) ||
         (encoding == ENCODING_UTF32))
     {
         encoding = findEncoding(itr,encoding);
     }
-    
+
     while(itr.valid())
     {