chore: clean up after new compiler warnings

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

launcher/BaseInstance.h

@@ -88,7 +88,7 @@ public: /* types */
 
 public:
     /// virtual destructor to make sure the destruction is COMPLETE
-    virtual ~BaseInstance() {};
+    virtual ~BaseInstance() {}
 
     virtual void saveNow() = 0;
 
@@ -154,7 +154,7 @@ public:
     virtual MessageLevel::Enum guessLevel([[maybe_unused]] const QString &line, MessageLevel::Enum level)
     {
         return level;
-    };
+    }
 
     virtual QStringList extraArguments();
 
@@ -291,7 +291,7 @@ public:
 protected:
     void changeStatus(Status newStatus);
 
-    SettingsObjectPtr globalSettings() const { return m_global_settings.lock(); };
+    SettingsObjectPtr globalSettings() const { return m_global_settings.lock(); }
 
     bool isSpecificSettingsLoaded() const { return m_specific_settings_loaded; }
     void setSpecificSettingsLoaded(bool loaded) { m_specific_settings_loaded = loaded; }

launcher/BaseVersion.h

@@ -48,11 +48,11 @@ public:
     virtual bool operator<(BaseVersion &a)
     {
         return name() < a.name();
-    };
+    }
     virtual bool operator>(BaseVersion &a)
     {
         return name() > a.name();
-    };
+    }
 };
 
 Q_DECLARE_METATYPE(BaseVersion::Ptr)

