Cleanup|Config: Added get() method for array values

skyjake · Dec 9, 2012 · 2661ce5 · 2661ce5
1 parent d2e1e1a
commit 2661ce5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/doomsday/engine/src/ui/window.cpp b/doomsday/engine/src/ui/window.cpp
@@ -1551,7 +1551,7 @@ void Window_RestoreState(Window* wnd)
     de::Config &config = de::App::config();
 
     // The default state of the window is determined by these values.
-    de::ArrayValue &rect = config.getAs<de::ArrayValue>("window.main.rect");
+    de::ArrayValue &rect = config.geta("window.main.rect");
     if(rect.size() >= 4)
     {
         QRect geom(rect.at(0).asNumber(), rect.at(1).asNumber(),
@@ -1562,7 +1562,7 @@ void Window_RestoreState(Window* wnd)
         wnd->geometry.size.height = geom.height();
     }
 
-    de::ArrayValue &normalRect = config.getAs<de::ArrayValue>("window.main.normalRect");
+    de::ArrayValue &normalRect = config.geta("window.main.normalRect");
     if(normalRect.size() >= 4)
     {
         QRect geom(normalRect.at(0).asNumber(), normalRect.at(1).asNumber(),

diff --git a/doomsday/libdeng2/include/de/core/config.h b/doomsday/libdeng2/include/de/core/config.h
@@ -26,6 +26,8 @@
 
 namespace de
 {
+    class ArrayValue;
+
     /**
      * Stores the configuration of everything. The application owns a Config.
      * The default configuration is produced by executing the .de scripts
@@ -80,6 +82,10 @@ namespace de
         /// Returns the value of @a name as a string.
         String gets(String const &name);
 
+        /// Returns the value of @a name as an array value. An exception is thrown
+        /// if the variable does not have an array value.
+        ArrayValue &geta(String const &name);
+
         template <typename ValueType>
         ValueType &getAs(String const &name) {
             ValueType *v = dynamic_cast<ValueType *>(&get(name));

diff --git a/doomsday/libdeng2/src/core/config.cpp b/doomsday/libdeng2/src/core/config.cpp
@@ -24,6 +24,7 @@
 #include "de/Folder"
 #include "de/ArrayValue"
 #include "de/NumberValue"
+#include "de/ArrayValue"
 #include "de/Reader"
 #include "de/Writer"
 #include "de/Version"
@@ -178,4 +179,9 @@ String Config::gets(String const &name)
     return get(name).asText();
 }
 
+ArrayValue &Config::geta(const String &name)
+{
+    return getAs<ArrayValue>(name);
+}
+
 } // namespace de