[Winmerge-svn] SF.net SVN: winmerge:[7467] branches/R2_14/Src/Common/OptionsMgr.cpp

[<ge...@us...>]

Revision: 7467
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7467&view=rev
Author:   gerundt
Date:     2010-12-07 19:51:04 +0000 (Tue, 07 Dec 2010)

Log Message:
-----------
Add OptionsMgr::Set*() for setting new value for the option without saving to storage. Convert reading config log file to use these methods. - Forgot to remove ::

Modified Paths:
--------------
    branches/R2_14/Src/Common/OptionsMgr.cpp

Modified: branches/R2_14/Src/Common/OptionsMgr.cpp
===================================================================
--- branches/R2_14/Src/Common/OptionsMgr.cpp	2010-12-07 19:49:09 UTC (rev 7466)
+++ branches/R2_14/Src/Common/OptionsMgr.cpp	2010-12-07 19:51:04 UTC (rev 7467)
@@ -217,7 +217,7 @@
 		// Convert string to integer
 		{
 			int val=0;
-			if (!::GetAsInt(svalue.c_str(), val))
+			if (!GetAsInt(svalue.c_str(), val))
 				return false;
 			value.SetInt(val);
 			return true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.