[Winmerge-svn] SF.net SVN: winmerge: [4241] trunk/Src

[<ki...@us...>]

Revision: 4241
          http://svn.sourceforge.net/winmerge/?rev=4241&view=rev
Author:   kimmov
Date:     2007-04-08 10:22:15 -0700 (Sun, 08 Apr 2007)

Log Message:
-----------
Remove couple of useless wrapper functions

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/MergeDoc.cpp
    trunk/Src/MergeDoc.h

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2007-04-08 16:43:10 UTC (rev 4240)
+++ trunk/Src/Changes.txt	2007-04-08 17:22:15 UTC (rev 4241)
@@ -5,6 +5,8 @@
 2007-04-08 Kimmo
  Add Jeremy Dewey and Dan Pidcock to contributors.txt
   Docs/Users: Contributors.txt
+ Remove couple of useless wrapper functions
+  Src: MergeDoc.cpp MergeDoc.h
 
 2007-04-08 Takashi
  BUG: [ 1694581 ] Need to limit window tab width

Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp	2007-04-08 16:43:10 UTC (rev 4240)
+++ trunk/Src/MergeDoc.cpp	2007-04-08 17:22:15 UTC (rev 4241)
@@ -3191,31 +3191,19 @@
 	GetRightView()->UpdateResources();
 }
 
-// Lookup named property and return as int
-BOOL CMergeDoc::GetOptionInt(LPCTSTR name) const
-{
-	// Currently options are held by the main frame, in a subobject called m_options
-	return GetOptionsMgr()->GetInt(name);
-}
-
-// Lookup named property and return as BOOL
-BOOL CMergeDoc::GetOptionBool(LPCTSTR name) const
-{
-	// Currently options are held by the main frame, in a subobject called m_options
-	return GetOptionsMgr()->GetBool(name);
-}
-
 // Return current word breaking break type setting (whitespace only or include punctuation)
 bool CMergeDoc::GetBreakType() const
 {
-	return !!GetOptionInt(OPT_BREAK_TYPE);
+	BOOL breakType = GetOptionsMgr()->GetBool(OPT_BREAK_TYPE);
+	return !!breakType;
 }
 
 // Return true to do line diff colors at the byte level (false to do them at word level)
 bool CMergeDoc::GetByteColoringOption() const
 {
 	// color at byte level if 'break_on_words' option not set
-	return !GetOptionBool(OPT_BREAK_ON_WORDS);
+	BOOL breakWords = GetOptionsMgr()->GetBool(OPT_BREAK_ON_WORDS);
+	return !breakWords;
 }
 
 /// Swap files and update views

Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h	2007-04-08 16:43:10 UTC (rev 4240)
+++ trunk/Src/MergeDoc.h	2007-04-08 17:22:15 UTC (rev 4241)
@@ -307,8 +307,6 @@
 
 // implementation methods
 private:
-	BOOL GetOptionInt(LPCTSTR name) const;
-	BOOL GetOptionBool(LPCTSTR name) const;
 	bool GetBreakType() const;
 	bool GetByteColoringOption() const;
 	bool IsValidCodepageForMergeEditor(unsigned cp) const;


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