Remove -Wno-ignored-qualifiers and fix caused warnings

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)

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;}

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) );
 }

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);