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

chore: fix shadowed member and signed/unsigned mismatch

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: supress unused with [[maybe_unused]]

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: unshadow ^&^& static_cast implicit return

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: deshadow and mark unused in parse task

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: mark unused in folder models

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: deshadow and mark unused with instances

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: more deshadow and unused

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: remove uneeded simicolons

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: mark unused

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: prevent shadow

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers
2023-06-30 23:51:15 -07:00
parent 98d6904e4a
commit 8d7dcdfc5b
96 changed files with 409 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/minecraft/MinecraftInstance.cpp
View File

@ -1061,8 +1061,8 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
{
// actually launch the game
auto method = launchMethod();
if(method == "LauncherPart")
auto launch_method = launchMethod();
if(launch_method == "LauncherPart")
{
auto step = makeShared<LauncherPartLaunch>(pptr);
step->setWorkingDirectory(gameRoot());
@ -1070,7 +1070,7 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
step->setServerToJoin(serverToJoin);
process->appendStep(step);
}
else if (method == "DirectJava")
else if (launch_method == "DirectJava")
{
auto step = makeShared<DirectJavaLaunch>(pptr);
step->setWorkingDirectory(gameRoot());

10
launcher/minecraft/MojangDownloadInfo.h
View File

@ -23,7 +23,7 @@ struct MojangDownloadInfo
struct MojangLibraryDownloadInfo
{
MojangLibraryDownloadInfo(MojangDownloadInfo::Ptr artifact): artifact(artifact) {}
MojangLibraryDownloadInfo(MojangDownloadInfo::Ptr artifact_): artifact(artifact_) {}
MojangLibraryDownloadInfo() {}
// types
@ -57,20 +57,20 @@ struct MojangAssetIndexInfo : public MojangDownloadInfo
{
}
MojangAssetIndexInfo(QString id)
MojangAssetIndexInfo(QString id_)
{
this->id = id;
this->id = id_;
// HACK: ignore assets from other version files than Minecraft
// workaround for stupid assets issue caused by amazon:
// https://www.theregister.co.uk/2017/02/28/aws_is_awol_as_s3_goes_haywire/
if(id == "legacy")
if(id_ == "legacy")
{
url = "https://piston-meta.mojang.com/mc/assets/legacy/c0fd82e8ce9fbc93119e40d96d5a4e62cfa3f729/legacy.json";
}
// HACK
else
{
url = "https://s3.amazonaws.com/Minecraft.Download/indexes/" + id + ".json";
url = "https://s3.amazonaws.com/Minecraft.Download/indexes/" + id_ + ".json";
}
known = false;
}

2
launcher/minecraft/OneSixVersionFormat.cpp
View File

@ -413,7 +413,7 @@ QJsonDocument OneSixVersionFormat::versionFileToJson(const VersionFilePtr &patch
}
LibraryPtr OneSixVersionFormat::plusJarModFromJson(
ProblemContainer & problems,
[[maybe_unused]] ProblemContainer & problems,
const QJsonObject &libObj,
const QString &filename,
const QString &originalName

18
launcher/minecraft/PackProfile.cpp
View File

@ -225,11 +225,11 @@ static bool loadPackProfile(PackProfile * parent, const QString & filename, cons
auto orderArray = Json::requireArray(obj.value("components"));
for(auto item: orderArray)
{
auto obj = Json::requireObject(item, "Component must be an object.");
container.append(componentFromJsonV1(parent, componentJsonPattern, obj));
auto comp_obj = Json::requireObject(item, "Component must be an object.");
container.append(componentFromJsonV1(parent, componentJsonPattern, comp_obj));
}
}
catch (const JSONValidationError &err)
catch ([[maybe_unused]] const JSONValidationError &err)
{
qCritical() << "Couldn't parse" << componentsFile.fileName() << ": bad file format";
container.clear();
@ -414,7 +414,7 @@ void PackProfile::insertComponent(size_t index, ComponentPtr component)
qWarning() << "Attempt to add a component that is already present!";
return;
}
beginInsertRows(QModelIndex(), index, index);
beginInsertRows(QModelIndex(), static_cast<int>(index), static_cast<int>(index));
d->components.insert(index, component);
d->componentIndex[id] = component;
endInsertRows();
@ -427,7 +427,7 @@ void PackProfile::componentDataChanged()
auto objPtr = qobject_cast<Component *>(sender());
if(!objPtr)
{
qWarning() << "PackProfile got dataChenged signal from a non-Component!";
qWarning() << "PackProfile got dataChanged signal from a non-Component!";
return;
}
if(objPtr->getID() == "net.minecraft") {
@ -445,7 +445,7 @@ void PackProfile::componentDataChanged()
}
index++;
}
qWarning() << "PackProfile got dataChenged signal from a Component which does not belong to it!";
qWarning() << "PackProfile got dataChanged signal from a Component which does not belong to it!";
}
bool PackProfile::remove(const int index)
@ -532,9 +532,9 @@ ComponentPtr PackProfile::getComponent(const QString &id)
return (*iter);
}
ComponentPtr PackProfile::getComponent(int index)
ComponentPtr PackProfile::getComponent(size_t index)
{
if(index < 0 || index >= d->components.size())
if(index < 0 || index >= static_cast<size_t>(d->components.size()))
{
return nullptr;
}
@ -615,7 +615,7 @@ QVariant PackProfile::data(const QModelIndex &index, int role) const
return QVariant();
}
bool PackProfile::setData(const QModelIndex& index, const QVariant& value, int role)
bool PackProfile::setData(const QModelIndex& index, [[maybe_unused]] const QVariant& value, int role)
{
if (!index.isValid() || index.row() < 0 || index.row() >= rowCount(index.parent()))
{

2
launcher/minecraft/PackProfile.h
View File

@ -145,7 +145,7 @@ public:
ComponentPtr getComponent(const QString &id);
/// get the profile component by index
ComponentPtr getComponent(int index);
ComponentPtr getComponent(size_t index);
/// Add the component to the internal list of patches
// todo(merged): is this the best approach

2
launcher/minecraft/ProfileUtils.cpp
View File

@ -92,7 +92,7 @@ bool readOverrideOrders(QString path, PatchOrder &order)
order.append(Json::requireString(item));
}
}
catch (const JSONValidationError &err)
catch ([[maybe_unused]] const JSONValidationError &err)
{
qCritical() << "Couldn't parse" << orderFile.fileName() << ": bad file format";
qWarning() << "Ignoring overriden order";

12
launcher/minecraft/World.cpp
View File

@ -408,13 +408,13 @@ optional<QString> read_string (nbt::value& parent, const char * name)
auto & tag_str = namedValue.as<nbt::tag_string>();
return QString::fromStdString(tag_str.get());
}
catch (const std::out_of_range &e)
catch ([[maybe_unused]] const std::out_of_range &e)
{
// fallback for old world formats
qWarning() << "String NBT tag" << name << "could not be found.";
return nullopt;
}
catch (const std::bad_cast &e)
catch ([[maybe_unused]] const std::bad_cast &e)
{
// type mismatch
qWarning() << "NBT tag" << name << "could not be converted to string.";
@ -434,13 +434,13 @@ optional<int64_t> read_long (nbt::value& parent, const char * name)
auto & tag_str = namedValue.as<nbt::tag_long>();
return tag_str.get();
}
catch (const std::out_of_range &e)
catch ([[maybe_unused]] const std::out_of_range &e)
{
// fallback for old world formats
qWarning() << "Long NBT tag" << name << "could not be found.";
return nullopt;
}
catch (const std::bad_cast &e)
catch ([[maybe_unused]] const std::bad_cast &e)
{
// type mismatch
qWarning() << "NBT tag" << name << "could not be converted to long.";
@ -460,13 +460,13 @@ optional<int> read_int (nbt::value& parent, const char * name)
auto & tag_str = namedValue.as<nbt::tag_int>();
return tag_str.get();
}
catch (const std::out_of_range &e)
catch ([[maybe_unused]] const std::out_of_range &e)
{
// fallback for old world formats
qWarning() << "Int NBT tag" << name << "could not be found.";
return nullopt;
}
catch (const std::bad_cast &e)
catch ([[maybe_unused]] const std::bad_cast &e)
{
// type mismatch
qWarning() << "NBT tag" << name << "could not be converted to int.";

11
launcher/minecraft/WorldList.cpp
View File

@ -278,7 +278,7 @@ QVariant WorldList::data(const QModelIndex &index, int role) const
}
}
QVariant WorldList::headerData(int section, Qt::Orientation orientation, int role) const
QVariant WorldList::headerData(int section, [[maybe_unused]] Qt::Orientation orientation, int role) const
{
switch (role)
{
@ -320,7 +320,6 @@ QVariant WorldList::headerData(int section, Qt::Orientation orientation, int rol
default:
return QVariant();
}
return QVariant();
}
QStringList WorldList::mimeTypes() const
@ -373,7 +372,7 @@ QMimeData *WorldList::mimeData(const QModelIndexList &indexes) const
if (indexes.size() == 0)
return new QMimeData();
QList<World> worlds;
QList<World> worlds_;
for(auto idx : indexes)
{
if(idx.column() != 0)
@ -381,13 +380,13 @@ QMimeData *WorldList::mimeData(const QModelIndexList &indexes) const
int row = idx.row();
if (row < 0 || row >= this->worlds.size())
continue;
worlds.append(this->worlds[row]);
worlds_.append(this->worlds[row]);
}
if(!worlds.size())
if(!worlds_.size())
{
return new QMimeData();
}
return new WorldMimeData(worlds);
return new WorldMimeData(worlds_);
}
Qt::ItemFlags WorldList::flags(const QModelIndex &index) const

