Removed "TMW" and "TMWSERV" from header guards

15 files changed, 39 insertions, 39 deletions

diff --git a/src/utils/base64.h b/src/utils/base64.h
index 4d2950c..4d6fea6 100644
--- a/src/utils/base64.h
+++ b/src/utils/base64.h
@@ -27,13 +27,13 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _TMW_BASE64_H
-#define _TMW_BASE64_H
+#ifndef BASE64_H
+#define BASE64_H
 
 extern unsigned char *php_base64_encode(const unsigned char *, int, int *);
 extern unsigned char *php_base64_decode(const unsigned char *, int, int *);
 
-#endif /* _TMW_BASE64_H */
+#endif /* BASE64_H */
 
 /*
  * Local variables:
diff --git a/src/utils/encryption.h b/src/utils/encryption.h
index 117f168..656bffa 100644
--- a/src/utils/encryption.h
+++ b/src/utils/encryption.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_UTILS_ENCRYPTION_H
-#define _TMW_UTILS_ENCRYPTION_H
+#ifndef UTILS_ENCRYPTION_H
+#define UTILS_ENCRYPTION_H
 
 #include <string>
 
@@ -34,4 +34,4 @@ std::string createRandomPassword();
 
 }
 
-#endif // TMW_UTILS_ENCRYPTION_H
+#endif // UTILS_ENCRYPTION_H
diff --git a/src/utils/functors.h b/src/utils/functors.h
index fefbeb1..5fae121 100644
--- a/src/utils/functors.h
+++ b/src/utils/functors.h
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMWSERV_FUNCTORS_H_
-#define _TMWSERV_FUNCTORS_H_
+#ifndef FUNCTORS_H
+#define FUNCTORS_H
 
 
 #include <functional>
@@ -74,4 +74,4 @@ struct string_to: public std::unary_function<std::string, T>
 } // anonymous namespace
 
 
-#endif // _TMWSERV_FUNCTORS_H_
+#endif // FUNCTORS_H
diff --git a/src/utils/logger.h b/src/utils/logger.h
index bc3b18d..f19f5b7 100644
--- a/src/utils/logger.h
+++ b/src/utils/logger.h
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMWSERV_LOGGER_H_
-#define _TMWSERV_LOGGER_H_
+#ifndef LOGGER_H
+#define LOGGER_H
 
 #include <iosfwd>
 #include <sstream>
@@ -167,4 +167,4 @@ class Logger
 #define LOG_ERROR(msg)  LOG(ERROR, msg)
 #define LOG_FATAL(msg)  LOG(FATAL, msg)
 
-#endif // _TMWSERV_LOGGER_H_
+#endif // LOGGER_H
diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h
index ebada25..3b49b7e 100644
--- a/src/utils/mathutils.h
+++ b/src/utils/mathutils.h
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMWSERV_MATHUTILS_H_
-#define _TMWSERV_MATHUTILS_H_
+#ifndef MATHUTILS_H
+#define MATHUTILS_H
 
 namespace utils {
 namespace math {
diff --git a/src/utils/processorutils.hpp b/src/utils/processorutils.hpp
index 81d83fc..e619066 100644
--- a/src/utils/processorutils.hpp
+++ b/src/utils/processorutils.hpp
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMWSERV_PROCESSORUTILS_HPP
-#define _TMWSERV_PROCESSORUTILS_HPP
+#ifndef PROCESSORUTILS_HPP
+#define PROCESSORUTILS_HPP
 
 namespace utils
 {
@@ -47,4 +47,4 @@ namespace utils
     } // namespace processor
 } // namespace utils
 
-#endif // _TMWSERV_TOKENDISPENSER_HPP
+#endif // TOKENDISPENSER_HPP
diff --git a/src/utils/sha256.h b/src/utils/sha256.h
index 5e52874..d861d75 100644
--- a/src/utils/sha256.h
+++ b/src/utils/sha256.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_UTILS_SHA256_H_
-#define _TMW_UTILS_SHA256_H_
+#ifndef UTILS_SHA256_H
+#define UTILS_SHA256_H
 
 #include <string>
 
@@ -34,4 +34,4 @@ static const unsigned int SHA256_HASH_LENGTH = 64;
  */
 std::string sha256(const std::string &string);
 