launcher/ProblemProvider.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <QList>
+#include <QString>
+
 enum class ProblemSeverity
 {
     None,
@@ -16,7 +19,7 @@ struct PatchProblem
 class ProblemProvider
 {
 public:
-    virtual ~ProblemProvider() {};
+    virtual ~ProblemProvider() {}
     virtual const QList<PatchProblem> getProblems() const = 0;
     virtual ProblemSeverity getProblemSeverity() const = 0;
 };

launcher/Usable.h

@@ -12,28 +12,20 @@ class Usable;
  *
  * @see UseLock
  */
-class Usable
+class Usable {
-{
     friend class UseLock;
-public:
+
-    std::size_t useCount() const
+   public:
-    {
+    virtual ~Usable() {}
-        return m_useCount;
+
-    }
+    std::size_t useCount() const { return m_useCount; }
-    bool isInUse() const
+    bool isInUse() const { return m_useCount > 0; }
-    {
+
-        return m_useCount > 0;
+   protected:
-    }
+    virtual void decrementUses() { m_useCount--; }
-protected:
+    virtual void incrementUses() { m_useCount++; }
-    virtual void decrementUses()
+
-    {
+   private:
-        m_useCount--;
-    }
-    virtual void incrementUses()
-    {
-        m_useCount++;
-    }
-private:
     std::size_t m_useCount = 0;
 };
 

launcher/minecraft/Component.h

@@ -27,7 +27,8 @@ public:
     Component(PackProfile * parent, std::shared_ptr<Meta::Version> version);
     Component(PackProfile * parent, const QString & uid, std::shared_ptr<VersionFile> file);
 
-    virtual ~Component(){};
+    virtual ~Component(){}
+
     void applyTo(LaunchProfile *profile);
 
     bool isEnabled();

launcher/minecraft/LaunchProfile.h

@@ -42,7 +42,7 @@
 class LaunchProfile: public ProblemProvider
 {
 public:
-    virtual ~LaunchProfile() {};
+    virtual ~LaunchProfile() {}
 
 public: /* application of profile variables from patches */
     void applyMinecraftVersion(const QString& id);

launcher/minecraft/MojangDownloadInfo.h

@@ -23,8 +23,8 @@ struct MojangDownloadInfo
 
 struct MojangLibraryDownloadInfo
 {
-    MojangLibraryDownloadInfo(MojangDownloadInfo::Ptr artifact): artifact(artifact) {};
+    MojangLibraryDownloadInfo(MojangDownloadInfo::Ptr artifact): artifact(artifact) {}
-    MojangLibraryDownloadInfo() {};
+    MojangLibraryDownloadInfo() {}
 
     // types
     typedef std::shared_ptr<MojangLibraryDownloadInfo> Ptr;

launcher/minecraft/Rule.h

@@ -63,7 +63,7 @@ public:
     Rule(RuleAction result) : m_result(result)
     {
     }
-    virtual ~Rule() {};
+    virtual ~Rule() {}
     virtual QJsonObject toJson() = 0;
     RuleAction apply(const Library *parent, const RuntimeContext & runtimeContext)
     {

launcher/minecraft/mod/ResourceFolderModel.h

@@ -44,8 +44,8 @@ class ResourceFolderModel : public QAbstractListModel {
     bool stopWatching(const QStringList paths);
 
     /* Helper methods for subclasses, using a predetermined list of paths. */
-    virtual bool startWatching() { return startWatching({ m_dir.absolutePath() }); };
+    virtual bool startWatching() { return startWatching({ m_dir.absolutePath() }); }
-    virtual bool stopWatching() { return stopWatching({ m_dir.absolutePath() }); };
+    virtual bool stopWatching() { return stopWatching({ m_dir.absolutePath() }); }
 
     /** Given a path in the system, install that resource, moving it to its place in the
      *  instance file hierarchy.
@@ -73,7 +73,7 @@ class ResourceFolderModel : public QAbstractListModel {
     /** Creates a new parse task, if needed, for 'res' and start it.*/
     virtual void resolveResource(Resource* res);
 
-    [[nodiscard]] size_t size() const { return m_resources.size(); };
+    [[nodiscard]] int size() const { return m_resources.size(); }
     [[nodiscard]] bool empty() const { return size() == 0; }
     [[nodiscard]] Resource& at(int index) { return *m_resources.at(index); }
     [[nodiscard]] Resource const& at(int index) const { return *m_resources.at(index); }
@@ -94,7 +94,7 @@ class ResourceFolderModel : public QAbstractListModel {
     enum Columns { ACTIVE_COLUMN = 0, NAME_COLUMN, DATE_COLUMN, NUM_COLUMNS };
 
     [[nodiscard]] int rowCount(const QModelIndex& parent = {}) const override { return parent.isValid() ? 0 : static_cast<int>(size()); }
-    [[nodiscard]] int columnCount(const QModelIndex& parent = {}) const override { return parent.isValid() ? 0 : NUM_COLUMNS; };
+    [[nodiscard]] int columnCount(const QModelIndex& parent = {}) const override { return parent.isValid() ? 0 : NUM_COLUMNS; }
 
     [[nodiscard]] Qt::DropActions supportedDropActions() const override;
 
@@ -151,7 +151,7 @@ class ResourceFolderModel : public QAbstractListModel {
      *  This task should load and parse all heavy info needed by a resource, such as parsing a manifest. It gets executed
      *  in the background, so it slowly updates the UI as tasks get done.
      */
-    [[nodiscard]] virtual Task* createParseTask(Resource&) { return nullptr; };
+    [[nodiscard]] virtual Task* createParseTask(Resource&) { return nullptr; }
 
     /** Standard implementation of the model update logic.
      *
@@ -210,15 +210,15 @@ class ResourceFolderModel : public QAbstractListModel {
 
 /* A macro to define useful functions to handle Resource* -> T* more easily on derived classes */
 #define RESOURCE_HELPERS(T)                                                                       \
-    [[nodiscard]] T* operator[](size_t index)                                                     \
+    [[nodiscard]] T* operator[](int index)                                                     \
     {                                                                                             \
         return static_cast<T*>(m_resources[index].get());                                         \
     }                                                                                             \
-    [[nodiscard]] T* at(size_t index)                                                             \
+    [[nodiscard]] T* at(int index)                                                             \
     {                                                                                             \
         return static_cast<T*>(m_resources[index].get());                                         \
     }                                                                                             \
-    [[nodiscard]] const T* at(size_t index) const                                                 \
+    [[nodiscard]] const T* at(int index) const                                                 \
     {                                                                                             \
         return static_cast<const T*>(m_resources.at(index).get());                                \
     }                                                                                             \

launcher/modplatform/ModIndex.h

@@ -104,7 +104,7 @@ struct IndexedPack {
     ExtraPackData extraData;
 
     // For internal use, not provided by APIs
-    [[nodiscard]] bool isVersionSelected(size_t index) const
+    [[nodiscard]] bool isVersionSelected(int index) const
     {
         if (!versionsLoaded)
             return false;

launcher/modplatform/ResourceAPI.h

@@ -118,28 +118,30 @@ class ResourceAPI {
    public slots:
     [[nodiscard]] virtual Task::Ptr searchProjects(SearchArgs&&, SearchCallbacks&&) const
     {
-        qWarning() << "TODO";
+        qWarning() << "TODO: ResourceAPI::searchProjects";
         return nullptr;
     }
-    [[nodiscard]] virtual Task::Ptr getProject(QString addonId, QByteArray* response) const
+    /** getProject(QString addonId, QByteArray* responce)*/
+    [[nodiscard]] virtual Task::Ptr getProject(QString, QByteArray*) const
     {
-        qWarning() << "TODO";
+        qWarning() << "TODO: ResourceAPI::getProject";
         return nullptr;
     }
-    [[nodiscard]] virtual Task::Ptr getProjects(QStringList addonIds, QByteArray* response) const
+    /** getProjects(QStringList addonIds, QByteArray* responce) */
+    [[nodiscard]] virtual Task::Ptr getProjects(QStringList, QByteArray*) const
     {
-        qWarning() << "TODO";
+        qWarning() << "TODO: ResourceAPI::getProjects";
         return nullptr;
     }
 
     [[nodiscard]] virtual Task::Ptr getProjectInfo(ProjectInfoArgs&&, ProjectInfoCallbacks&&) const
     {
-        qWarning() << "TODO";
+        qWarning() << "TODO: ResourceAPI::getProjectInfo";
         return nullptr;
     }
     [[nodiscard]] virtual Task::Ptr getProjectVersions(VersionSearchArgs&&, VersionSearchCallbacks&&) const
     {
-        qWarning() << "TODO";
+        qWarning() << "TODO: ResourceAPI::getProjectVersions";
         return nullptr;
     }
 

launcher/net/Download.h

@@ -66,7 +66,7 @@ class Download : public NetAction {
    public:
     void addValidator(Validator* v);
     auto abort() -> bool override;
-    auto canAbort() const -> bool override { return true; };
+    auto canAbort() const -> bool override { return true; }
 
    private:
     auto handleRedirect() -> bool;

launcher/net/HttpMetaCache.h

@@ -74,7 +74,7 @@ class MetaEntry {
     auto getMaximumAge() -> qint64 { return m_max_age; }
     void setMaximumAge(qint64 age) { m_max_age = age; }
 
-    bool isExpired(qint64 offset) { return !m_is_eternal && (m_current_age >= m_max_age - offset); };
+    bool isExpired(qint64 offset) { return !m_is_eternal && (m_current_age >= m_max_age - offset); }
 
    protected:
     QString m_baseId;

launcher/net/NetAction.h

@@ -45,7 +45,7 @@
 class NetAction : public Task {
     Q_OBJECT
    protected:
-    explicit NetAction() : Task(){};
+    explicit NetAction() : Task(){}
 
    public:
     using Ptr = shared_qobject_ptr<NetAction>;
@@ -71,7 +71,7 @@ class NetAction : public Task {
             i++;
         }
 
-    };
+    }
 
    public slots:
     void startAction(shared_qobject_ptr<QNetworkAccessManager> network)
@@ -81,7 +81,7 @@ class NetAction : public Task {
     }
 
    protected:
-    void executeTask() override{};
+    void executeTask() override{}
 
    public:
     shared_qobject_ptr<QNetworkAccessManager> m_network;

launcher/net/Validator.h

@@ -40,8 +40,9 @@ namespace Net {
 class Validator
 {
 public: /* con/des */
-    Validator() {};
+    Validator() {}
-    virtual ~Validator() {};
+
+    virtual ~Validator() {}
 
 public: /* methods */
     virtual bool init(QNetworkRequest & request) = 0;

launcher/pathmatcher/IPathMatcher.h

@@ -8,6 +8,6 @@ public:
     typedef std::shared_ptr<IPathMatcher> Ptr;
 
 public:
-    virtual ~IPathMatcher(){};
+    virtual ~IPathMatcher() {}
     virtual bool matches(const QString &string) const = 0;
 };

launcher/pathmatcher/RegexpMatcher.h

@@ -4,7 +4,7 @@
 class RegexpMatcher : public IPathMatcher
 {
 public:
-    virtual ~RegexpMatcher() {};
+    virtual ~RegexpMatcher() {}
     RegexpMatcher(const QString &regexp)
     {
         m_regexp.setPattern(regexp);

launcher/tasks/ConcurrentTask.h

@@ -53,7 +53,7 @@ class ConcurrentTask : public Task {
 
     bool canAbort() const override { return true; }
 
-    inline auto isMultiStep() const -> bool override { return totalSize() > 1; };
+    inline auto isMultiStep() const -> bool override { return totalSize() > 1; }
     auto getStepProgress() const -> TaskStepProgressList override;
 
     void addTask(Task::Ptr task);
@@ -80,7 +80,7 @@ class ConcurrentTask : public Task {
 
    protected:
     // NOTE: This is not thread-safe.
-    [[nodiscard]] unsigned int totalSize() const { return m_queue.size() + m_doing.size() + m_done.size(); }
+ [[nodiscard]] unsigned int totalSize() const { return static_cast<unsigned int>(m_queue.size() + m_doing.size() + m_done.size()); }
 
     enum class Operation { ADDED, REMOVED, CHANGED };
     void updateStepProgress(TaskStepProgress const& changed_progress, Operation);

launcher/tasks/Task.h

@@ -71,12 +71,12 @@ struct TaskStepProgress {
         this->uid = uid;
     }
     bool isDone() const { return (state == TaskStepState::Failed) || (state == TaskStepState::Succeeded); }
-    void update(qint64 current, qint64 total) {
+    void update(qint64 new_current, qint64 new_total) {
         this->old_current = this->current;
         this->old_total = this->total;
 
-        this->current = current;
+        this->current = new_current;
-        this->total = total;
+        this->total = new_total;
         this->state = TaskStepState::Running;
     }
 };
@@ -155,7 +155,7 @@ class Task : public QObject, public QRunnable {
     void run() override { start(); }
 
     virtual void start();
-    virtual bool abort() { if(canAbort()) emitAborted(); return canAbort(); };
+    virtual bool abort() { if(canAbort()) emitAborted(); return canAbort(); }
 
     void setAbortable(bool can_abort) { m_can_abort = can_abort; emit abortStatusChanged(can_abort); }
 

launcher/translations/TranslationsModel.cpp

@@ -274,7 +274,6 @@ void readIndex(const QString & path, QMap<QString, Language>& languages)
         return;
     }
 
-    int index = 1;
     try
     {
         auto toplevel_doc = Json::requireDocument(data);
@@ -307,7 +306,6 @@ void readIndex(const QString & path, QMap<QString, Language>& languages)
             lang.file_size = Json::requireInteger(langObj, "size");
 
             languages.insert(lang.key, lang);
-            index++;
         }
     }
     catch (Json::JsonException & e)

tests/DummyResourceAPI.h

@@ -32,7 +32,7 @@ class DummyResourceAPI : public ResourceAPI {
     }
 
     DummyResourceAPI() : ResourceAPI() {}
-    [[nodiscard]] auto getSortingMethods() const -> QList<SortingMethod> override { return {}; };
+    [[nodiscard]] auto getSortingMethods() const -> QList<SortingMethod> override { return {}; }
 
     [[nodiscard]] Task::Ptr searchProjects(SearchArgs&&, SearchCallbacks&& callbacks) const override
     {

tests/FileSystem_test.cpp

@@ -91,10 +91,9 @@ class LinkTask : public Task {
             emitSucceeded();
         }
         
-    };
+    }
 
     FS::create_link *m_lnk;
-    bool m_useHard = false;
     bool m_linkRecursive = true;
 };
 
@@ -346,7 +345,7 @@ slots:
     void test_link()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder, this]()
+        auto f = [&folder]()
         {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);
@@ -640,7 +639,7 @@ slots:
     void test_link_with_max_depth()
     {
         QString folder = QFINDTESTDATA("testdata/FileSystem/test_folder");
-        auto f = [&folder, this]()
+        auto f = [&folder]()
         {
             QTemporaryDir tempDir;
             tempDir.setAutoRemove(true);

tests/GZip_test.cpp

@@ -29,7 +29,7 @@ slots:
         // initialize random buffer
         for(int i = 0; i < size; i++)
         {
-            random.append((char)idis(eng));
+            random.append(static_cast<char>(idis(eng)));
         }
 
         // initialize fibonacci

tests/ResourceModel_test.cpp

@@ -39,17 +39,17 @@ class DummyResourceModel : public ResourceModel {
    public:
     DummyResourceModel() : ResourceModel(new DummyResourceAPI) {}
 
-    [[nodiscard]] auto metaEntryBase() const -> QString override { return ""; };
+    [[nodiscard]] auto metaEntryBase() const -> QString override { return ""; }
 
-    ResourceAPI::SearchArgs createSearchArguments() override { return {}; };
+    ResourceAPI::SearchArgs createSearchArguments() override { return {}; }
-    ResourceAPI::VersionSearchArgs createVersionsArguments(QModelIndex&) override { return {}; };
+    ResourceAPI::VersionSearchArgs createVersionsArguments(QModelIndex&) override { return {}; }
-    ResourceAPI::ProjectInfoArgs createInfoArguments(QModelIndex&) override { return {}; };
+    ResourceAPI::ProjectInfoArgs createInfoArguments(QModelIndex&) override { return {}; }
 
     QJsonArray documentToArray(QJsonDocument& doc) const override { return doc.object().value("hits").toArray(); }
 
     void loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj) override
     {
-        pack.authors.append({ Json::requireString(obj, "author") });
+        pack.authors.append({ Json::requireString(obj, "author"), "" });
         pack.description = Json::requireString(obj, "description");
         pack.addonId = Json::requireString(obj, "project_id");
     }

tests/Task_test.cpp

@@ -22,7 +22,7 @@ class BasicTask : public Task {
     void executeTask() override
     {
         emitSucceeded();
-    };
+    }
 };
 
 /* Does nothing. Only used for testing. */
@@ -34,7 +34,7 @@ class BasicTask_MultiStep : public Task {
    private:
     auto isMultiStep() const -> bool override { return true; }
 
-    void executeTask() override {};   
+    void executeTask() override {}   
 };
 
 class BigConcurrentTask : public ConcurrentTask {