[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [6299] Rename certain members
From: |
Greg Chicares |
Subject: |
[lmi-commits] [6299] Rename certain members |
Date: |
Fri, 25 Sep 2015 02:21:14 +0000 |
Revision: 6299
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6299
Author: chicares
Date: 2015-09-25 02:21:13 +0000 (Fri, 25 Sep 2015)
Log Message:
-----------
Rename certain members
Modified Paths:
--------------
lmi/trunk/emit_ledger.cpp
lmi/trunk/group_quote_pdf_gen_wx.cpp
lmi/trunk/ledger.cpp
lmi/trunk/ledger.hpp
lmi/trunk/ledger_text_formats.cpp
lmi/trunk/ledger_xml_io.cpp
lmi/trunk/ledger_xsl.cpp
Modified: lmi/trunk/emit_ledger.cpp
===================================================================
--- lmi/trunk/emit_ledger.cpp 2015-09-24 22:57:22 UTC (rev 6298)
+++ lmi/trunk/emit_ledger.cpp 2015-09-25 02:21:13 UTC (rev 6299)
@@ -107,7 +107,7 @@
)
{
Timer timer;
- if((emission_ & mce_emit_composite_only) && !ledger.GetIsComposite())
+ if((emission_ & mce_emit_composite_only) && !ledger.is_composite())
{
goto done;
}
Modified: lmi/trunk/group_quote_pdf_gen_wx.cpp
===================================================================
--- lmi/trunk/group_quote_pdf_gen_wx.cpp 2015-09-24 22:57:22 UTC (rev
6298)
+++ lmi/trunk/group_quote_pdf_gen_wx.cpp 2015-09-25 02:21:13 UTC (rev
6299)
@@ -393,7 +393,7 @@
std::pair<int, oenum_format_style> const f0(0, oe_format_normal);
std::pair<int, oenum_format_style> const f2(2, oe_format_normal);
- bool const is_composite = ledger.GetIsComposite();
+ bool const is_composite = ledger.is_composite();
row_data rd;
for(int col = 0; col < e_col_max; ++col)
Modified: lmi/trunk/ledger.cpp
===================================================================
--- lmi/trunk/ledger.cpp 2015-09-24 22:57:22 UTC (rev 6298)
+++ lmi/trunk/ledger.cpp 2015-09-25 02:21:13 UTC (rev 6299)
@@ -215,7 +215,7 @@
// Perhaps these distinctions should be expressed not as named
// subcollections of containers but rather as enumerators.
- if(ledger_type_ != a_Addend.GetLedgerType())
+ if(ledger_type_ != a_Addend.ledger_type())
{
fatal_error()
<< "Cannot add ledgers for products with different"
@@ -232,8 +232,8 @@
ledger_invariant_->PlusEq(*a_Addend.ledger_invariant_);
- LMI_ASSERT(GetIsComposite());
- LMI_ASSERT(!a_Addend.GetIsComposite());
+ LMI_ASSERT(is_composite());
+ LMI_ASSERT(!a_Addend.is_composite());
while(this_i != l_map_rep.end() || addend_i != lm_addend.end())
{
@@ -386,19 +386,19 @@
}
//============================================================================
-mcenum_ledger_type Ledger::GetLedgerType() const
+std::vector<mcenum_run_basis> const& Ledger::GetRunBases() const
{
- return ledger_type_;
+ return run_bases_;
}
//============================================================================
-std::vector<mcenum_run_basis> const& Ledger::GetRunBases() const
+mcenum_ledger_type Ledger::ledger_type() const
{
- return run_bases_;
+ return ledger_type_;
}
//============================================================================
-bool Ledger::GetIsComposite() const
+bool Ledger::is_composite() const
{
return is_composite_;
}
Modified: lmi/trunk/ledger.hpp
===================================================================
--- lmi/trunk/ledger.hpp 2015-09-24 22:57:22 UTC (rev 6298)
+++ lmi/trunk/ledger.hpp 2015-09-25 02:21:13 UTC (rev 6299)
@@ -89,21 +89,22 @@
void AutoScale();
- ledger_map_holder const& GetLedgerMap() const;
- LedgerInvariant const& GetLedgerInvariant() const;
- LedgerVariant const& GetCurrFull() const;
- LedgerVariant const& GetGuarFull() const;
- LedgerVariant const& GetMdptFull() const;
- LedgerVariant const& GetCurrZero() const;
- LedgerVariant const& GetGuarZero() const;
- LedgerVariant const& GetCurrHalf() const;
- LedgerVariant const& GetGuarHalf() const;
+ ledger_map_holder const& GetLedgerMap () const;
+ LedgerInvariant const& GetLedgerInvariant () const;
+ LedgerVariant const& GetCurrFull () const;
+ LedgerVariant const& GetGuarFull () const;
+ LedgerVariant const& GetMdptFull () const;
+ LedgerVariant const& GetCurrZero () const;
+ LedgerVariant const& GetGuarZero () const;
+ LedgerVariant const& GetCurrHalf () const;
+ LedgerVariant const& GetGuarHalf () const;
- mcenum_ledger_type GetLedgerType() const;
- int GetMaxLength() const;
- std::vector<mcenum_run_basis> const& GetRunBases() const;
- bool GetIsComposite() const;
+ int GetMaxLength () const;
+ std::vector<mcenum_run_basis> const& GetRunBases () const;
+ mcenum_ledger_type ledger_type () const;
+ bool is_composite () const;
+
unsigned int CalculateCRC() const;
void Spew(std::ostream& os) const;
Modified: lmi/trunk/ledger_text_formats.cpp
===================================================================
--- lmi/trunk/ledger_text_formats.cpp 2015-09-24 22:57:22 UTC (rev 6298)
+++ lmi/trunk/ledger_text_formats.cpp 2015-09-25 02:21:13 UTC (rev 6299)
@@ -224,7 +224,7 @@
std::ostringstream oss;
oss.setf(std::ios_base::fixed, std::ios_base::floatfield);
- if(ledger_.GetIsComposite())
+ if(ledger_.is_composite())
{
oss << "Composite calculation summary\n";
}
@@ -276,10 +276,10 @@
oss << "<p>\n" << top_note("<br>\n") << "</p>\n";
- if(!ledger_.GetIsComposite())
+ if(!ledger_.is_composite())
{
oss << "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"
width=\"100%\">\n";
- if(is_subject_to_ill_reg(ledger_.GetLedgerType()))
+ if(is_subject_to_ill_reg(ledger_.ledger_type()))
{
oss
<< "<tr>\n"
@@ -381,9 +381,9 @@
oss << top_note("\n") << '\n';
- if(!ledger_.GetIsComposite())
+ if(!ledger_.is_composite())
{
- if(is_subject_to_ill_reg(ledger_.GetLedgerType()))
+ if(is_subject_to_ill_reg(ledger_.ledger_type()))
{
oss
<< std::setprecision(2)
@@ -780,7 +780,7 @@
,std::string const& file_name
)
{
- if(ledger_values.GetIsComposite())
+ if(ledger_values.is_composite())
{
return;
}
@@ -940,7 +940,7 @@
os_ << center(invar().ProducerName) << endrow;
os_ << center(invar().ProducerStreet) << endrow;
os_ << center(invar().ProducerCity) << endrow;
- if(ledger_.GetIsComposite())
+ if(ledger_.is_composite())
{
os_ << "Composite" << endrow;
}
@@ -1111,7 +1111,7 @@
os_ << std::setw( 7) << (1 + j ) ;
- if(ledger_.GetIsComposite())
+ if(ledger_.is_composite())
{
os_ << std::setw(12) << ' ' ;
}
Modified: lmi/trunk/ledger_xml_io.cpp
===================================================================
--- lmi/trunk/ledger_xml_io.cpp 2015-09-24 22:57:22 UTC (rev 6298)
+++ lmi/trunk/ledger_xml_io.cpp 2015-09-25 02:21:13 UTC (rev 6299)
@@ -683,7 +683,7 @@
// [End of derived columns.]
- double Composite = GetIsComposite();
+ double Composite = is_composite();
scalars["Composite"] = &Composite;
double NoLapse =
@@ -962,7 +962,7 @@
x.push_back(supplementalreport);
if
- ( GetIsComposite()
+ ( is_composite()
&& contains(ledger_invariant_->Comments, "idiosyncrasy_spreadsheet")
)
{
Modified: lmi/trunk/ledger_xsl.cpp
===================================================================
--- lmi/trunk/ledger_xsl.cpp 2015-09-24 22:57:22 UTC (rev 6298)
+++ lmi/trunk/ledger_xsl.cpp 2015-09-25 02:21:13 UTC (rev 6299)
@@ -47,7 +47,7 @@
{
std::string xsl_filename(Ledger const& ledger)
{
- mcenum_ledger_type const z = ledger.GetLedgerType();
+ mcenum_ledger_type const z = ledger.ledger_type();
switch(z)
{
case mce_ill_reg: return "illustration_reg.xsl";
@@ -77,7 +77,7 @@
<< "Unable to read file '"
<< xsl_file
<< "' required for ledger type '"
- << ledger.GetLedgerType()
+ << ledger.ledger_type()
<< "'."
<< LMI_FLUSH
;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [6299] Rename certain members,
Greg Chicares <=