GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 04:31:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Marked override functions as override

Browse Source
This commit is contained in:
Joseph Lenox 2018-07-17 10:43:30 -05:00
parent e4f76fdff1
commit 4bc352ae60
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xs/src/libslic3r/ConfigBase.hpp
View File

@ -102,18 +102,18 @@ class ConfigOptionFloat : public ConfigOptionSingle<double>
ConfigOptionFloat(double _value) : ConfigOptionSingle<double>(_value) {}; ConfigOptionFloat(double _value) : ConfigOptionSingle<double>(_value) {};
ConfigOptionFloat* clone() const { return new ConfigOptionFloat(this->value); }; ConfigOptionFloat* clone() const { return new ConfigOptionFloat(this->value); };
double getFloat() const { return this->value; }; double getFloat() const override { return this->value; };
void setFloat(double val) { this->value = val; } void setFloat(double val) override { this->value = val; }
void setInt(int val) { this->value = val; } void setInt(int val) override { this->value = val; }
std::string getString() const override { return trim_zeroes(std::to_string(this->value)); } std::string getString() const override { return trim_zeroes(std::to_string(this->value)); }
std::string serialize() const { std::string serialize() const override {
std::ostringstream ss; std::ostringstream ss;
ss << this->value; ss << this->value;
return ss.str(); return ss.str();
}; };
bool deserialize(std::string str, bool append = false) { bool deserialize(std::string str, bool append = false) override {
std::istringstream iss(str); std::istringstream iss(str);
iss >> this->value; iss >> this->value;
return !iss.fail(); return !iss.fail();
@ -167,19 +167,19 @@ class ConfigOptionInt : public ConfigOptionSingle<int>
public: public:
ConfigOptionInt() : ConfigOptionSingle<int>(0) {}; ConfigOptionInt() : ConfigOptionSingle<int>(0) {};
ConfigOptionInt(double _value) : ConfigOptionSingle<int>(_value) {}; ConfigOptionInt(double _value) : ConfigOptionSingle<int>(_value) {};
ConfigOptionInt* clone() const { return new ConfigOptionInt(this->value); }; ConfigOptionInt* clone() const override { return new ConfigOptionInt(this->value); };
int getInt() const { return this->value; }; int getInt() const override { return this->value; };
void setInt(int val) { this->value = val; }; void setInt(int val) override { this->value = val; };
std::string getString() const override { return std::to_string(this->value); } std::string getString() const override { return std::to_string(this->value); }
std::string serialize() const { std::string serialize() const override {
std::ostringstream ss; std::ostringstream ss;
ss << this->value; ss << this->value;
return ss.str(); return ss.str();
}; };
bool deserialize(std::string str, bool append = false) { bool deserialize(std::string str, bool append = false) override {
std::istringstream iss(str); std::istringstream iss(str);
iss >> this->value; iss >> this->value;
return !iss.fail(); return !iss.fail();
@ -191,7 +191,7 @@ class ConfigOptionInts : public ConfigOptionVector<int>
public: public:
ConfigOptionInts() {}; ConfigOptionInts() {};
ConfigOptionInts(const std::vector<int> _values) : ConfigOptionVector<int>(_values) {}; ConfigOptionInts(const std::vector<int> _values) : ConfigOptionVector<int>(_values) {};
ConfigOptionInts* clone() const { return new ConfigOptionInts(this->values); }; ConfigOptionInts* clone() const override { return new ConfigOptionInts(this->values); };
std::string serialize() const { std::string serialize() const {
std::ostringstream ss; std::ostringstream ss;