[lmi-commits] [lmi] master 6586cab 1/9: Simplify

[Greg Chicares]

branch: master
commit 6586cab0da80b02ca3ae8e31e03fcf05b30eda9e
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Simplify
    
    See discussion beginning here:
      https://lists.nongnu.org/archive/html/lmi/2018-04/msg00002.html
    
    Incidentally, simplified the alarum() statement: it isn't necessary to
    name the unsupported ledger type here. Reason: unsupported ledger types
    are diagnosed upstream when the Ledger object is constructed (so this
    alarum() statement is actually unreachable).
---
 ledger_pdf_generator_wx.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index 21aa230..c207c45 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -2923,31 +2923,26 @@ void ledger_pdf_generator_wx::write
 {
     wxBusyCursor reverie;
 
-    std::unique_ptr<pdf_illustration> pdf_ill;
-
-    auto const z = ledger.ledger_type();
-    switch(z)
+    switch(ledger.ledger_type())
         {
         case mce_ill_reg:
-            pdf_ill = std::make_unique<pdf_illustration_regular>(ledger);
+            pdf_illustration_regular         (ledger).render_all(output);
             break;
         case mce_nasd:
-            pdf_ill = std::make_unique<pdf_illustration_nasd>(ledger);
+            pdf_illustration_nasd            (ledger).render_all(output);
             break;
         case mce_group_private_placement:
-            pdf_ill = std::make_unique<pdf_illustration_reg_d_group>(ledger);
+            pdf_illustration_reg_d_group     (ledger).render_all(output);
             break;
         case mce_individual_private_placement:
-            pdf_ill = 
std::make_unique<pdf_illustration_reg_d_individual>(ledger);
+            pdf_illustration_reg_d_individual(ledger).render_all(output);
             break;
         case mce_prospectus_obsolete:                 // fall through
         case mce_offshore_private_placement_obsolete: // fall through
         case mce_ill_reg_private_placement_obsolete:  // fall through
         case mce_variable_annuity_obsolete:
-            alarum() << "Unsupported ledger type '" << z << "'." << LMI_FLUSH;
+            alarum() << "Unsupported ledger type." << LMI_FLUSH;
         }
-
-    pdf_ill->render_all(output);
 }
 
 volatile bool ensure_setup = ledger_pdf_generator::set_creator