diff options
author | Charles Milette <me@charlesmilette.net> | 2018-05-19 19:18:26 -0400 |
---|---|---|
committer | Charles Milette <me@charlesmilette.net> | 2018-05-19 19:18:26 -0400 |
commit | 72c0002b45215466e06cd901fe95d9493d659ab2 (patch) | |
tree | 03a56f2da0f1ed34a219941060ec2100aedf1ac6 /api/logic | |
parent | b9fd381eee2f7c87e7645046b26dd552dc3cae5c (diff) | |
download | MultiMC-72c0002b45215466e06cd901fe95d9493d659ab2.tar MultiMC-72c0002b45215466e06cd901fe95d9493d659ab2.tar.gz MultiMC-72c0002b45215466e06cd901fe95d9493d659ab2.tar.lz MultiMC-72c0002b45215466e06cd901fe95d9493d659ab2.tar.xz MultiMC-72c0002b45215466e06cd901fe95d9493d659ab2.zip |
Catch C++ exceptions by const reference
Fixes #2277
Diffstat (limited to 'api/logic')
-rw-r--r-- | api/logic/FolderInstanceProvider.cpp | 4 | ||||
-rw-r--r-- | api/logic/InstanceImportTask.cpp | 2 | ||||
-rw-r--r-- | api/logic/Json.h | 2 | ||||
-rw-r--r-- | api/logic/meta/BaseEntity.cpp | 4 | ||||
-rw-r--r-- | api/logic/minecraft/Component.cpp | 2 | ||||
-rw-r--r-- | api/logic/minecraft/ComponentList.cpp | 4 | ||||
-rw-r--r-- | api/logic/minecraft/ProfileUtils.cpp | 4 | ||||
-rw-r--r-- | api/logic/minecraft/World.cpp | 10 | ||||
-rw-r--r-- | api/logic/minecraft/forge/ForgeXzDownload.cpp | 2 | ||||
-rw-r--r-- | api/logic/modplatform/flame/FileResolvingTask.cpp | 2 | ||||
-rw-r--r-- | api/logic/net/HttpMetaCache.cpp | 2 | ||||
-rw-r--r-- | api/logic/settings/INIFile.cpp | 2 | ||||
-rw-r--r-- | api/logic/translations/TranslationsModel.cpp | 2 |
13 files changed, 21 insertions, 21 deletions
diff --git a/api/logic/FolderInstanceProvider.cpp b/api/logic/FolderInstanceProvider.cpp index 69ba6c82..04d5a66b 100644 --- a/api/logic/FolderInstanceProvider.cpp +++ b/api/logic/FolderInstanceProvider.cpp @@ -160,7 +160,7 @@ void FolderInstanceProvider::saveGroupList() { FS::write(groupFileName, doc.toJson()); } - catch(FS::FileSystemException & e) + catch (const FS::FileSystemException &e) { qCritical() << "Failed to write instance group file :" << e.cause(); } @@ -181,7 +181,7 @@ void FolderInstanceProvider::loadGroupList() { jsonData = FS::read(groupFileName); } - catch (FS::FileSystemException & e) + catch (const FS::FileSystemException &e) { qCritical() << "Failed to read instance group file :" << e.cause(); return; diff --git a/api/logic/InstanceImportTask.cpp b/api/logic/InstanceImportTask.cpp index b5375cbc..45037908 100644 --- a/api/logic/InstanceImportTask.cpp +++ b/api/logic/InstanceImportTask.cpp @@ -188,7 +188,7 @@ void InstanceImportTask::processFlame() Flame::loadManifest(pack, configPath); QFile::remove(configPath); } - catch (JSONValidationError & e) + catch (const JSONValidationError &e) { emitFailed(tr("Could not understand pack manifest:\n") + e.cause()); return; diff --git a/api/logic/Json.h b/api/logic/Json.h index e59b25de..321007cd 100644 --- a/api/logic/Json.h +++ b/api/logic/Json.h @@ -123,7 +123,7 @@ T ensureIsType(const QJsonValue &value, const T default_ = T(), const QString &w { return requireIsType<T>(value, what); } - catch (JsonException &) + catch (JsonException) { return default_; } diff --git a/api/logic/meta/BaseEntity.cpp b/api/logic/meta/BaseEntity.cpp index 5c2339cb..342f676c 100644 --- a/api/logic/meta/BaseEntity.cpp +++ b/api/logic/meta/BaseEntity.cpp @@ -56,7 +56,7 @@ public: /* methods */ m_entity->parse(Json::requireObject(Json::requireDocument(data, fname), fname)); return true; } - catch (Exception &e) + catch (const Exception &e) { qWarning() << "Unable to parse response:" << e.cause(); return false; @@ -90,7 +90,7 @@ bool Meta::BaseEntity::loadLocalFile() parse(Json::requireObject(Json::requireDocument(fname, fname), fname)); return true; } - catch (Exception &e) + catch (const Exception &e) { qDebug() << QString("Unable to parse file %1: %2").arg(fname, e.cause()); // just make sure it's gone and we never consider it again. diff --git a/api/logic/minecraft/Component.cpp b/api/logic/minecraft/Component.cpp index 50a2ae16..c6e41e65 100644 --- a/api/logic/minecraft/Component.cpp +++ b/api/logic/minecraft/Component.cpp @@ -323,7 +323,7 @@ bool Component::customize() m_metaVersion.reset(); emit dataChanged(); } - catch (Exception &error) + catch (const Exception &error) { qWarning() << "Version could not be loaded:" << error.cause(); } diff --git a/api/logic/minecraft/ComponentList.cpp b/api/logic/minecraft/ComponentList.cpp index a207e987..e373d499 100644 --- a/api/logic/minecraft/ComponentList.cpp +++ b/api/logic/minecraft/ComponentList.cpp @@ -195,7 +195,7 @@ static bool loadComponentList(ComponentList * parent, const QString & filename, container.append(componentFromJsonV1(parent, componentJsonPattern, obj)); } } - catch (JSONValidationError &err) + catch (const JSONValidationError &err) { qCritical() << "Couldn't parse" << componentsFile.fileName() << ": bad file format"; container.clear(); @@ -1150,7 +1150,7 @@ std::shared_ptr<LaunchProfile> ComponentList::getProfile() const } d->m_profile = profile; } - catch (Exception & error) + catch (const Exception &error) { qWarning() << "Couldn't apply profile patches because: " << error.cause(); } diff --git a/api/logic/minecraft/ProfileUtils.cpp b/api/logic/minecraft/ProfileUtils.cpp index a6d2028d..2227e438 100644 --- a/api/logic/minecraft/ProfileUtils.cpp +++ b/api/logic/minecraft/ProfileUtils.cpp @@ -57,7 +57,7 @@ bool readOverrideOrders(QString path, PatchOrder &order) order.append(Json::requireString(item)); } } - catch (JSONValidationError &err) + catch (const JSONValidationError &err) { qCritical() << "Couldn't parse" << orderFile.fileName() << ": bad file format"; qWarning() << "Ignoring overriden order"; @@ -82,7 +82,7 @@ static VersionFilePtr guardedParseJson(const QJsonDocument & doc,const QString & { return OneSixVersionFormat::versionFileFromJson(doc, filepath, requireOrder); } - catch (Exception & e) + catch (const Exception &e) { return createErrorVersionFile(fileId, filepath, e.cause()); } diff --git a/api/logic/minecraft/World.cpp b/api/logic/minecraft/World.cpp index 68c0a5cc..227a9b75 100644 --- a/api/logic/minecraft/World.cpp +++ b/api/logic/minecraft/World.cpp @@ -263,13 +263,13 @@ static QString read_string (nbt::value& parent, const char * name, const QString auto & tag_str = namedValue.as<nbt::tag_string>(); return QString::fromStdString(tag_str.get()); } - catch(std::out_of_range e) + catch (const std::out_of_range &e) { // fallback for old world formats qWarning() << "String NBT tag" << name << "could not be found. Defaulting to" << fallback; return fallback; } - catch(std::bad_cast e) + catch (const std::bad_cast &e) { // type mismatch qWarning() << "NBT tag" << name << "could not be converted to string. Defaulting to" << fallback; @@ -289,13 +289,13 @@ static int64_t read_long (nbt::value& parent, const char * name, const int64_t & auto & tag_str = namedValue.as<nbt::tag_long>(); return tag_str.get(); } - catch(std::out_of_range e) + catch (const std::out_of_range &e) { // fallback for old world formats qWarning() << "Long NBT tag" << name << "could not be found. Defaulting to" << fallback; return fallback; } - catch(std::bad_cast e) + catch (const std::bad_cast &e) { // type mismatch qWarning() << "NBT tag" << name << "could not be converted to long. Defaulting to" << fallback; @@ -338,7 +338,7 @@ void World::loadFromLevelDat(QByteArray data) qDebug() << "Last Played:" << m_lastPlayed.toString(); qDebug() << "Seed:" << m_randomSeed; } - catch (nbt::io::input_error e) + catch (const nbt::io::input_error &e) { qWarning() << "Unable to load" << m_folderName << ":" << e.what(); is_valid = false; diff --git a/api/logic/minecraft/forge/ForgeXzDownload.cpp b/api/logic/minecraft/forge/ForgeXzDownload.cpp index a05d0f8d..4d82a58a 100644 --- a/api/logic/minecraft/forge/ForgeXzDownload.cpp +++ b/api/logic/minecraft/forge/ForgeXzDownload.cpp @@ -345,7 +345,7 @@ void ForgeXzDownload::decompressAndInstall() // NOTE: this takes ownership of both FILE pointers. That's why we duplicate them above. unpack_200(file_in, file_out); } - catch (std::runtime_error &err) + catch (const std::runtime_error &err) { m_status = Job_Failed; qCritical() << "Error unpacking " << pack200_file.fileName() << " : " << err.what(); diff --git a/api/logic/modplatform/flame/FileResolvingTask.cpp b/api/logic/modplatform/flame/FileResolvingTask.cpp index efc73621..5eb82458 100644 --- a/api/logic/modplatform/flame/FileResolvingTask.cpp +++ b/api/logic/modplatform/flame/FileResolvingTask.cpp @@ -95,7 +95,7 @@ void Flame::FileResolvingTask::netJobFinished() } out.resolved = true; } - catch(JSONValidationError & e) + catch (const JSONValidationError &e) { auto & out = m_toProcess.files[index]; qCritical() << "Resolving of" << out.projectId << out.fileId << "failed because of a parsing error:"; diff --git a/api/logic/net/HttpMetaCache.cpp b/api/logic/net/HttpMetaCache.cpp index ebcb0a27..95906d2c 100644 --- a/api/logic/net/HttpMetaCache.cpp +++ b/api/logic/net/HttpMetaCache.cpp @@ -266,7 +266,7 @@ void HttpMetaCache::SaveNow() { FS::write(m_index_file, doc.toJson()); } - catch (Exception & e) + catch (const Exception &e) { qWarning() << e.what(); } diff --git a/api/logic/settings/INIFile.cpp b/api/logic/settings/INIFile.cpp index 9e97f861..67c6cf29 100644 --- a/api/logic/settings/INIFile.cpp +++ b/api/logic/settings/INIFile.cpp @@ -90,7 +90,7 @@ bool INIFile::saveFile(QString fileName) { FS::write(fileName, outArray); } - catch (Exception & e) + catch (const Exception &e) { qCritical() << e.what(); return false; diff --git a/api/logic/translations/TranslationsModel.cpp b/api/logic/translations/TranslationsModel.cpp index 868aa98f..18625ee5 100644 --- a/api/logic/translations/TranslationsModel.cpp +++ b/api/logic/translations/TranslationsModel.cpp @@ -225,7 +225,7 @@ void TranslationsModel::loadLocalIndex() { data = FS::read(d->m_dir.absoluteFilePath("index")); } - catch (Exception &e) + catch (const Exception &e) { qCritical() << "Translations Download Failed: index file not readable"; return; |