-#endif // _TMW_UTILS_SHA256_H_
+#endif // UTILS_SHA256_H
diff --git a/src/utils/singleton.h b/src/utils/singleton.h
index 86b9da7..7405c76 100644
--- a/src/utils/singleton.h
+++ b/src/utils/singleton.h
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMWSERV_SINGLETON_H_
-#define _TMWSERV_SINGLETON_H_
+#ifndef SINGLETON_H
+#define SINGLETON_H
 
 namespace utils
 {
@@ -71,4 +71,4 @@ class Singleton
 
 } // namespace utils
 
-#endif // _TMWSERV_SINGLETON_H_
+#endif // SINGLETON_H
diff --git a/src/utils/stringfilter.h b/src/utils/stringfilter.h
index e62ecf9..c871a4d 100644
--- a/src/utils/stringfilter.h
+++ b/src/utils/stringfilter.h
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMWSERV_SLANGSFILTER_H_
-#define _TMWSERV_SLANGSFILTER_H_
+#ifndef SLANGSFILTER_H
+#define SLANGSFILTER_H
 
 #include <list>
 #include <string>
diff --git a/src/utils/timer.h b/src/utils/timer.h
index 4843c70..32b7260 100644
--- a/src/utils/timer.h
+++ b/src/utils/timer.h
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMWSERV_TIMER_H_
-#define _TMWSERV_TIMER_H_
+#ifndef TIMER_H
+#define TIMER_H
 
 /* I need a 64-bit unsigned integer */
 #ifdef _MSC_VER
diff --git a/src/utils/tokencollector.hpp b/src/utils/tokencollector.hpp
index 332bd1a..6a6fdd3 100644
--- a/src/utils/tokencollector.hpp
+++ b/src/utils/tokencollector.hpp
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMW_TOKENCOLLECTOR_HPP
-#define _TMW_TOKENCOLLECTOR_HPP
+#ifndef TOKENCOLLECTOR_HPP
+#define TOKENCOLLECTOR_HPP
 
 #include <string>
 #include <list>
@@ -135,4 +135,4 @@ class TokenCollector: private TokenCollectorBase
         Handler *mHandler;
 };
 
-#endif // _TMW_TOKENCOLLECTOR_HPP
+#endif // TOKENCOLLECTOR_HPP
diff --git a/src/utils/tokendispenser.hpp b/src/utils/tokendispenser.hpp
index 52240df..6638cc5 100644
--- a/src/utils/tokendispenser.hpp
+++ b/src/utils/tokendispenser.hpp
@@ -18,8 +18,8 @@
  *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#ifndef _TMWSERV_TOKENDISPENSER_HPP
-#define _TMWSERV_TOKENDISPENSER_HPP
+#ifndef TOKENDISPENSER_HPP
+#define TOKENDISPENSER_HPP
 
 #define MAGIC_TOKEN_LENGTH 32
 
@@ -42,4 +42,4 @@ namespace utils
 
 } // namespace utils
 
-#endif // _TMWSERV_TOKENDISPENSER_HPP
+#endif // TOKENDISPENSER_HPP
diff --git a/src/utils/trim.hpp b/src/utils/trim.hpp
index df44fb0..4f5600c 100644
--- a/src/utils/trim.hpp
+++ b/src/utils/trim.hpp
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMWSERV_UTILS_TRIM_
-#define _TMWSERV_UTILS_TRIM_
+#ifndef UTILS_TRIM_HPP
+#define UTILS_TRIM_HPP
 
 #include <string>
 
diff --git a/src/utils/xml.hpp b/src/utils/xml.hpp
index 24b55f3..fa0c6cb 100644
--- a/src/utils/xml.hpp
+++ b/src/utils/xml.hpp
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMWSERV_XML_H_
-#define _TMWSERV_XML_H_
+#ifndef XML_H
+#define XML_H
 
 #include <string>
 #include <libxml/tree.h>
diff --git a/src/utils/zlib.hpp b/src/utils/zlib.hpp
index c435c71..e74b9f5 100644
--- a/src/utils/zlib.hpp
+++ b/src/utils/zlib.hpp
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMWSERV_ZLIB
-#define _TMWSERV_ZLIB
+#ifndef ZLIB_HPP
+#define ZLIB_HPP
 
 /**
  * Inflates either zlib or gzip deflated memory. The inflated memory is