From 77a4e38c49297f11b04fdf70b58008d80b5d1354 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 14 Aug 2014 19:18:30 +0200
Subject: [PATCH] Remove -Wno-ignored-qualifiers and fix caused warnings

---
 CMakeLists.txt                   | 3 ---
 components/esm/esmreader.hpp     | 2 +-
 components/settings/settings.cpp | 8 ++++----
 components/settings/settings.hpp | 8 ++++----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d380aea0..368fe5364 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -362,9 +362,6 @@ endif()
 if (CMAKE_COMPILER_IS_GNUCC)
     SET(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++98 -pedantic -Wno-long-long ${CMAKE_CXX_FLAGS}")
 
-    # Silence warnings in OGRE headers. Remove once OGRE got fixed!
-    SET(CMAKE_CXX_FLAGS "-Wno-ignored-qualifiers ${CMAKE_CXX_FLAGS}")
-
     execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
                 OUTPUT_VARIABLE GCC_VERSION)
     if ("${GCC_VERSION}" VERSION_GREATER 4.6 OR "${GCC_VERSION}" VERSION_EQUAL 4.6)
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 6b0bb9a27..730bdd8c7 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -83,7 +83,7 @@ public:
   //  indirectly to the load() method.
   int mIdx;
   void setIndex(const int index) {mIdx = index; mCtx.index = index;}
-  const int getIndex() {return mIdx;}
+  int getIndex() {return mIdx;}
 
   void setGlobalReaderList(std::vector<ESMReader> *list) {mGlobalReaderList = list;}
   std::vector<ESMReader> *getGlobalReaderList() {return mGlobalReaderList;}
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 0def0afdb..5fc2ca3c1 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -79,7 +79,7 @@ void Manager::saveUser(const std::string& file)
     fout.close();
 }
 
-const std::string Manager::getString (const std::string& setting, const std::string& category)
+std::string Manager::getString (const std::string& setting, const std::string& category)
 {
     if (mNewSettings.find(std::make_pair(category, setting)) != mNewSettings.end())
         return mNewSettings[std::make_pair(category, setting)];
@@ -92,17 +92,17 @@ const std::string Manager::getString (const std::string& setting, const std::str
     return val;
 }
 
-const float Manager::getFloat (const std::string& setting, const std::string& category)
+float Manager::getFloat (const std::string& setting, const std::string& category)
 {
     return Ogre::StringConverter::parseReal( getString(setting, category) );
 }
 
-const int Manager::getInt (const std::string& setting, const std::string& category)
+int Manager::getInt (const std::string& setting, const std::string& category)
 {
     return Ogre::StringConverter::parseInt( getString(setting, category) );
 }
 
-const bool Manager::getBool (const std::string& setting, const std::string& category)
+bool Manager::getBool (const std::string& setting, const std::string& category)
 {
     return Ogre::StringConverter::parseBool( getString(setting, category) );
 }
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index b7c7d59a9..03b0b517c 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -36,10 +36,10 @@ namespace Settings
         static const CategorySettingVector apply();
         ///< returns the list of changed settings and then clears it
 
-        static const int getInt (const std::string& setting, const std::string& category);
-        static const float getFloat (const std::string& setting, const std::string& category);
-        static const std::string getString (const std::string& setting, const std::string& category);
-        static const bool getBool (const std::string& setting, const std::string& category);
+        static int getInt (const std::string& setting, const std::string& category);
+        static float getFloat (const std::string& setting, const std::string& category);
+        static std::string getString (const std::string& setting, const std::string& category);
+        static bool getBool (const std::string& setting, const std::string& category);
 
         static void setInt (const std::string& setting, const std::string& category, const int value);
         static void setFloat (const std::string& setting, const std::string& category, const float value);