Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manager: rename a struct member named "config" to avoid confusion

This commit is contained in:
David Anderson 2014-05-08 15:33:25 -07:00
parent f0626cf5fc
commit e26ef45415
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clientgui/DlgDiagnosticLogFlags.cpp
View File

@ -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();
}

2
clientgui/DlgDiagnosticLogFlags.h
View File

@ -57,7 +57,7 @@ private:
void CreateCheckboxes();
LOG_FLAGS log_flags;
CC_CONFIG config;
CC_CONFIG m_cc_config;
wxGridSizer* m_headingSizer;
std::vector <wxCheckBox*> m_checkbox_list;