Global: Cleanup virtual/override specifiers.
Also missing virtual destructors, hidden non-overrides, etc.
This commit is contained in:
parent
31efd9565e
commit
f44852bb18
83 changed files with 283 additions and 315 deletions
|
@ -43,7 +43,7 @@ class RatingChoice : public LinearLayout {
|
|||
public:
|
||||
RatingChoice(const char *captionKey, int *value, LayoutParams *layoutParams = 0);
|
||||
|
||||
RatingChoice *SetEnabledPtr(bool *enabled);
|
||||
RatingChoice *SetEnabledPtrs(bool *enabled);
|
||||
|
||||
Event OnChoice;
|
||||
|
||||
|
@ -94,7 +94,7 @@ void RatingChoice::Update() {
|
|||
}
|
||||
}
|
||||
|
||||
RatingChoice *RatingChoice::SetEnabledPtr(bool *ptr) {
|
||||
RatingChoice *RatingChoice::SetEnabledPtrs(bool *ptr) {
|
||||
for (int i = 0; i < TotalChoices(); i++) {
|
||||
GetChoice(i)->SetEnabledPtr(ptr);
|
||||
}
|
||||
|
@ -139,8 +139,8 @@ public:
|
|||
CompatRatingChoice(const char *captionKey, int *value, LayoutParams *layoutParams = 0);
|
||||
|
||||
protected:
|
||||
virtual void SetupChoices() override;
|
||||
virtual int TotalChoices() override {
|
||||
void SetupChoices() override;
|
||||
int TotalChoices() override {
|
||||
return 5;
|
||||
}
|
||||
};
|
||||
|
@ -295,16 +295,16 @@ void ReportScreen::CreateViews() {
|
|||
screenshot_ = nullptr;
|
||||
}
|
||||
|
||||
leftColumnItems->Add(new CompatRatingChoice("Overall", (int *)&overall_))->SetEnabledPtr(&enableReporting_)->OnChoice.Handle(this, &ReportScreen::HandleChoice);
|
||||
leftColumnItems->Add(new CompatRatingChoice("Overall", (int *)&overall_))->SetEnabledPtrs(&enableReporting_)->OnChoice.Handle(this, &ReportScreen::HandleChoice);
|
||||
overallDescription_ = leftColumnItems->Add(new TextView("", FLAG_WRAP_TEXT, false, new LinearLayoutParams(Margins(10, 0))));
|
||||
overallDescription_->SetShadow(true);
|
||||
|
||||
UI::Orientation ratingsOrient = leftColumnWidth >= 750.0f ? ORIENT_HORIZONTAL : ORIENT_VERTICAL;
|
||||
UI::LinearLayout *ratingsHolder = new LinearLayoutList(ratingsOrient, new LinearLayoutParams(WRAP_CONTENT, WRAP_CONTENT));
|
||||
leftColumnItems->Add(ratingsHolder);
|
||||
ratingsHolder->Add(new RatingChoice("Graphics", &graphics_))->SetEnabledPtr(&ratingEnabled_)->OnChoice.Handle(this, &ReportScreen::HandleChoice);
|
||||
ratingsHolder->Add(new RatingChoice("Speed", &speed_))->SetEnabledPtr(&ratingEnabled_)->OnChoice.Handle(this, &ReportScreen::HandleChoice);
|
||||
ratingsHolder->Add(new RatingChoice("Gameplay", &gameplay_))->SetEnabledPtr(&ratingEnabled_)->OnChoice.Handle(this, &ReportScreen::HandleChoice);
|
||||
ratingsHolder->Add(new RatingChoice("Graphics", &graphics_))->SetEnabledPtrs(&ratingEnabled_)->OnChoice.Handle(this, &ReportScreen::HandleChoice);
|
||||
ratingsHolder->Add(new RatingChoice("Speed", &speed_))->SetEnabledPtrs(&ratingEnabled_)->OnChoice.Handle(this, &ReportScreen::HandleChoice);
|
||||
ratingsHolder->Add(new RatingChoice("Gameplay", &gameplay_))->SetEnabledPtrs(&ratingEnabled_)->OnChoice.Handle(this, &ReportScreen::HandleChoice);
|
||||
|
||||
rightColumnItems->SetSpacing(0.0f);
|
||||
rightColumnItems->Add(new Choice(rp->T("Open Browser")))->OnClick.Handle(this, &ReportScreen::HandleBrowser);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue