From cca670013463f0062cec950d9b9bb76f9150ed93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 26 Sep 2015 04:04:09 +0200 Subject: NOISSUE fix all clang warnings --- logic/minecraft/LegacyInstance.cpp | 2 +- logic/minecraft/LegacyInstance.h | 6 +++--- logic/minecraft/LwjglVersionList.h | 18 +++++++++--------- logic/minecraft/MinecraftInstance.h | 4 ++-- logic/minecraft/MinecraftProfile.cpp | 2 +- logic/minecraft/MinecraftProfile.h | 12 ++++++------ logic/minecraft/MinecraftVersionList.cpp | 2 +- logic/minecraft/MinecraftVersionList.h | 16 ++++++++-------- logic/minecraft/OneSixInstance.h | 6 +++--- 9 files changed, 34 insertions(+), 34 deletions(-) (limited to 'logic/minecraft') diff --git a/logic/minecraft/LegacyInstance.cpp b/logic/minecraft/LegacyInstance.cpp index f39f3c8b..342a6f2d 100644 --- a/logic/minecraft/LegacyInstance.cpp +++ b/logic/minecraft/LegacyInstance.cpp @@ -186,7 +186,7 @@ std::shared_ptr LegacyInstance::createJarModdingTask() class JarModTask : public Task { public: - explicit JarModTask(std::shared_ptr inst) : m_inst(inst), Task(nullptr) + explicit JarModTask(std::shared_ptr inst) : Task(nullptr), m_inst(inst) { } virtual void executeTask() diff --git a/logic/minecraft/LegacyInstance.h b/logic/minecraft/LegacyInstance.h index 14f13b20..a2ab86de 100644 --- a/logic/minecraft/LegacyInstance.h +++ b/logic/minecraft/LegacyInstance.h @@ -29,7 +29,7 @@ public: explicit LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir); - virtual void init() {}; + virtual void init() override {}; /// Path to the instance's minecraft.jar QString runnableJar() const; @@ -105,7 +105,7 @@ public: virtual QString intendedVersionId() const override; virtual bool setIntendedVersionId(QString version) override; - virtual QSet traits() + virtual QSet traits() override { return {"legacy-instance", "texturepacks"}; }; @@ -120,7 +120,7 @@ public: virtual void cleanupAfterRun() override; - virtual QString typeName() const; + virtual QString typeName() const override; protected: mutable std::shared_ptr jar_mod_list; diff --git a/logic/minecraft/LwjglVersionList.h b/logic/minecraft/LwjglVersionList.h index 84abaab1..f043f6e2 100644 --- a/logic/minecraft/LwjglVersionList.h +++ b/logic/minecraft/LwjglVersionList.h @@ -68,7 +68,7 @@ class MULTIMC_LOGIC_EXPORT LWJGLVersionList : public BaseVersionList public: explicit LWJGLVersionList(QObject *parent = 0); - bool isLoaded() + bool isLoaded() override { return m_vlist.length() > 0; } @@ -77,27 +77,27 @@ public: return m_vlist[i]; } - virtual Task* getLoadTask() + virtual Task* getLoadTask() override { return nullptr; } - virtual void sort() {}; + virtual void sortVersions() override {}; - virtual void updateListData(QList< BaseVersionPtr > versions) {}; + virtual void updateListData(QList< BaseVersionPtr > versions) override {}; - int count() const + int count() const override { return m_vlist.length(); } - virtual QVariant data(const QModelIndex &index, int role) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const; - virtual int rowCount(const QModelIndex &parent) const + virtual QVariant data(const QModelIndex &index, int role) const override; + virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override; + virtual int rowCount(const QModelIndex &parent) const override { return count(); } - virtual int columnCount(const QModelIndex &parent) const; + virtual int columnCount(const QModelIndex &parent) const override; virtual bool isLoading() const; virtual bool errored() const diff --git a/logic/minecraft/MinecraftInstance.h b/logic/minecraft/MinecraftInstance.h index b5483d1b..5381ce4f 100644 --- a/logic/minecraft/MinecraftInstance.h +++ b/logic/minecraft/MinecraftInstance.h @@ -37,7 +37,7 @@ public: } //FIXME: nuke? - virtual std::shared_ptr< BaseVersionList > versionList() const; + virtual std::shared_ptr versionList() const override; /// get arguments passed to java QStringList javaArguments() const; @@ -49,7 +49,7 @@ public: virtual QProcessEnvironment createEnvironment() override; /// guess log level from a line of minecraft log - virtual MessageLevel::Enum guessLevel(const QString &line, MessageLevel::Enum level); + virtual MessageLevel::Enum guessLevel(const QString &line, MessageLevel::Enum level) override; virtual IPathMatcher::Ptr getLogFileMatcher() override; diff --git a/logic/minecraft/MinecraftProfile.cpp b/logic/minecraft/MinecraftProfile.cpp index 1baf008e..efeb254b 100644 --- a/logic/minecraft/MinecraftProfile.cpp +++ b/logic/minecraft/MinecraftProfile.cpp @@ -150,7 +150,7 @@ bool MinecraftProfile::customize(int index) return true; } -bool MinecraftProfile::revert(int index) +bool MinecraftProfile::revertToBase(int index) { auto patch = versionPatch(index); if (!patch->isRevertible()) diff --git a/logic/minecraft/MinecraftProfile.h b/logic/minecraft/MinecraftProfile.h index 6f56e848..7686c55b 100644 --- a/logic/minecraft/MinecraftProfile.h +++ b/logic/minecraft/MinecraftProfile.h @@ -45,11 +45,11 @@ public: void setStrategy(ProfileStrategy * strategy); ProfileStrategy *strategy(); - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual int columnCount(const QModelIndex &parent) const; - virtual Qt::ItemFlags flags(const QModelIndex &index) const; + virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override; + virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override; + virtual int columnCount(const QModelIndex &parent) const override; + virtual Qt::ItemFlags flags(const QModelIndex &index) const override; /// is this version unchanged by the user? bool isVanilla(); @@ -75,7 +75,7 @@ public: bool customize(int index); - bool revert(int index); + bool revertToBase(int index); void resetOrder(); diff --git a/logic/minecraft/MinecraftVersionList.cpp b/logic/minecraft/MinecraftVersionList.cpp index 8ba51b99..afa7c4c5 100644 --- a/logic/minecraft/MinecraftVersionList.cpp +++ b/logic/minecraft/MinecraftVersionList.cpp @@ -335,7 +335,7 @@ void MinecraftVersionList::loadMojangList(QJsonDocument jsonDoc, VersionSource s } } -void MinecraftVersionList::sort() +void MinecraftVersionList::sortVersions() { beginResetModel(); sortInternal(); diff --git a/logic/minecraft/MinecraftVersionList.h b/logic/minecraft/MinecraftVersionList.h index 110f8a66..e414a1da 100644 --- a/logic/minecraft/MinecraftVersionList.h +++ b/logic/minecraft/MinecraftVersionList.h @@ -47,13 +47,13 @@ public: std::shared_ptr createUpdateTask(QString version); - virtual Task *getLoadTask(); - virtual bool isLoaded(); - virtual const BaseVersionPtr at(int i) const; - virtual int count() const; - virtual void sort(); - virtual QVariant data(const QModelIndex & index, int role) const; - virtual RoleList providesRoles(); + virtual Task *getLoadTask() override; + virtual bool isLoaded() override; + virtual const BaseVersionPtr at(int i) const override; + virtual int count() const override; + virtual void sortVersions() override; + virtual QVariant data(const QModelIndex & index, int role) const override; + virtual RoleList providesRoles() override; virtual BaseVersionPtr getLatestStable() const override; virtual BaseVersionPtr getRecommended() const override; @@ -69,5 +69,5 @@ protected: protected slots: - virtual void updateListData(QList versions); + virtual void updateListData(QList versions) override; }; diff --git a/logic/minecraft/OneSixInstance.h b/logic/minecraft/OneSixInstance.h index 6d09b81a..824e3786 100644 --- a/logic/minecraft/OneSixInstance.h +++ b/logic/minecraft/OneSixInstance.h @@ -29,7 +29,7 @@ public: explicit OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir); virtual ~OneSixInstance(){}; - virtual void init(); + virtual void init() override; ////// Mod Lists ////// std::shared_ptr loaderModList() const; @@ -40,7 +40,7 @@ public: virtual QList getJarMods() const override; virtual void createProfile(); - virtual QSet traits(); + virtual QSet traits() override; ////// Directories and files ////// QString jarModsDir() const; @@ -90,7 +90,7 @@ public: std::shared_ptr getSharedPtr(); - virtual QString typeName() const; + virtual QString typeName() const override; signals: void versionReloaded(); -- cgit v1.2.3