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

NOISSUE fix all sorts of warnings, enable Werror and pedantic

Browse Source
This commit is contained in:
Petr Mrázek
2018-06-28 23:18:45 +02:00
parent b5f636b3d5
commit 7fe94ca7b4
21 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/logic/minecraft/Component.cpp
View File

@ -145,7 +145,7 @@ QDateTime Component::getReleaseDateTime()
bool Component::isEnabled()
{
return !canBeDisabled() || !m_disabled;
};
}
bool Component::canBeDisabled()
{
@ -171,7 +171,7 @@ bool Component::setEnabled(bool state)
bool Component::isCustom()
{
return m_file != nullptr;
};
}
bool Component::isCustomizable()
{

8
api/logic/minecraft/Library.cpp
View File

@ -59,7 +59,7 @@ QList< std::shared_ptr< NetAction > > Library::getDownloads(OpSys system, class
bool local = isLocal();
bool isForge = (hint() == "forge-pack-xz");
auto add_download = [&](QString storage, QString url, QString sha1 = QString())
auto add_download = [&](QString storage, QString url, QString sha1)
{
auto entry = cache->resolveEntry("libraries", storage);
if(isAlwaysStale)
@ -208,14 +208,14 @@ QList< std::shared_ptr< NetAction > > Library::getDownloads(OpSys system, class
{
QString cooked_storage = raw_storage;
QString cooked_dl = raw_dl;
add_download(cooked_storage.replace("${arch}", "32"), cooked_dl.replace("${arch}", "32"));
add_download(cooked_storage.replace("${arch}", "32"), cooked_dl.replace("${arch}", "32"), QString());
cooked_storage = raw_storage;
cooked_dl = raw_dl;
add_download(cooked_storage.replace("${arch}", "64"), cooked_dl.replace("${arch}", "64"));
add_download(cooked_storage.replace("${arch}", "64"), cooked_dl.replace("${arch}", "64"), QString());
}
else
{
add_download(raw_storage, raw_dl);
add_download(raw_storage, raw_dl, QString());
}
}
return out;

2
api/logic/minecraft/MinecraftInstance.h
View File

@ -18,7 +18,7 @@ public:
MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
virtual ~MinecraftInstance() {};
virtual void init() override;
virtual void saveNow();
virtual void saveNow() override;
// FIXME: remove
QString typeName() const override;

4
api/logic/minecraft/World.cpp
View File

@ -275,7 +275,7 @@ static QString read_string (nbt::value& parent, const char * name, const QString
qWarning() << "NBT tag" << name << "could not be converted to string. Defaulting to" << fallback;
return fallback;
}
};
}
static int64_t read_long (nbt::value& parent, const char * name, const int64_t & fallback = 0)
{
@ -301,7 +301,7 @@ static int64_t read_long (nbt::value& parent, const char * name, const int64_t &
qWarning() << "NBT tag" << name << "could not be converted to long. Defaulting to" << fallback;
return fallback;
}
};
}
void World::loadFromLevelDat(QByteArray data)
{

4
api/logic/minecraft/launch/ModMinecraftJar.h
View File

@ -25,8 +25,8 @@ public:
explicit ModMinecraftJar(LaunchTask *parent) : LaunchStep(parent) {};
virtual ~ModMinecraftJar(){};
virtual void executeTask();
virtual bool canAbort() const
virtual void executeTask() override;
virtual bool canAbort() const override
{
return false;
}