From e26ef4541578c5f294e28d4f15518c5a289ecf8f Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 8 May 2014 15:33:25 -0700 Subject: [PATCH] Manager: rename a struct member named "config" to avoid confusion --- clientgui/DlgDiagnosticLogFlags.cpp | 8 ++++---- clientgui/DlgDiagnosticLogFlags.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clientgui/DlgDiagnosticLogFlags.cpp b/clientgui/DlgDiagnosticLogFlags.cpp index 124f2a3be2..50f6538630 100755 --- a/clientgui/DlgDiagnosticLogFlags.cpp +++ b/clientgui/DlgDiagnosticLogFlags.cpp @@ -68,8 +68,8 @@ CDlgDiagnosticLogFlags::CDlgDiagnosticLogFlags(wxWindow* parent) : // Get cc_config.xml file flags log_flags.init(); - config.defaults(); - pDoc->rpc.get_cc_config(config, log_flags); + m_cc_config.defaults(); + pDoc->rpc.get_cc_config(m_cc_config, log_flags); SetSizeHints( wxDefaultSize, wxDefaultSize ); SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY ); @@ -142,7 +142,7 @@ void CDlgDiagnosticLogFlags::CreateCheckboxes() { m_checkbox_list.clear(); mf.init_buf_write(buf, sizeof(buf)); - config.write(mf, log_flags); + m_cc_config.write(mf, log_flags); mf.init_buf_read(buf); XML_PARSER xp(&mf); @@ -249,7 +249,7 @@ void CDlgDiagnosticLogFlags::OnOK(wxCommandEvent& event) { mf.init_buf_read(buf); log_flags.parse(xp); - int retval = pDoc->rpc.set_cc_config(config, log_flags); + int retval = pDoc->rpc.set_cc_config(m_cc_config, log_flags); if (!retval) { pDoc->rpc.read_cc_config(); } diff --git a/clientgui/DlgDiagnosticLogFlags.h b/clientgui/DlgDiagnosticLogFlags.h index 54f5a9c53c..e664c90c3a 100755 --- a/clientgui/DlgDiagnosticLogFlags.h +++ b/clientgui/DlgDiagnosticLogFlags.h @@ -57,7 +57,7 @@ private: void CreateCheckboxes(); LOG_FLAGS log_flags; - CC_CONFIG config; + CC_CONFIG m_cc_config; wxGridSizer* m_headingSizer; std::vector m_checkbox_list;