Changeset 10624 for code/trunk/src/libraries/core/config

Timestamp:

Oct 4, 2015, 9:12:21 PM (9 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/config/CMakeLists.txt (modified) (1 diff)
• src/libraries/core/config/CommandLineParser.cc (deleted)
• src/libraries/core/config/CommandLineParser.h (deleted)
• src/libraries/core/config/ConfigFile.cc (modified) (4 diffs)
• src/libraries/core/config/Configurable.cc (modified) (1 diff)
• src/libraries/core/config/SettingsConfigFile.cc (modified) (1 diff)

code/trunk/src/libraries/core/config/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(CORE_SRC_FILES
-  CommandLineParser.cc
 #  ConfigFile.cc is already included in FilesystemBuildUnit.cc
   ConfigFileEntryValue.cc

code/trunk/src/libraries/core/config/ConfigFile.cc

@@ -38 +38 @@
 #include "util/Convert.h"
 #include "util/StringUtils.h"
-#include "core/PathConfig.h"
+#include "core/ConfigurablePaths.h"
 #include "ConfigFileEntryComment.h"
 #include "ConfigFileEntryValue.h"
@@ -81 +81 @@
         if (!filepath.is_complete())
         {
-            filepath = PathConfig::getConfigPath() / filepath;
+            filepath = ConfigurablePaths::getConfigPath() / filepath;
             if (this->bCopyFallbackFile_)
             {
@@ -87 +87 @@
                 if (!boost::filesystem::exists(filepath))
                 {
-                    boost::filesystem::path defaultFilepath(PathConfig::getDataPath() / DEFAULT_CONFIG_FOLDER / this->filename_);
+                    boost::filesystem::path defaultFilepath(ConfigurablePaths::getDataPath() / DEFAULT_CONFIG_FOLDER / this->filename_);
                     if (boost::filesystem::exists(defaultFilepath))
                     {
@@ -216 +216 @@
         boost::filesystem::path filepath(filename);
         if (!filepath.is_complete())
-            filepath = PathConfig::getConfigPath() / filename;
+            filepath = ConfigurablePaths::getConfigPath() / filename;
         std::ofstream file;
         file.open(filepath.string().c_str(), std::fstream::out);

code/trunk/src/libraries/core/config/Configurable.cc

@@ -32 +32 @@
 namespace orxonox
 {
-    RegisterClassNoArgs(Configurable);
+    RegisterClassNoArgs(Configurable).virtualBase();
 
     Configurable::Configurable()

code/trunk/src/libraries/core/config/SettingsConfigFile.cc

@@ -35 +35 @@
 
 #include "util/StringUtils.h"
-#include "core/command/ConsoleCommand.h"
+#include "core/command/ConsoleCommandIncludes.h"
 #include "ConfigFileManager.h"
 #include "ConfigValueContainer.h"