libcore: Singleton accessor methods for Config and CommandLine

skyjake · Mar 23, 2016 · 800ee97 · 800ee97
1 parent 5eb0fa9
commit 800ee97
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/doomsday/sdk/libcore/include/de/core/commandline.h b/doomsday/sdk/libcore/include/de/core/commandline.h
@@ -227,6 +227,8 @@ class DENG2_PUBLIC CommandLine
      */
     bool executeAndWait(String *output = 0) const;
 
+    static CommandLine &get();
+
 private:
     DENG2_PRIVATE(d)
 };

diff --git a/doomsday/sdk/libcore/include/de/core/config.h b/doomsday/sdk/libcore/include/de/core/config.h
@@ -105,6 +105,8 @@ class DENG2_PUBLIC Config : public RecordAccessor, public IObject
     Record &objectNamespace();
     Record const &objectNamespace() const;
 
+    static Config &get();
+
 private:
     DENG2_PRIVATE(d)
 };

diff --git a/doomsday/sdk/libcore/src/core/commandline.cpp b/doomsday/sdk/libcore/src/core/commandline.cpp
@@ -21,6 +21,7 @@
 #include "de/String"
 #include "de/NativePath"
 #include "de/Log"
+#include "de/App"
 
 #include <QFile>
 #include <QDir>
@@ -469,6 +470,11 @@ bool CommandLine::executeAndWait(String *output) const
     return result;
 }
 
+CommandLine &CommandLine::get()
+{
+    return App::commandLine();
+}
+
 CommandLine::ArgWithParams::ArgWithParams() : pos(0)
 {}
 

diff --git a/doomsday/sdk/libcore/src/core/config.cpp b/doomsday/sdk/libcore/src/core/config.cpp
@@ -192,6 +192,11 @@ Record const &Config::objectNamespace() const
     return d->config.globals();
 }
 
+Config &Config::get()
+{
+    return App::config();
+}
+
 Version Config::upgradedFromVersion() const
 {
     return d->oldVersion;