olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: fix all clang-cl warnings

This commit is contained in:
Eric Wasylishen 2022-05-10 21:57:17 -06:00
parent d763b2e336
commit abc799554d
5 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/common/parser.hh
View File

@ -93,9 +93,9 @@ private:
std::vector<untied_t<state_type>> _states;
public:
virtual void push_state() override { _states.push_back(state()); }
void push_state() override { _states.push_back(state()); }
virtual void pop_state() override
void pop_state() override
{
state() = _states.back();
_states.pop_back();
@ -144,9 +144,9 @@ private:
std::vector<untied_t<state_type>> _states;
public:
virtual void push_state() override { _states.push_back(state()); }
void push_state() override { _states.push_back(state()); }
virtual void pop_state() override
void pop_state() override
{
state() = _states.back();
_states.pop_back();

56
include/common/settings.hh
View File

@ -202,15 +202,15 @@ public:
inline void reset() override {}
virtual bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
_func();
return true;
}
virtual std::string stringValue() const override { return ""; }
std::string stringValue() const override { return ""; }
virtual std::string format() const override { return ""; }
std::string format() const override { return ""; }
};
// base class for a setting that has its own value
@ -299,14 +299,14 @@ public:
{
}
virtual bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
return parseInternal(parser, locked, true);
}
virtual std::string stringValue() const override { return _value ? "1" : "0"; }
std::string stringValue() const override { return _value ? "1" : "0"; }
virtual std::string format() const override { return _default ? "[0]" : ""; }
std::string format() const override { return _default ? "[0]" : ""; }
};
// an extension to setting_bool; this automatically adds "no" versions
@ -332,7 +332,7 @@ public:
{
}
virtual bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
return parseInternal(parser, locked, settingName.compare(0, 2, "no") == 0 ? false : true);
}
@ -357,7 +357,7 @@ public:
inline void reset() override {}
virtual bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
// this is a bit ugly, but we run the parse function for
// every setting that we redirect from. for every entry
@ -379,9 +379,9 @@ public:
return true;
}
virtual std::string stringValue() const override { return _settings[0]->stringValue(); }
std::string stringValue() const override { return _settings[0]->stringValue(); }
virtual std::string format() const override { return _settings[0]->format(); }
std::string format() const override { return _settings[0]->format(); }
};
template<typename T>
@ -390,7 +390,7 @@ class setting_numeric : public setting_value<T>
protected:
T _min, _max;
virtual void setValueInternal(T f, source newsource) override
void setValueInternal(T f, source newsource) override
{
if (f < _min) {
logging::print("WARNING: '{}': {} is less than minimum value {}.\n", this->primaryName(), f, _min);
@ -427,7 +427,7 @@ public:
return this->_value > 0;
}
virtual bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
if (!parser.parse_token()) {
return false;
@ -451,9 +451,9 @@ public:
}
}
virtual std::string stringValue() const override { return std::to_string(this->_value); }
std::string stringValue() const override { return std::to_string(this->_value); }
virtual std::string format() const override { return "n"; }
std::string format() const override { return "n"; }
};
using setting_scalar = setting_numeric<vec_t>;
@ -473,10 +473,10 @@ public:
{
}
virtual std::string stringValue() const override
std::string stringValue() const override
{
for (auto &value : _values) {
if (value.second == _value) {
if (value.second == this->_value) {
return value.first;
}
}
@ -484,7 +484,7 @@ public:
throw std::exception();
}
virtual std::string format() const override
std::string format() const override
{
std::string f;
@ -499,14 +499,14 @@ public:
return f;
}
virtual bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
if (!parser.parse_token()) {
return false;
}
if (auto it = _values.find(parser.token); it != _values.end()) {
setValueFromParse(it->second, locked);
this->setValueFromParse(it->second, locked);
return true;
}
@ -526,7 +526,7 @@ public:
{
}
virtual bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
if (auto value = parseString(parser)) {
setValueFromParse(std::move(*value), locked);
@ -536,9 +536,9 @@ public:
return false;
}
[[deprecated("use value()")]] virtual std::string stringValue() const override { return _value; }
[[deprecated("use value()")]] std::string stringValue() const override { return _value; }
virtual std::string format() const override { return _format; }
std::string format() const override { return _format; }
};
class setting_vec3 : public setting_value<qvec3d>
@ -546,7 +546,7 @@ class setting_vec3 : public setting_value<qvec3d>
protected:
virtual qvec3d transformVec3Value(const qvec3d &val) const { return val; }
virtual void setValueInternal(qvec3d f, source newsource) override
void setValueInternal(qvec3d f, source newsource) override
{
setting_value::setValueInternal(transformVec3Value(f), newsource);
}
@ -558,7 +558,7 @@ public:
{
}
virtual bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
qvec3d vec;
@ -580,15 +580,15 @@ public:
return true;
}
virtual std::string stringValue() const override { return qv::to_string(_value); }
std::string stringValue() const override { return qv::to_string(_value); }
virtual std::string format() const override { return "x y z"; }
std::string format() const override { return "x y z"; }
};
class setting_mangle : public setting_vec3
{
protected:
virtual qvec3d transformVec3Value(const qvec3d &val) const override { return qv::vec_from_mangle(val); }
qvec3d transformVec3Value(const qvec3d &val) const override { return qv::vec_from_mangle(val); }
public:
using setting_vec3::setting_vec3;
@ -597,7 +597,7 @@ public:
class setting_color : public setting_vec3
{
protected:
virtual qvec3d transformVec3Value(const qvec3d &val) const override { return qv::normalize_color_format(val); }
qvec3d transformVec3Value(const qvec3d &val) const override { return qv::normalize_color_format(val); }
public:
using setting_vec3::setting_vec3;

16
include/light/light.hh
View File

@ -332,7 +332,7 @@ public:
public:
using setting_int32::setting_int32;
virtual bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
if (!parser.parse_token()) {
return false;
@ -357,7 +357,7 @@ public:
}
}
virtual std::string format() const { return "[n]"; }
std::string format() const override { return "[n]"; }
};
class setting_extra : public setting_value<int32_t>
@ -365,7 +365,7 @@ public:
public:
using setting_value::setting_value;
virtual bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false)
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
if (settingName.back() == '4') {
setValueFromParse(4, locked);
@ -376,9 +376,9 @@ public:
return true;
}
virtual std::string stringValue() const override { return std::to_string(_value); };
std::string stringValue() const override { return std::to_string(_value); };
virtual std::string format() const override { return ""; };
std::string format() const override { return ""; };
};
setting_bool surflight_dump{this, "surflight_dump", false, &debug_group, "dump surface lights to a .map file"};
@ -497,15 +497,15 @@ public:
bitflags<lightfile> write_luxfile = lightfile::none;
debugmodes debugmode = debugmodes::none;
virtual void setParameters(int argc, const char **argv) override
void setParameters(int argc, const char **argv) override
{
common_settings::setParameters(argc, argv);
usage = "light compiles lightmap data for BSPs\n\n";
remainderName = "mapname.bsp";
}
virtual void initialize(int argc, const char **argv) override;
virtual void postinitialize(int argc, const char **argv) override;
void initialize(int argc, const char **argv) override;
void postinitialize(int argc, const char **argv) override;
};
}; // namespace settings

