[lmi-commits] [5585] Remove obsolete code

[Greg Chicares]

Revision: 5585
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5585
Author:   chicares
Date:     2012-10-27 10:09:14 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
Remove obsolete code

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/input_harmonization.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-10-26 13:10:32 UTC (rev 5584)
+++ lmi/trunk/ChangeLog 2012-10-27 10:09:14 UTC (rev 5585)
@@ -30827,3 +30827,21 @@
   version.hpp
 Designate release candidate.
 
+20121025T0930Z <address@hidden> [567]
+
+  input.hpp
+  input_harmonization.cpp
+Refactor.
+
+20121026T1310Z <address@hidden> [565]
+
+  input_harmonization.cpp
+  mc_enum.cpp
+Remove obsolete code; move and improve documentation.
+
+20121027T1009Z <address@hidden> [563]
+
+  input_harmonization.cpp
+Remove obsolete code. Input::RealizeDeathBenefitOption() already
+contains equivalent logic.
+

Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp   2012-10-26 13:10:32 UTC (rev 5584)
+++ lmi/trunk/input_harmonization.cpp   2012-10-27 10:09:14 UTC (rev 5585)
@@ -482,8 +482,8 @@
     bool inhibit_sequence = specamt_solve || specamt_from_term_proportion;
     SpecifiedAmount.enable(!inhibit_sequence);
 
-    bool never_retire = database_->Query(DB_MaturityAge) <= 
RetirementAge.value();
 /*
+    bool never_retire = database_->Query(DB_MaturityAge) <= 
RetirementAge.value();
 // TODO ?? WX PORT !! Figure out how to handle the next line:
     if(!is_specamt_simply_representable)
         {
@@ -533,31 +533,6 @@
         }
 */
 
-    // TODO ?? WX PORT !! Figure out how to do this properly.
-    bool is_dbopt_simply_representable = true;
-
-    DeathBenefitOptionFromRetirement.allow(mce_option1, 
is_dbopt_simply_representable);
-    DeathBenefitOptionFromRetirement.allow(mce_option2, 
is_dbopt_simply_representable);
-    DeathBenefitOptionFromRetirement.allow(mce_rop    , 
is_dbopt_simply_representable && database_->Query(DB_AllowDbo3));
-    DeathBenefitOptionFromIssue     .allow(mce_option1, 
is_dbopt_simply_representable && !never_retire);
-    DeathBenefitOptionFromIssue     .allow(mce_option2, 
is_dbopt_simply_representable && !never_retire && 
(database_->Query(DB_AllowChangeToDbo2) || mce_option2 == 
DeathBenefitOptionFromRetirement));
-    DeathBenefitOptionFromIssue     .allow(mce_rop    , 
is_dbopt_simply_representable && !never_retire && 
database_->Query(DB_AllowDbo3));
-
-/*
-    // TODO ?? WX PORT !! Figure out how to do this properly.
-    if(is_dbopt_sequence_empty)
-        {
-        // Input sequence governs, and if it's empty, defaults
-        // are used, so make radiobuttons reflect that.
-        DBOPT_INIT_1        ->SetCheck(BF_CHECKED);
-        DBOPT_INIT_2        ->SetCheck(BF_UNCHECKED);
-        DBOPT_INIT_ROP      ->SetCheck(BF_UNCHECKED);
-        DBOPT_POSTRET_1     ->SetCheck(BF_CHECKED);
-        DBOPT_POSTRET_2     ->SetCheck(BF_UNCHECKED);
-        DBOPT_POSTRET_ROP   ->SetCheck(BF_UNCHECKED);
-        }
-*/
-
     bool prem_solve = mce_solve_ee_prem == SolveType;
 
     // Many payment strategies are forbidden if specamt is a function