4
launcher/minecraft/auth/AccountData.cpp
View File

@ -310,7 +310,7 @@ bool AccountData::resumeStateFromV2(QJsonObject data) {
QJsonObject profileObject = profileVal.toObject();
QString id = profileObject.value("id").toString("");
QString name = profileObject.value("name").toString("");
bool legacy = profileObject.value("legacy").toBool(false);
bool legacy_ = profileObject.value("legacy").toBool(false);
if (id.isEmpty() || name.isEmpty())
{
qWarning() << "Unable to load a profile" << name << "because it was missing an ID or a name.";
@ -319,7 +319,7 @@ bool AccountData::resumeStateFromV2(QJsonObject data) {
if(id == currentProfile) {
currentProfileIndex = index;
}
profiles.append({id, name, legacy});
profiles.append({id, name, legacy_});
}
auto & profile = profiles[currentProfileIndex];

2
launcher/minecraft/auth/AccountList.cpp
View File

@ -365,7 +365,7 @@ QVariant AccountList::data(const QModelIndex &index, int role) const
}
}
QVariant AccountList::headerData(int section, Qt::Orientation orientation, int role) const
QVariant AccountList::headerData(int section, [[maybe_unused]] Qt::Orientation orientation, int role) const
{
switch (role)
{

8
launcher/minecraft/auth/Parsers.cpp
View File

@ -107,16 +107,16 @@ bool parseXTokenResponse(QByteArray & data, Katabasis::Token &output, QString na
if(!item.isObject()) {
continue;
}
auto obj = item.toObject();
if(obj.contains("uhs")) {
auto obj_ = item.toObject();
if(obj_.contains("uhs")) {
foundUHS = true;
} else {
continue;
}
// consume all 'display claims' ... whatever that means
for(auto iter = obj.begin(); iter != obj.end(); iter++) {
for(auto iter = obj_.begin(); iter != obj_.end(); iter++) {
QString claim;
if(!getString(obj.value(iter.key()), claim)) {
if(!getString(obj_.value(iter.key()), claim)) {
qWarning() << "display claim " << iter.key() << " is not a string...";
return false;
}

4
launcher/minecraft/auth/steps/EntitlementsStep.cpp
View File

@ -35,9 +35,9 @@ void EntitlementsStep::rehydrate() {
}
void EntitlementsStep::onRequestDone(
QNetworkReply::NetworkError error,
[[maybe_unused]] QNetworkReply::NetworkError error,
QByteArray data,
QList<QNetworkReply::RawHeaderPair> headers
[[maybe_unused]] QList<QNetworkReply::RawHeaderPair> headers
) {
auto requestor = qobject_cast<AuthRequest *>(QObject::sender());
requestor->deleteLater();

3
launcher/minecraft/gameoptions/GameOptions.cpp
View File

@ -112,12 +112,11 @@ QVariant GameOptions::data(const QModelIndex& index, int role) const
default:
return QVariant();
}
return QVariant();
}
int GameOptions::rowCount(const QModelIndex&) const
{
return contents.size();
return static_cast<int>(contents.size());
}
int GameOptions::columnCount(const QModelIndex&) const

2
launcher/minecraft/launch/LauncherPartLaunch.cpp
View File

@ -54,7 +54,7 @@ LauncherPartLaunch::LauncherPartLaunch(LaunchTask *parent) : LaunchStep(parent)
if (instance->settings()->get("CloseAfterLaunch").toBool())
{
std::shared_ptr<QMetaObject::Connection> connection{new QMetaObject::Connection};
*connection = connect(&m_process, &LoggedProcess::log, this, [=](QStringList lines, MessageLevel::Enum level) {
*connection = connect(&m_process, &LoggedProcess::log, this, [=](QStringList lines, [[maybe_unused]] MessageLevel::Enum level) {
qDebug() << lines;
if (lines.filter(QRegularExpression(".*Setting user.+", QRegularExpression::CaseInsensitiveOption)).length() != 0)
{

2
launcher/minecraft/mod/Mod.h
View File

@ -72,7 +72,7 @@ public:
auto issueTracker() const -> QString;
/** Get the intneral path to the mod's icon file*/
QString iconPath() const { return m_local_details.icon_file; };
QString iconPath() const { return m_local_details.icon_file; }
/** Gets the icon of the mod, converted to a QPixmap for drawing, and scaled to size. */
[[nodiscard]] QPixmap icon(QSize size, Qt::AspectRatioMode mode = Qt::AspectRatioMode::IgnoreAspectRatio) const;
/** Thread-safe. */

19
launcher/minecraft/mod/ModDetails.h
View File

@ -59,17 +59,17 @@ struct ModLicense {
ModLicense() {}
ModLicense(const QString license) {
// FIXME: come up with a better license parseing.
// FIXME: come up with a better license parsing.
// handle SPDX identifiers? https://spdx.org/licenses/
auto parts = license.split(' ');
QStringList notNameParts = {};
for (auto part : parts) {
auto url = QUrl(part);
auto _url = QUrl(part);
if (part.startsWith("(") && part.endsWith(")"))
url = QUrl(part.mid(1, part.size() - 2));
_url = QUrl(part.mid(1, part.size() - 2));
if (url.isValid() && !url.scheme().isEmpty() && !url.host().isEmpty()) {
this->url = url.toString();
if (_url.isValid() && !_url.scheme().isEmpty() && !_url.host().isEmpty()) {
this->url = _url.toString();
notNameParts.append(part);
continue;
}
@ -89,12 +89,9 @@ struct ModLicense {
}
ModLicense(const QString name, const QString id, const QString url, const QString description) {
this->name = name;
this->id = id;
this->url = url;
this->description = description;
}
ModLicense(const QString& name_, const QString& id_, const QString& url_, const QString& description_)
: name(name_), id(id_), url(url_), description(description_)
{}
ModLicense(const ModLicense& other)
: name(other.name)

2
launcher/minecraft/mod/ModFolderModel.cpp
View File

@ -139,7 +139,7 @@ QVariant ModFolderModel::data(const QModelIndex &index, int role) const
}
}
QVariant ModFolderModel::headerData(int section, Qt::Orientation orientation, int role) const
QVariant ModFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientation orientation, int role) const
{
switch (role)
{

6
launcher/minecraft/mod/ResourceFolderModel.cpp
View File

@ -457,7 +457,7 @@ QVariant ResourceFolderModel::data(const QModelIndex& index, int role) const
}
}
bool ResourceFolderModel::setData(const QModelIndex& index, const QVariant& value, int role)
bool ResourceFolderModel::setData(const QModelIndex& index, [[maybe_unused]] const QVariant& value, int role)
{
int row = index.row();
if (row < 0 || row >= rowCount(index.parent()) || !index.isValid())
@ -469,7 +469,7 @@ bool ResourceFolderModel::setData(const QModelIndex& index, const QVariant& valu
return false;
}
QVariant ResourceFolderModel::headerData(int section, Qt::Orientation orientation, int role) const
QVariant ResourceFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientation orientation, int role) const
{
switch (role) {
case Qt::DisplayRole:
@ -594,7 +594,7 @@ void ResourceFolderModel::enableInteraction(bool enabled)
}
/* Standard Proxy Model for createFilterProxyModel */
[[nodiscard]] bool ResourceFolderModel::ProxyModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
[[nodiscard]] bool ResourceFolderModel::ProxyModel::filterAcceptsRow(int source_row, [[maybe_unused]] const QModelIndex& source_parent) const
{
auto* model = qobject_cast<ResourceFolderModel*>(sourceModel());
if (!model)

4
launcher/minecraft/mod/ResourceFolderModel.h
View File

@ -97,9 +97,9 @@ class ResourceFolderModel : public QAbstractListModel {
/* Basic columns */
enum Columns { ACTIVE_COLUMN = 0, NAME_COLUMN, DATE_COLUMN, NUM_COLUMNS };
QStringList columnNames(bool translated = true) const { return translated ? m_column_names_translated : m_column_names; };
QStringList columnNames(bool translated = true) const { return translated ? m_column_names_translated : m_column_names; }
[[nodiscard]] int rowCount(const QModelIndex& parent = {}) const override { return parent.isValid() ? 0 : static_cast<int>(size()); }
[[nodiscard]] int rowCount(const QModelIndex& parent = {}) const override { return parent.isValid() ? 0 : size(); }
[[nodiscard]] int columnCount(const QModelIndex& parent = {}) const override { return parent.isValid() ? 0 : NUM_COLUMNS; }
[[nodiscard]] Qt::DropActions supportedDropActions() const override;

3
launcher/minecraft/mod/ResourcePackFolderModel.cpp
View File

@ -128,7 +128,7 @@ QVariant ResourcePackFolderModel::data(const QModelIndex& index, int role) const
}
}
QVariant ResourcePackFolderModel::headerData(int section, Qt::Orientation orientation, int role) const
QVariant ResourcePackFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientation orientation, int role) const
{
switch (role) {
case Qt::DisplayRole:
@ -165,7 +165,6 @@ QVariant ResourcePackFolderModel::headerData(int section, Qt::Orientation orient
default:
return {};
}
return {};
}
int ResourcePackFolderModel::columnCount(const QModelIndex& parent) const

2
launcher/minecraft/mod/TexturePackFolderModel.cpp
View File

@ -114,7 +114,7 @@ QVariant TexturePackFolderModel::data(const QModelIndex& index, int role) const
}
}
QVariant TexturePackFolderModel::headerData(int section, Qt::Orientation orientation, int role) const
QVariant TexturePackFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientation orientation, int role) const
{
switch (role) {
case Qt::DisplayRole:

20
launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
View File

@ -61,7 +61,7 @@ GetModDependenciesTask::GetModDependenciesTask(QObject* parent,
if (auto meta = mod->metadata(); meta)
m_mods.append(meta);
prepare();
};
}
void GetModDependenciesTask::prepare()
{
@ -130,7 +130,7 @@ QList<ModPlatform::Dependency> GetModDependenciesTask::getDependenciesForVersion
c_dependencies.append(getOverride(ver_dep, providerName));
}
return c_dependencies;
};
}
Task::Ptr GetModDependenciesTask::getProjectInfoTask(std::shared_ptr<PackDependency> pDep)
{
@ -181,7 +181,7 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen
ResourceAPI::DependencySearchArgs args = { dep, m_version, m_loaderType };
ResourceAPI::DependencySearchCallbacks callbacks;
callbacks.on_succeed = [dep, provider, pDep, level, this](auto& doc, auto& pack) {
callbacks.on_succeed = [dep, provider, pDep, level, this](auto& doc, [[maybe_unused]] auto& pack) {
try {
QJsonArray arr;
if (dep.version.length() != 0 && doc.isObject()) {
@ -215,27 +215,27 @@ Task::Ptr GetModDependenciesTask::prepareDependencyTask(const ModPlatform::Depen
return;
}
if (level == 0) {
qWarning() << "Dependency cycle exeeded";
qWarning() << "Dependency cycle exceeded";
return;
}
if (dep.addonId.toString().isEmpty() && !pDep->version.addonId.toString().isEmpty()) {
pDep->pack->addonId = pDep->version.addonId;
auto dep = getOverride({ pDep->version.addonId, pDep->dependency.type }, provider.name);
if (dep.addonId != pDep->version.addonId) {
auto dep_ = getOverride({ pDep->version.addonId, pDep->dependency.type }, provider.name);
if (dep_.addonId != pDep->version.addonId) {
removePack(pDep->version.addonId);
addTask(prepareDependencyTask(dep, provider.name, level));
addTask(prepareDependencyTask(dep_, provider.name, level));
} else
addTask(getProjectInfoTask(pDep));
}
for (auto dep : getDependenciesForVersion(pDep->version, provider.name)) {
addTask(prepareDependencyTask(dep, provider.name, level - 1));
for (auto dep_ : getDependenciesForVersion(pDep->version, provider.name)) {
addTask(prepareDependencyTask(dep_, provider.name, level - 1));
}
};
auto version = provider.api->getDependencyVersion(std::move(args), std::move(callbacks));
tasks->addTask(version);
return tasks;
};
}
void GetModDependenciesTask::removePack(const QVariant addonId)
{

26
launcher/minecraft/mod/tasks/LocalModParseTask.cpp
View File

@ -152,8 +152,8 @@ ModDetails ReadMCModTOML(QByteArray contents)
QString authors = "";
if (auto authorsDatum = tomlData["authors"].as_string()) {
authors = QString::fromStdString(authorsDatum->get());
} else if (auto authorsDatum = (*modsTable)["authors"].as_string()) {
authors = QString::fromStdString(authorsDatum->get());
} else if (auto authorsDatumMods = (*modsTable)["authors"].as_string()) {
authors = QString::fromStdString(authorsDatumMods->get());
}
if (!authors.isEmpty()) {
details.authors.append(authors);
@ -162,8 +162,8 @@ ModDetails ReadMCModTOML(QByteArray contents)
QString homeurl = "";
if (auto homeurlDatum = tomlData["displayURL"].as_string()) {
homeurl = QString::fromStdString(homeurlDatum->get());
} else if (auto homeurlDatum = (*modsTable)["displayURL"].as_string()) {
homeurl = QString::fromStdString(homeurlDatum->get());
} else if (auto homeurlDatumMods = (*modsTable)["displayURL"].as_string()) {
homeurl = QString::fromStdString(homeurlDatumMods->get());
}
// fix up url.
if (!homeurl.isEmpty() && !homeurl.startsWith("http://") && !homeurl.startsWith("https://") && !homeurl.startsWith("ftp://")) {
@ -174,16 +174,16 @@ ModDetails ReadMCModTOML(QByteArray contents)
QString issueTrackerURL = "";
if (auto issueTrackerURLDatum = tomlData["issueTrackerURL"].as_string()) {
issueTrackerURL = QString::fromStdString(issueTrackerURLDatum->get());
} else if (auto issueTrackerURLDatum = (*modsTable)["issueTrackerURL"].as_string()) {
issueTrackerURL = QString::fromStdString(issueTrackerURLDatum->get());
} else if (auto issueTrackerURLDatumMods = (*modsTable)["issueTrackerURL"].as_string()) {
issueTrackerURL = QString::fromStdString(issueTrackerURLDatumMods->get());
}
details.issue_tracker = issueTrackerURL;
QString license = "";
if (auto licenseDatum = tomlData["license"].as_string()) {
license = QString::fromStdString(licenseDatum->get());
} else if (auto licenseDatum =(*modsTable)["license"].as_string()) {
license = QString::fromStdString(licenseDatum->get());
} else if (auto licenseDatumMods =(*modsTable)["license"].as_string()) {
license = QString::fromStdString(licenseDatumMods->get());
}
if (!license.isEmpty())
details.licenses.append(ModLicense(license));
@ -191,8 +191,8 @@ ModDetails ReadMCModTOML(QByteArray contents)
QString logoFile = "";
if (auto logoFileDatum = tomlData["logoFile"].as_string()) {
logoFile = QString::fromStdString(logoFileDatum->get());
} else if (auto logoFileDatum =(*modsTable)["logoFile"].as_string()) {
logoFile = QString::fromStdString(logoFileDatum->get());
} else if (auto logoFileDatumMods =(*modsTable)["logoFile"].as_string()) {
logoFile = QString::fromStdString(logoFileDatumMods->get());
}
details.icon_file = logoFile;
@ -460,7 +460,7 @@ bool process(Mod& mod, ProcessingLevel level)
}
}
bool processZIP(Mod& mod, ProcessingLevel level)
bool processZIP(Mod& mod, [[maybe_unused]] ProcessingLevel level)
{
ModDetails details;
@ -593,7 +593,7 @@ bool processZIP(Mod& mod, ProcessingLevel level)
return false; // no valid mod found in archive
}
bool processFolder(Mod& mod, ProcessingLevel level)
bool processFolder(Mod& mod, [[maybe_unused]] ProcessingLevel level)
{
ModDetails details;
@ -614,7 +614,7 @@ bool processFolder(Mod& mod, ProcessingLevel level)
return false; // no valid mcmod.info file found
}
bool processLitemod(Mod& mod, ProcessingLevel level)
bool processLitemod(Mod& mod, [[maybe_unused]] ProcessingLevel level)
{
ModDetails details;

2
launcher/minecraft/services/CapeChange.cpp
View File

@ -45,7 +45,7 @@ CapeChange::CapeChange(QObject *parent, QString token, QString cape)
{
}
void CapeChange::setCape(QString& cape) {
void CapeChange::setCape([[maybe_unused]] QString& cape) {
QNetworkRequest request(QUrl("https://api.minecraftservices.com/minecraft/profile/capes/active"));
auto requestString = QString("{\"capeId\":\"%1\"}").arg(m_capeId);
request.setRawHeader("Authorization", QString("Bearer %1").arg(m_token).toLocal8Bit());