Cleaned both configuration and resource managers.

2 files changed, 8 insertions, 13 deletions

diff --git a/src/utils/stringfilter.cpp b/src/utils/stringfilter.cpp
index ba1f1b99..aa94cde2 100644
--- a/src/utils/stringfilter.cpp
+++ b/src/utils/stringfilter.cpp
@@ -20,19 +20,17 @@
  *  $Id$
  */
 
-#include "stringfilter.h"
+#include "utils/stringfilter.h"
 
-#include "logger.h"
-
-#include "../configuration.h"
-#include "../defines.h"
+#include "defines.h"
+#include "common/configuration.hpp"
+#include "utils/logger.h"
 
 namespace utils
 {
 
-StringFilter::StringFilter(Configuration *config):
-    mInitialized(false),
-    mConfig(config)
+StringFilter::StringFilter():
+    mInitialized(false)
 {
     mSlangs.clear(); // Does this make any sense here?
     loadSlangFilterList();
@@ -48,7 +46,7 @@ bool StringFilter::loadSlangFilterList()
 {
     mInitialized = false;
 
-    std::string slangsList = mConfig->getValue("SlangsList", "");
+    std::string slangsList = Configuration::getValue("SlangsList", "");
     if (slangsList != "") {
         std::istringstream iss(slangsList);
         std::string tmp;
diff --git a/src/utils/stringfilter.h b/src/utils/stringfilter.h
index 5002ca1e..ff29db21 100644
--- a/src/utils/stringfilter.h
+++ b/src/utils/stringfilter.h
@@ -27,8 +27,6 @@
 #include <list>
 #include <string>
 
-class Configuration;
-
 namespace utils
 {
 
@@ -41,7 +39,7 @@ class StringFilter
         /**
          * ctors.
          */
-        StringFilter(Configuration *config);
+        StringFilter();
 
         ~StringFilter();
 
@@ -89,7 +87,6 @@ class StringFilter
         typedef Slangs::iterator SlangIterator;
         Slangs mSlangs;    /**< the formatted Slangs list */
         bool mInitialized;                 /**< Set if the list is loaded */
-        Configuration *mConfig;            /**< The config instance */
 };
 
 } // ::utils