CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE fix all clang warnings

Browse Source
This commit is contained in:
Petr Mrázek
2015-09-26 04:04:09 +02:00
parent 0af04dc060
commit cca6700134
52 changed files with 132 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logic/minecraft/LegacyInstance.cpp
View File

@ -186,7 +186,7 @@ std::shared_ptr<Task> LegacyInstance::createJarModdingTask()
class JarModTask : public Task
{
public:
explicit JarModTask(std::shared_ptr<LegacyInstance> inst) : m_inst(inst), Task(nullptr)
explicit JarModTask(std::shared_ptr<LegacyInstance> inst) : Task(nullptr), m_inst(inst)
{
}
virtual void executeTask()

6
logic/minecraft/LegacyInstance.h
View File

@ -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<QString> traits()
virtual QSet<QString> 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<ModList> jar_mod_list;

18
logic/minecraft/LwjglVersionList.h
View File

@ -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

4
logic/minecraft/MinecraftInstance.h
View File

@ -37,7 +37,7 @@ public:
}
//FIXME: nuke?
virtual std::shared_ptr< BaseVersionList > versionList() const;
virtual std::shared_ptr<BaseVersionList> 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;

2
logic/minecraft/MinecraftProfile.cpp
View File

@ -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())

12
logic/minecraft/MinecraftProfile.h
View File

@ -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();

2
logic/minecraft/MinecraftVersionList.cpp
View File

@ -335,7 +335,7 @@ void MinecraftVersionList::loadMojangList(QJsonDocument jsonDoc, VersionSource s
}
}
void MinecraftVersionList::sort()
void MinecraftVersionList::sortVersions()
{
beginResetModel();
sortInternal();

16
logic/minecraft/MinecraftVersionList.h
View File

@ -47,13 +47,13 @@ public:
std::shared_ptr<Task> 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<BaseVersionPtr> versions);
virtual void updateListData(QList<BaseVersionPtr> versions) override;
};

6
logic/minecraft/OneSixInstance.h
View File

@ -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<ModList> loaderModList() const;
@ -40,7 +40,7 @@ public:
virtual QList<Mod> getJarMods() const override;
virtual void createProfile();
virtual QSet<QString> traits();
virtual QSet<QString> traits() override;
////// Directories and files //////
QString jarModsDir() const;
@ -90,7 +90,7 @@ public:
std::shared_ptr<OneSixInstance> getSharedPtr();
virtual QString typeName() const;
virtual QString typeName() const override;
signals:
void versionReloaded();