echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ccmake: Move Initialization of Fields Inline

Browse Source 
Move initialization of simple fields in cmCursesMainForm inline.
This commit is contained in:
Martin Duffy 2022-05-12 16:40:58 -04:00
parent 2019bf5092
commit e1c85e29f4
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CursesDialog/cmCursesMainForm.cxx
View File

@ -35,11 +35,6 @@ cmCursesMainForm::cmCursesMainForm(std::vector<std::string> args,
: Args(std::move(args))
, InitialWidth(initWidth)
{
this->HasNonStatusOutputs = false;
this->NumberOfPages = 0;
this->AdvancedMode = false;
this->NumberOfVisibleEntries = 0;
this->OkToGenerate = false;
this->HelpMessage.emplace_back(
"Welcome to ccmake, curses based user interface for CMake.");
this->HelpMessage.emplace_back();
@ -54,7 +49,6 @@ cmCursesMainForm::cmCursesMainForm(std::vector<std::string> args,
cmStrCat(cmSystemTools::GetProgramPath(this->Args[0]), "/cmake");
this->Args[0] = whereCMake;
this->CMakeInstance->SetArgs(this->Args);
this->SearchMode = false;
}
cmCursesMainForm::~cmCursesMainForm()

12
Source/CursesDialog/cmCursesMainForm.h
View File

@ -138,7 +138,7 @@ protected:
// Output produced by the last pass
std::vector<std::string> Outputs;
// Did the last pass produced outputs of interest (errors, warnings, ...)
bool HasNonStatusOutputs;
bool HasNonStatusOutputs = false;
// Last progress bar
std::string LastProgress;
@ -155,17 +155,17 @@ protected:
// Fields displayed. Includes labels, new entry markers, entries
std::vector<FIELD*> Fields;
// Number of entries shown (depends on mode -normal or advanced-)
size_t NumberOfVisibleEntries;
bool AdvancedMode;
size_t NumberOfVisibleEntries = 0;
bool AdvancedMode = false;
// Did the iteration converge (no new entries) ?
bool OkToGenerate;
bool OkToGenerate = false;
// Number of pages displayed
int NumberOfPages;
int NumberOfPages = 0;
int InitialWidth;
std::unique_ptr<cmake> CMakeInstance;
std::string SearchString;
std::string OldSearchString;
bool SearchMode;
bool SearchMode = false;
};