[lmi-commits] [lmi] master c30cd29 4/4: Rename pagination classes

[Greg Chicares]

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

    Rename pagination classes
    
    Renamed
      paginator --> prepaginator
      paginate  --> paginator
    Now both names are appropriately nouns, distinguished by a prefix whose
    meaning seems clear enough.
---
 ledger_pdf_generator_wx.cpp |  2 +-
 report_table.cpp            |  8 ++++----
 report_table.hpp            |  8 ++++----
 report_table_test.cpp       | 10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index 331ed25..4a1caba 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -1919,7 +1919,7 @@ class page_with_tabular_report
             throw std::runtime_error("no space left for tabular report");
             }
 
-        paginator z(ledger.GetMaxLength(), rows_per_group, max_lines_per_page);
+        prepaginator z(ledger.GetMaxLength(), rows_per_group, 
max_lines_per_page);
         // "- 1": return the number of *extra* pages.
         return z.page_count() - 1;
     }
diff --git a/report_table.cpp b/report_table.cpp
index bbd6006..abb930f 100644
--- a/report_table.cpp
+++ b/report_table.cpp
@@ -184,7 +184,7 @@ std::logic_error yikes("Rows per group must be positive.");
 
 /// Preconditions: 0 <= total_rows && 0 < rows_per_group <= max_lines_per_page
 
-paginator::paginator(int total_rows, int rows_per_group, int 
max_lines_per_page)
+prepaginator::prepaginator(int total_rows, int rows_per_group, int 
max_lines_per_page)
     :total_rows_         {total_rows}
     ,rows_per_group_     {0 < rows_per_group ? rows_per_group : throw yikes}
     ,max_lines_per_page_ {max_lines_per_page}
@@ -237,12 +237,12 @@ paginator::paginator(int total_rows, int rows_per_group, 
int max_lines_per_page)
         }
 }
 
-int paginate::init(int total_rows, int rows_per_group, int max_lines_per_page)
+int paginator::init(int total_rows, int rows_per_group, int max_lines_per_page)
 {
     total_rows_         = total_rows        ;
     rows_per_group_     = rows_per_group    ;
 
-    paginator p(total_rows, rows_per_group, max_lines_per_page);
+    prepaginator p(total_rows, rows_per_group, max_lines_per_page);
     lines_on_full_page_ = p.lines_on_full_page();
     lines_on_last_page_ = p.lines_on_last_page();
     page_count_         = p.page_count();
@@ -250,7 +250,7 @@ int paginate::init(int total_rows, int rows_per_group, int 
max_lines_per_page)
     return page_count_;
 }
 
-void paginate::print()
+void paginator::print()
 {
     prelude();
     int row = 0;
diff --git a/report_table.hpp b/report_table.hpp
index 287431e..fb1191b 100644
--- a/report_table.hpp
+++ b/report_table.hpp
@@ -145,10 +145,10 @@ std::vector<int> LMI_SO set_column_widths
 ///   [blank]    line  5
 ///   Z   --..   line  6   row 25
 
-class LMI_SO paginator
+class LMI_SO prepaginator
 {
   public:
-    paginator(int total_rows, int rows_per_group, int max_lines_per_page);
+    prepaginator(int total_rows, int rows_per_group, int max_lines_per_page);
 
     int lines_on_full_page() const {return lines_on_full_page_;}
     int lines_on_last_page() const {return lines_on_last_page_;}
@@ -169,10 +169,10 @@ class LMI_SO paginator
     int       page_count_;
 };
 
-class LMI_SO paginate
+class LMI_SO paginator
 {
   public:
-    paginate() {}
+    paginator() {}
 
     int init(int total_rows, int rows_per_group, int max_lines_per_page);
     void print();
diff --git a/report_table_test.cpp b/report_table_test.cpp
index 88fc461..3b6bb05 100644
--- a/report_table_test.cpp
+++ b/report_table_test.cpp
@@ -401,7 +401,7 @@ void 
report_table_test::test_column_widths_for_illustrations()
     }
 }
 
-class paginate_demo : public paginate
+class paginate_demo : public paginator
 {
   public:
     paginate_demo() {}
@@ -500,10 +500,10 @@ std::string test_paginate(int total_rows, int 
rows_per_group, int max_lines_per_
 
 void report_table_test::test_paginator()
 {
-    // Instead of testing class paginator directly, use
-    // paginate_demo::test_p(), which instantiates paginator
-    // and exercises other code as well before returning
-    // paginator's page count.
+    // Instead of testing classes prepaginator or paginator directly,
+    // use paginate_demo::test_p(), which instantiates paginator (and
+    // hence prepaginator) and exercises other code as well before
+    // returning the page count.
     paginate_demo p;
 
     // Original tests: vary only the number of data rows.