summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2006-03-06 00:26:05 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2006-03-06 00:26:05 +0000
commit1941e274acd375ff70fd09a9d458755d2a82e66e (patch)
tree0c159d8d9da64267b7ca56397c775d256cc780e6 /src/utils
parent54fa93b126ce6f2ed5ec24b134fe367fa5bc5c87 (diff)
downloadmanaserv-1941e274acd375ff70fd09a9d458755d2a82e66e.tar.gz
manaserv-1941e274acd375ff70fd09a9d458755d2a82e66e.tar.bz2
manaserv-1941e274acd375ff70fd09a9d458755d2a82e66e.tar.xz
manaserv-1941e274acd375ff70fd09a9d458755d2a82e66e.zip
Cleaned up unnecessary header dependencies and fixed some indentations.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/base64.cpp4
-rw-r--r--src/utils/cipher.cpp4
-rw-r--r--src/utils/cipher.h3
-rw-r--r--src/utils/logger.cpp3
-rw-r--r--src/utils/logger.h3
-rw-r--r--src/utils/stringfilter.cpp5
-rw-r--r--src/utils/stringfilter.h4
7 files changed, 13 insertions, 13 deletions
diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp
index e2df07de..973376e4 100644
--- a/src/utils/base64.cpp
+++ b/src/utils/base64.cpp
@@ -17,8 +17,8 @@
*/
/* $Id$ */
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
#include "base64.h"
diff --git a/src/utils/cipher.cpp b/src/utils/cipher.cpp
index 1b232e7e..6eda3ec5 100644
--- a/src/utils/cipher.cpp
+++ b/src/utils/cipher.cpp
@@ -20,6 +20,7 @@
* $Id$
*/
+#include "cipher.h"
#include <iomanip>
#include <sstream>
@@ -27,9 +28,6 @@
#include <openssl/evp.h>
#include <openssl/md5.h>
-#include "cipher.h"
-
-
namespace tmwserv
{
namespace utils
diff --git a/src/utils/cipher.h b/src/utils/cipher.h
index a6e6c552..bfca4cb1 100644
--- a/src/utils/cipher.h
+++ b/src/utils/cipher.h
@@ -24,8 +24,7 @@
#ifndef _TMWSERV_CIPHER_H_
#define _TMWSERV_CIPHER_H_
-
-#include <string>
+#include <iosfwd>
#include "singleton.h"
diff --git a/src/utils/logger.cpp b/src/utils/logger.cpp
index 048fd5b1..cd620f69 100644
--- a/src/utils/logger.cpp
+++ b/src/utils/logger.cpp
@@ -20,6 +20,7 @@
* $Id$
*/
+#include "logger.h"
#include <ctime>
#include <iomanip>
@@ -29,8 +30,6 @@
#include <windows.h>
#endif
-#include "logger.h"
-
namespace tmwserv
{
diff --git a/src/utils/logger.h b/src/utils/logger.h
index 75c86593..1e5ba27d 100644
--- a/src/utils/logger.h
+++ b/src/utils/logger.h
@@ -24,10 +24,9 @@
#ifndef _TMWSERV_LOGGER_H_
#define _TMWSERV_LOGGER_H_
-
+#include <iosfwd>
#include <fstream>
#include <sstream>
-#include <string>
#include "singleton.h"
diff --git a/src/utils/stringfilter.cpp b/src/utils/stringfilter.cpp
index 3e72a278..fc9ed1ea 100644
--- a/src/utils/stringfilter.cpp
+++ b/src/utils/stringfilter.cpp
@@ -20,10 +20,13 @@
* $Id$
*/
-#include "../defines.h"
#include "stringfilter.h"
+
#include "logger.h"
+#include "../configuration.h"
+#include "../defines.h"
+
namespace tmwserv
{
namespace utils
diff --git a/src/utils/stringfilter.h b/src/utils/stringfilter.h
index 009bbeb4..e38d1931 100644
--- a/src/utils/stringfilter.h
+++ b/src/utils/stringfilter.h
@@ -24,8 +24,10 @@
#ifndef _TMWSERV_SLANGSFILTER_H_
#define _TMWSERV_SLANGSFILTER_H_
+#include <list>
#include <string>
-#include "../configuration.h"
+
+class Configuration;
namespace tmwserv
{