[lmi-commits] [lmi] master eafa74e 3/3: Relocate an enum

[Greg Chicares]

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

    Relocate an enum
    
    Removed a header that contained only one enum; moved its contents to a
    header that collects enums that are used across several files.
---
 oecumenic_enumerations.hpp |  5 +++++
 output_mode.hpp            | 33 ---------------------------------
 pdf_writer_wx.hpp          |  2 +-
 wx_table_generator.hpp     |  2 +-
 4 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/oecumenic_enumerations.hpp b/oecumenic_enumerations.hpp
index ccbff78..098ec79 100644
--- a/oecumenic_enumerations.hpp
+++ b/oecumenic_enumerations.hpp
@@ -94,6 +94,11 @@ enum oenum_premium_tax_tier_period
     };
 #endif // 0
 
+enum oenum_render_or_only_measure
+    {oe_render
+    ,oe_only_measure
+    };
+
 enum oenum_smoking_or_tobacco
     {oe_smoker_nonsmoker
     ,oe_tobacco_nontobacco
diff --git a/output_mode.hpp b/output_mode.hpp
deleted file mode 100644
index e10a9c2..0000000
--- a/output_mode.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Output mode enum used in PDF generation helpers.
-//
-// Copyright (C) 2017, 2018 Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-#ifndef output_mode_hpp
-#define output_mode_hpp
-
-#include "config.hpp"
-
-enum oenum_render_or_only_measure
-    {oe_render
-    ,oe_only_measure
-    };
-// [...to be moved to 'oecumenic_enumerations.hpp' presently]
-
-#endif // output_mode_hpp
diff --git a/pdf_writer_wx.hpp b/pdf_writer_wx.hpp
index b1bd9b2..0a76029 100644
--- a/pdf_writer_wx.hpp
+++ b/pdf_writer_wx.hpp
@@ -25,7 +25,7 @@
 #include "config.hpp"
 
 #include "assert_lmi.hpp"
-#include "output_mode.hpp"
+#include "oecumenic_enumerations.hpp"
 
 #include <wx/html/winpars.h>
 
diff --git a/wx_table_generator.hpp b/wx_table_generator.hpp
index 8bc0af0..0011dac 100644
--- a/wx_table_generator.hpp
+++ b/wx_table_generator.hpp
@@ -24,7 +24,7 @@
 
 #include "config.hpp"
 
-#include "output_mode.hpp"
+#include "oecumenic_enumerations.hpp"
 
 #include <wx/dc.h>
 #include <wx/font.h>