Changeset 891

Timestamp:

03/04/10 01:05:27 (5 months ago)

Author:

zoogie

Message:

The configuration can now be now "unlinked", meaning that Save() will have no effect.

This will be useful for unit tests since we don't want the modified config to be persisted.

Location:

trunk/engine/Util

Files:

• Config.cpp (modified) (2 diffs)
• Config.h (modified) (2 diffs)

trunk/engine/Util/Config.cpp

@@ -190 +190 @@
 
 /**
+ * Check if saving the config to disk is disabled.
+ * @return @c true if saving is disabled.
+ * @see #SetUnlinked(bool)
+ */
+bool Config::IsUnlinked() const
+{
+    return unlinked;
+}
+
+/**
+ * Enable or disable saving the configuration to disk.
+ * This is useful for testing, since it allows temporary changes
+ * without overwriting the config previously saved to disk.
+ * @param unlinked @c true to prevent saving config to disk.
+ */
+void Config::SetUnlinked(bool unlinked)
+{
+    this->unlinked = unlinked;
+}
+
+/**
  * Check if this build is a prerelease (development) version.
  * @return @c true if prerelease.
@@ -571 +592 @@
 void Config::Save()
 {
+    if (unlinked) return;
+
     const std::string &cfgfile = GetConfigFilename();
 

trunk/engine/Util/Config.h

@@ -67 +67 @@
     private:
         static Config *instance;
+        bool unlinked;  ///< if @c true, will prevent saving config.
         std::string path;
         int verMajor;
@@ -87 +88 @@
             bool prerelease, const std::string &path="");
         static void Shutdown();
+
+        bool IsUnlinked() const;
+        void SetUnlinked(bool unlinked);
 
         bool IsPrerelease() const;