ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2660 from benthetechguy/typo

Browse Source 
Fix a few typos
This commit is contained in:
Alexandru Ionut Tripon 2024-07-19 08:50:11 +03:00 committed by GitHub
commit fcdedc795c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/Application.cpp
View File

@ -817,7 +817,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
m_icons.reset(new IconList(instFolders, setting->get().toString())); m_icons.reset(new IconList(instFolders, setting->get().toString()));
connect(setting.get(), &Setting::SettingChanged, connect(setting.get(), &Setting::SettingChanged,
[&](const Setting&, QVariant value) { m_icons->directoryChanged(value.toString()); }); [&](const Setting&, QVariant value) { m_icons->directoryChanged(value.toString()); });
qDebug() << "<> Instance icons intialized."; qDebug() << "<> Instance icons initialized.";
} }
// Themes // Themes

4
launcher/minecraft/PackProfile.cpp
View File

@ -181,7 +181,7 @@ static bool loadPackProfile(PackProfile* parent,
} }
if (!componentsFile.open(QFile::ReadOnly)) { if (!componentsFile.open(QFile::ReadOnly)) {
qCritical() << "Couldn't open" << componentsFile.fileName() << " for reading:" << componentsFile.errorString(); qCritical() << "Couldn't open" << componentsFile.fileName() << " for reading:" << componentsFile.errorString();
qWarning() << "Ignoring overriden order"; qWarning() << "Ignoring overridden order";
return false; return false;
} }
@ -190,7 +190,7 @@ static bool loadPackProfile(PackProfile* parent,
QJsonDocument doc = QJsonDocument::fromJson(componentsFile.readAll(), &error); QJsonDocument doc = QJsonDocument::fromJson(componentsFile.readAll(), &error);
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {
qCritical() << "Couldn't parse" << componentsFile.fileName() << ":" << error.errorString(); qCritical() << "Couldn't parse" << componentsFile.fileName() << ":" << error.errorString();
qWarning() << "Ignoring overriden order"; qWarning() << "Ignoring overridden order";
return false; return false;
} }

6
launcher/minecraft/ProfileUtils.cpp
View File

@ -57,7 +57,7 @@ bool readOverrideOrders(QString path, PatchOrder& order)
} }
if (!orderFile.open(QFile::ReadOnly)) { if (!orderFile.open(QFile::ReadOnly)) {
qCritical() << "Couldn't open" << orderFile.fileName() << " for reading:" << orderFile.errorString(); qCritical() << "Couldn't open" << orderFile.fileName() << " for reading:" << orderFile.errorString();
qWarning() << "Ignoring overriden order"; qWarning() << "Ignoring overridden order";
return false; return false;
} }
@ -66,7 +66,7 @@ bool readOverrideOrders(QString path, PatchOrder& order)
QJsonDocument doc = QJsonDocument::fromJson(orderFile.readAll(), &error); QJsonDocument doc = QJsonDocument::fromJson(orderFile.readAll(), &error);
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {
qCritical() << "Couldn't parse" << orderFile.fileName() << ":" << error.errorString(); qCritical() << "Couldn't parse" << orderFile.fileName() << ":" << error.errorString();
qWarning() << "Ignoring overriden order"; qWarning() << "Ignoring overridden order";
return false; return false;
} }
@ -84,7 +84,7 @@ bool readOverrideOrders(QString path, PatchOrder& order)
} }
} catch ([[maybe_unused]] const JSONValidationError& err) { } catch ([[maybe_unused]] const JSONValidationError& err) {
qCritical() << "Couldn't parse" << orderFile.fileName() << ": bad file format"; qCritical() << "Couldn't parse" << orderFile.fileName() << ": bad file format";
qWarning() << "Ignoring overriden order"; qWarning() << "Ignoring overridden order";
order.clear(); order.clear();
return false; return false;
} }

2
launcher/net/NetRequest.cpp
View File

@ -86,7 +86,7 @@ void NetRequest::executeTask()
break; break;
case State::Inactive: case State::Inactive:
case State::Failed: case State::Failed:
emit failed("Failed to initilize sink"); emit failed("Failed to initialize sink");
emit finished(); emit finished();
return; return;
case State::AbortedByUser: case State::AbortedByUser:

2
launcher/settings/OverrideSetting.h
View File

@ -29,7 +29,7 @@
class OverrideSetting : public Setting { class OverrideSetting : public Setting {
Q_OBJECT Q_OBJECT
public: public:
explicit OverrideSetting(std::shared_ptr<Setting> overriden, std::shared_ptr<Setting> gate); explicit OverrideSetting(std::shared_ptr<Setting> overridden, std::shared_ptr<Setting> gate);
virtual QVariant defValue() const; virtual QVariant defValue() const;
virtual QVariant get() const; virtual QVariant get() const;

2
launcher/settings/PassthroughSetting.h
View File

@ -28,7 +28,7 @@
class PassthroughSetting : public Setting { class PassthroughSetting : public Setting {
Q_OBJECT Q_OBJECT
public: public:
explicit PassthroughSetting(std::shared_ptr<Setting> overriden, std::shared_ptr<Setting> gate); explicit PassthroughSetting(std::shared_ptr<Setting> overridden, std::shared_ptr<Setting> gate);
virtual QVariant defValue() const; virtual QVariant defValue() const;
virtual QVariant get() const; virtual QVariant get() const;

2
launcher/ui/pages/modplatform/flame/FlameModel.cpp
View File

@ -172,7 +172,7 @@ void ListModel::performPaginatedSearch()
callbacks.on_succeed = [this](auto& doc, auto& pack) { searchRequestForOneSucceeded(doc); }; callbacks.on_succeed = [this](auto& doc, auto& pack) { searchRequestForOneSucceeded(doc); };
callbacks.on_abort = [this] { callbacks.on_abort = [this] {
qCritical() << "Search task aborted by an unknown reason!"; qCritical() << "Search task aborted by an unknown reason!";
searchRequestFailed("Abborted"); searchRequestFailed("Aborted");
}; };
static const FlameAPI api; static const FlameAPI api;
if (auto job = api.getProjectInfo({ projectId }, std::move(callbacks)); job) { if (auto job = api.getProjectInfo({ projectId }, std::move(callbacks)); job) {