*Merge.

--HG--
branch : trunk

1 files changed, 39 insertions, 39 deletions

diff --git a/dep/include/sockets/Parse.h b/dep/include/sockets/Parse.h
index 6961f3b1bc9..b5d15f00f5c 100644
--- a/dep/include/sockets/Parse.h
+++ b/dep/include/sockets/Parse.h
@@ -1,6 +1,6 @@
 /** \file Parse.h - parse a string
  **
- **	Written: 1999-Feb-10 grymse@alhem.net
+ ** Written: 1999-Feb-10 grymse@alhem.net
  **/
 
 /*
@@ -9,7 +9,7 @@ Copyright (C) 1999-2007  Anders Hedstrom
 This library is made available under the terms of the GNU GPL.
 
 If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
+a separate license agreement is available. For information about
 the closed-source license agreement for the C++ sockets library,
 please visit http://www.alhem.net/Sockets/license.html and/or
 email license@alhem.net.
@@ -48,48 +48,48 @@ namespace SOCKETS_NAMESPACE {
 /* interface of class Parse */
 
 /** Splits a string whatever way you want.
-	\ingroup util */
+    \ingroup util */
 class Parse
 {
 public:
-	Parse();
-	Parse(const std::string&);
-	Parse(const std::string&,const std::string&);
-	Parse(const std::string&,const std::string&,short);
-	~Parse();
-	short issplit(const char);
-	void getsplit();
-	void getsplit(std::string&);
-	std::string getword();
-	void getword(std::string&);
-	void getword(std::string&,std::string&,int);
-	std::string getrest();
-	void getrest(std::string&);
-	long getvalue();
-	void setbreak(const char);
-	int getwordlen();
-	int getrestlen();
-	void enablebreak(const char c) {
-		pa_enable = c;
-	}
-	void disablebreak(const char c) {
-		pa_disable = c;
-	}
-	void getline();
-	void getline(std::string&);
-	size_t getptr() { return pa_the_ptr; }
-	void EnableQuote(bool b) { pa_quote = b; }
+    Parse();
+    Parse(const std::string&);
+    Parse(const std::string&,const std::string&);
+    Parse(const std::string&,const std::string&,short);
+    ~Parse();
+    short issplit(const char);
+    void getsplit();
+    void getsplit(std::string&);
+    std::string getword();
+    void getword(std::string&);
+    void getword(std::string&,std::string&,int);
+    std::string getrest();
+    void getrest(std::string&);
+    long getvalue();
+    void setbreak(const char);
+    int getwordlen();
+    int getrestlen();
+    void enablebreak(const char c) {
+        pa_enable = c;
+    }
+    void disablebreak(const char c) {
+        pa_disable = c;
+    }
+    void getline();
+    void getline(std::string&);
+    size_t getptr() { return pa_the_ptr; }
+    void EnableQuote(bool b) { pa_quote = b; }
 
 private:
-	std::string pa_the_str;
-	std::string pa_splits;
-	std::string pa_ord;
-	size_t   pa_the_ptr;
-	char  pa_breakchar;
-	char  pa_enable;
-	char  pa_disable;
-	short pa_nospace;
-	bool  pa_quote;
+    std::string pa_the_str;
+    std::string pa_splits;
+    std::string pa_ord;
+    size_t   pa_the_ptr;
+    char  pa_breakchar;
+    char  pa_enable;
+    char  pa_disable;
+    short pa_nospace;
+    bool  pa_quote;
 };