loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add cppcoreguidelines-explicit-virtual-functions clang-tidy check

Browse Source 
Fix the warnings it emits
This commit is contained in:
Oliver Hamlet
2022-02-07 00:15:58 +00:00
parent 0792feaf8f
commit 2ac4392dff
9 changed files with 64 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1
View File
@@ -487,6 +487,7 @@ if(RUN_CLANG_TIDY)
set(CLANG_TIDY_COMMON_CHECKS
"cppcoreguidelines-avoid-c-arrays"
"cppcoreguidelines-c-copy-assignment-signature"
"cppcoreguidelines-explicit-virtual-functions"
"cppcoreguidelines-interfaces-global-init"
"cppcoreguidelines-macro-usage"
"cppcoreguidelines-narrowing-conventions"
src/api/api_database.h
+18 -16
View File
@@ -41,41 +41,43 @@ namespace loot {
struct ApiDatabase final : public DatabaseInterface {
explicit ApiDatabase(std::shared_ptr<ConditionEvaluator> conditionEvaluator);
void LoadLists(const std::filesystem::path& masterlist_path,
const std::filesystem::path& userlist_path = "",
const std::filesystem::path& masterlist_prelude_path = "");
void LoadLists(
const std::filesystem::path& masterlist_path,
const std::filesystem::path& userlist_path = "",
const std::filesystem::path& masterlist_prelude_path = "") override;
void WriteUserMetadata(const std::filesystem::path& outputFile,
const bool overwrite) const;
const bool overwrite) const override;
void WriteMinimalList(const std::filesystem::path& outputFile,
const bool overwrite) const;
const bool overwrite) const override;
std::vector<std::string> GetKnownBashTags() const;
std::vector<std::string> GetKnownBashTags() const override;
std::vector<Message> GetGeneralMessages(
bool evaluateConditions = false) const;
bool evaluateConditions = false) const override;
std::vector<Group> GetGroups(bool includeUserMetadata = true) const;
std::vector<Group> GetUserGroups() const;
std::vector<Group> GetGroups(bool includeUserMetadata = true) const override;
std::vector<Group> GetUserGroups() const override;
void SetUserGroups(const std::vector<Group>& groups);
std::vector<Vertex> GetGroupsPath(const std::string& fromGroupName,
const std::string& toGroupName) const;
std::vector<Vertex> GetGroupsPath(
const std::string& fromGroupName,
const std::string& toGroupName) const override;
std::optional<PluginMetadata> GetPluginMetadata(
const std::string& plugin,
bool includeUserMetadata = true,
bool evaluateConditions = false) const;
bool evaluateConditions = false) const override;
std::optional<PluginMetadata> GetPluginUserMetadata(
const std::string& plugin,
bool evaluateConditions = false) const;
bool evaluateConditions = false) const override;
void SetPluginUserMetadata(const PluginMetadata& pluginMetadata);
void SetPluginUserMetadata(const PluginMetadata& pluginMetadata) override;
void DiscardPluginUserMetadata(const std::string& plugin);
void DiscardPluginUserMetadata(const std::string& plugin) override;
void DiscardAllUserMetadata();
void DiscardAllUserMetadata() override;
private:
std::shared_ptr<ConditionEvaluator> conditionEvaluator_;
src/api/game/game.h
+13 -11
View File
@@ -52,29 +52,31 @@ public:
// Game Interface Methods //
////////////////////////////
std::shared_ptr<DatabaseInterface> GetDatabase();
std::shared_ptr<DatabaseInterface> GetDatabase() override;
bool IsValidPlugin(const std::string& plugin) const;
bool IsValidPlugin(const std::string& plugin) const override;
void LoadPlugins(const std::vector<std::string>& plugins,
bool loadHeadersOnly);
bool loadHeadersOnly) override;
std::shared_ptr<const PluginInterface> GetPlugin(
const std::string& pluginName) const;
const std::string& pluginName) const override;
std::vector<std::shared_ptr<const PluginInterface>> GetLoadedPlugins() const;
std::vector<std::shared_ptr<const PluginInterface>> GetLoadedPlugins()
const override;
void IdentifyMainMasterFile(const std::string& masterFile);
void IdentifyMainMasterFile(const std::string& masterFile) override;
std::vector<std::string> SortPlugins(const std::vector<std::string>& plugins);
std::vector<std::string> SortPlugins(
const std::vector<std::string>& plugins) override;
void LoadCurrentLoadOrderState();
void LoadCurrentLoadOrderState() override;
bool IsPluginActive(const std::string& pluginName) const;
bool IsPluginActive(const std::string& pluginName) const override;
std::vector<std::string> GetLoadOrder() const;
std::vector<std::string> GetLoadOrder() const override;
void SetLoadOrder(const std::vector<std::string>& loadOrder);
void SetLoadOrder(const std::vector<std::string>& loadOrder) override;
private:
void CacheArchives();
src/api/plugin.h
+12 -12
View File
@@ -47,21 +47,21 @@ public:
std::filesystem::path pluginPath,
const bool headerOnly);
std::string GetName() const;
std::optional<float> GetHeaderVersion() const;
std::optional<std::string> GetVersion() const;
std::vector<std::string> GetMasters() const;
std::vector<Tag> GetBashTags() const;
std::optional<uint32_t> GetCRC() const;
std::string GetName() const override;
std::optional<float> GetHeaderVersion() const override;
std::optional<std::string> GetVersion() const override;
std::vector<std::string> GetMasters() const override;
std::vector<Tag> GetBashTags() const override;
std::optional<uint32_t> GetCRC() const override;
bool IsMaster() const;
bool IsMaster() const override;
bool IsLightPlugin() const;
bool IsLightPlugin() const override;
bool IsValidAsLightPlugin() const;
bool IsEmpty() const;
bool LoadsArchive() const;
bool DoFormIDsOverlap(const PluginInterface& plugin) const;
bool IsValidAsLightPlugin() const override;
bool IsEmpty() const override;
bool LoadsArchive() const override;
bool DoFormIDsOverlap(const PluginInterface& plugin) const override;
size_t GetOverlapSize(
const std::vector<std::shared_ptr<const Plugin>> plugins) const;
src/tests/api/interface/api_game_operations_test.h
+1 -1
View File
@@ -46,7 +46,7 @@ protected:
errorMessage("Obsolete. Remove this and install Enhanced Weather."),
generalMasterlistMessage("A general masterlist message.") {}
virtual void SetUp() {
virtual void SetUp() override {
CommonGameTestFixture::SetUp();
ASSERT_FALSE(std::filesystem::exists(masterlistPath));
src/tests/api/interface/create_game_handle_test.h
+2 -2
View File
@@ -42,7 +42,7 @@ protected:
localPathJunctionLink(localPath.string() + ".junction"),
originalWorkingDirectory(std::filesystem::current_path()) {}
void SetUp() {
void SetUp() override {
using std::filesystem::file_type;
using std::filesystem::status;
CommonGameTestFixture::SetUp();
@@ -70,7 +70,7 @@ protected:
std::filesystem::current_path(dataPath.parent_path().parent_path());
}
void TearDown() { std::filesystem::current_path(originalWorkingDirectory); }
void TearDown() override { std::filesystem::current_path(originalWorkingDirectory); }
std::shared_ptr<GameInterface> handle_;
src/tests/api/interface/database_interface_test.h
+1 -1
View File
@@ -41,7 +41,7 @@ protected:
generalUserlistMessage("A general userlist message."),
db_(nullptr) {}
void SetUp() {
void SetUp() override {
ApiGameOperationsTest::SetUp();
db_ = handle_->GetDatabase();
src/tests/api/internals/metadata_list_test.h
+1 -1
View File
@@ -40,7 +40,7 @@ protected:
{metadataFilesPath / "invalid" / "non_map_root.yaml",
metadataFilesPath / "invalid" / "non_unique.yaml"}) {}
inline virtual void SetUp() {
inline virtual void SetUp() override {
CommonGameTestFixture::SetUp();
using std::filesystem::copy;
src/tests/api/internals/plugin_test.h
+15 -13
View File
@@ -43,7 +43,7 @@ protected:
GetArchiveFileExtension(GetParam())),
game_(GetParam(), dataPath.parent_path(), localPath) {}
void SetUp() {
void SetUp() override {
CommonGameTestFixture::SetUp();
game_.LoadCurrentLoadOrderState();
@@ -138,21 +138,23 @@ private:
class OtherPluginType final : public PluginInterface {
public:
std::string GetName() const { return ""; }
std::optional<float> GetHeaderVersion() const { return 0.0f; }
std::optional<std::string> GetVersion() const { return std::nullopt; }
std::vector<std::string> GetMasters() const {
std::string GetName() const override { return ""; }
std::optional<float> GetHeaderVersion() const override { return 0.0f; }
std::optional<std::string> GetVersion() const override {
return std::nullopt;
}
std::vector<std::string> GetMasters() const override {
return std::vector<std::string>();
}
std::vector<Tag> GetBashTags() const { return std::vector<Tag>(); }
std::optional<uint32_t> GetCRC() const { return std::nullopt; }
std::vector<Tag> GetBashTags() const override { return std::vector<Tag>(); }
std::optional<uint32_t> GetCRC() const override { return std::nullopt; }
bool IsMaster() const { return false; }
bool IsLightPlugin() const { return false; }
bool IsValidAsLightPlugin() const { return false; }
bool IsEmpty() const { return false; }
bool LoadsArchive() const { return false; }
bool DoFormIDsOverlap(const PluginInterface&) const { return true; }
bool IsMaster() const override { return false; }
bool IsLightPlugin() const override { return false; }
bool IsValidAsLightPlugin() const override { return false; }
bool IsEmpty() const override { return false; }
bool LoadsArchive() const override { return false; }
bool DoFormIDsOverlap(const PluginInterface&) const override { return true; }
};
// Pass an empty first argument, as it's a prefix for the test instantation,