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

NOISSUE fix a bunch of compiler warnings

Browse Source
This commit is contained in:
Petr Mrázek
2017-05-21 20:20:37 +02:00
parent 572a6026b5
commit 8bd8be95f0
10 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/logic/minecraft/ModList.cpp
View File

@ -341,7 +341,6 @@ bool ModList::dropMimeData(const QMimeData* data, Qt::DropAction action, int, in
if (data->hasUrls())
{
bool was_watching = is_watching;
bool added = false;
if (was_watching)
{
stopWatching();
@ -355,10 +354,8 @@ bool ModList::dropMimeData(const QMimeData* data, Qt::DropAction action, int, in
continue;
}
// TODO: implement not only copy, but also move
if (installMod(url.toLocalFile()))
{
added = true;
}
// FIXME: handle errors here
installMod(url.toLocalFile());
}
if (was_watching)
{

2
api/logic/minecraft/ParseUtils_test.cpp
View File

@ -22,7 +22,7 @@ slots:
"2016-02-10T15:06:41+00:00",
"2016-02-04T15:28:02-05:33"
};
for(int i = 0; i < (sizeof(timestamps) / sizeof(const char *)); i++)
for(unsigned i = 0; i < (sizeof(timestamps) / sizeof(const char *)); i++)
{
QTest::newRow(timestamps[i]) << QString(timestamps[i]);
}

6
api/logic/minecraft/forge/ForgeXzDownload.cpp
View File

@ -210,7 +210,8 @@ void ForgeXzDownload::decompressAndInstall()
if (b.out_pos == sizeof(out))
{
if (pack200_file.write((char *)out, b.out_pos) != b.out_pos)
auto wresult = pack200_file.write((char *)out, b.out_pos);
if (wresult < 0 || size_t(wresult) != b.out_pos)
{
// msg = "Write error\n";
xz_dec_end(s);
@ -230,7 +231,8 @@ void ForgeXzDownload::decompressAndInstall()
continue;
}
if (pack200_file.write((char *)out, b.out_pos) != b.out_pos)
auto wresult = pack200_file.write((char *)out, b.out_pos);
if (wresult < 0 || size_t(wresult) != b.out_pos)
{
// write error
pack200_file.close();

2
api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
View File

@ -158,7 +158,6 @@ void OneSixProfileStrategy::loadUserPatches()
// now add all the patches by user sort order
ProfileUtils::PatchOrder userOrder;
ProfileUtils::readOverrideOrders(FS::PathCombine(m_instance->instanceRoot(), "order.json"), userOrder);
bool orderIsDirty = false;
for (auto uid : userOrder)
{
// ignore builtins
@ -169,7 +168,6 @@ void OneSixProfileStrategy::loadUserPatches()
// ordering has a patch that is gone?
if(!loadedPatches.contains(uid))
{
orderIsDirty = true;
continue;
}
profile->appendPatch(loadedPatches.take(uid));