12
include/qbsp/qbsp.hh
View File

@ -104,7 +104,7 @@ public:
_source = source::DEFAULT;
}
virtual bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
{
if (auto value = parseString(parser)) {
if (changeSource(locked ? source::COMMANDLINE : source::MAP)) {
@ -117,7 +117,7 @@ public:
return false;
}
virtual std::string stringValue() const
std::string stringValue() const override
{
std::string paths;
@ -136,7 +136,7 @@ public:
return paths;
}
virtual std::string format() const { return "path/to/wads"; }
std::string format() const override { return "path/to/wads"; }
};
extern setting_group game_target_group;
@ -221,14 +221,14 @@ public:
"add a path to the wad search paths; wads found in xwadpath's will not be embedded, otherwise they will be embedded (if not -notex)"};
setting_bool notriggermodels{this, "notriggermodels", false, &common_format_group, "for supported game code only: triggers will not write a model\nout, and will instead just write out their mins/maxs."};
virtual void setParameters(int argc, const char **argv) override
void setParameters(int argc, const char **argv) override
{
common_settings::setParameters(argc, argv);
usage = "qbsp performs geometric level processing of Quake .MAP files to create\nQuake .BSP files.\n\n";
remainderName = "sourcefile.map [destfile.bsp]";
}
virtual void initialize(int argc, const char **argv) override;
virtual void postinitialize(int argc, const char **argv) override;
void initialize(int argc, const char **argv) override;
void postinitialize(int argc, const char **argv) override;
bool fVerbose = true;
bool fAllverbose = false;

4
include/vis/vis.hh
View File

@ -232,13 +232,13 @@ public:
fs::path sourceMap;
virtual void setParameters(int argc, const char **argv) override
void setParameters(int argc, const char **argv) override
{
common_settings::setParameters(argc, argv);
usage = "vis calculates the visibility (and hearability) sets for \n.BSP files.\n\n";
remainderName = "mapname.bsp";
}
virtual void initialize(int argc, const char **argv) override;
void initialize(int argc, const char **argv) override;
};
} // namespace settings