Skip to content

Class Default Member Initializers for Option #7031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FauziAkram wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −10
Open

Class Default Member Initializers for Option #7031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/ucioption.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,24 +88,18 @@ usize OptionsMap::count(const std::string& name) const { return options_map.coun

Option::Option(const char* v, OnChange f) :
type("string"),
min(0),
max(0),
on_change(std::move(f)) {
defaultValue = currentValue = v;
}

Option::Option(bool v, OnChange f) :
type("check"),
min(0),
max(0),
on_change(std::move(f)) {
defaultValue = currentValue = (v ? "true" : "false");
}

Option::Option(OnChange f) :
type("button"),
min(0),
max(0),
on_change(std::move(f)) {}

Option::Option(int v, int minv, int maxv, OnChange f) :
Expand All @@ -118,8 +112,6 @@ Option::Option(int v, int minv, int maxv, OnChange f) :

Option::Option(const char* v, const char* cur, OnChange f) :
type("combo"),
min(0),
max(0),
on_change(std::move(f)) {
defaultValue = v;
currentValue = cur;
Expand Down
4 changes: 2 additions & 2 deletions src/ucioption.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ class Option {


std::string defaultValue, currentValue, type;
int min, max;
usize idx;
int min = 0, max = 0;
usize idx = 0;
OnChange on_change;
const OptionsMap* parent = nullptr;
};
Expand Down
Loading