1 files changed, 15 insertions, 17 deletions

diff --git a/src/Core/ConfigEntry.h b/src/Core/ConfigEntry.h
index fcd8dd4..d4cacc9 100644
--- a/src/Core/ConfigEntry.h
+++ b/src/Core/ConfigEntry.h
@@ -22,25 +22,23 @@
 
 #include "export.h"
 
+#include "UnicodeString.h"
+
 #include <stdexcept>
-#include <string>
-#include <string.h>
 #include <vector>
 
-#include <boost/algorithm/string/case_conv.hpp>
-
 namespace Mad {
 namespace Core {
 
 class MAD_CORE_EXPORT ConfigEntry {
   public:
-    class String : public std::string {
+    class String : public UnicodeString {
       public:
         String() {}
-        String(const std::string &str) : std::string(str) {}
+        String(const UnicodeString &str) : UnicodeString(str) {}
 
-        bool matches(const std::string &str) const {
-          return (boost::algorithm::to_lower_copy(static_cast<const std::string&>(*this)) == boost::algorithm::to_lower_copy(str));
+        bool matches(const UnicodeString &str) const {
+          return (str.caseCompare(*this, 0) == 0);
         }
     };
 
@@ -53,7 +51,7 @@ class MAD_CORE_EXPORT ConfigEntry {
 
       public:
         Entry() {}
-        Entry(const std::vector<std::string> &args) {
+        Entry(const std::vector<UnicodeString> &args) {
           if(args.empty())
             return;
 
@@ -62,17 +60,17 @@ class MAD_CORE_EXPORT ConfigEntry {
           value.assign(args.begin()+1, args.end());
         }
 
-        bool empty() const {
-          return key.empty();
+        bool isEmpty() const {
+          return key.isEmpty();
         }
 
         String &getKey() {return key;}
         const String &getKey() const {return key;}
 
-        size_t getSize() const {return value.size();}
+        std::size_t getSize() const {return value.size();}
 
-        String& operator[] (size_t i);
-        const String& operator[] (size_t i) const;
+        String& operator[] (std::size_t i);
+        const String& operator[] (std::size_t i) const;
     };
 
   private:
@@ -80,10 +78,10 @@ class MAD_CORE_EXPORT ConfigEntry {
     Entry zero, constZero;
 
   public:
-    size_t getSize() const {return entries.size();}
+    std::size_t getSize() const {return entries.size();}
 
-    Entry& operator[] (size_t i);
-    const Entry& operator[] (size_t i) const;
+    Entry& operator[] (std::size_t i);
+    const Entry& operator[] (std::size_t i) const;
 
     void push(const Entry &entry) {
       entries.push_back(entry);