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

Fixed some codeql warnings

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-01-30 12:37:34 +02:00
parent 7317105e4d
commit 5afe75e821
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
11 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/JavaCommon.cpp
View File

@ -121,7 +121,7 @@ void JavaCommon::TestCheck::run()
checker->start(); checker->start();
} }
void JavaCommon::TestCheck::checkFinished(JavaChecker::Result result) void JavaCommon::TestCheck::checkFinished(const JavaChecker::Result& result)
{ {
if (result.validity != JavaChecker::Result::Validity::Valid) { if (result.validity != JavaChecker::Result::Validity::Valid) {
javaBinaryWasBad(m_parent, result); javaBinaryWasBad(m_parent, result);
@ -133,7 +133,7 @@ void JavaCommon::TestCheck::checkFinished(JavaChecker::Result result)
checker->start(); checker->start();
} }
void JavaCommon::TestCheck::checkFinishedWithArgs(JavaChecker::Result result) void JavaCommon::TestCheck::checkFinishedWithArgs(const JavaChecker::Result& result)
{ {
if (result.validity == JavaChecker::Result::Validity::Valid) { if (result.validity == JavaChecker::Result::Validity::Valid) {
javaWasOk(m_parent, result); javaWasOk(m_parent, result);

4
launcher/JavaCommon.h
View File

@ -32,8 +32,8 @@ class TestCheck : public QObject {
void finished(); void finished();
private slots: private slots:
void checkFinished(JavaChecker::Result result); void checkFinished(const JavaChecker::Result& result);
void checkFinishedWithArgs(JavaChecker::Result result); void checkFinishedWithArgs(const JavaChecker::Result& result);
private: private:
JavaChecker::Ptr checker; JavaChecker::Ptr checker;

2
launcher/java/JavaChecker.h
View File

@ -29,7 +29,7 @@ class JavaChecker : public Task {
explicit JavaChecker(QString path, QString args, int minMem = 0, int maxMem = 0, int permGen = 0, int id = 0, QObject* parent = 0); explicit JavaChecker(QString path, QString args, int minMem = 0, int maxMem = 0, int permGen = 0, int id = 0, QObject* parent = 0);
signals: signals:
void checkFinished(Result result); void checkFinished(const Result& result);
protected: protected:
virtual void executeTask() override; virtual void executeTask() override;

4
launcher/java/JavaInstallList.cpp
View File

@ -170,7 +170,7 @@ void JavaListLoadTask::executeTask()
int id = 0; int id = 0;
for (QString candidate : candidate_paths) { for (QString candidate : candidate_paths) {
auto checker = new JavaChecker(candidate, "", 0, 0, 0, id, this); auto checker = new JavaChecker(candidate, "", 0, 0, 0, id, this);
connect(checker, &JavaChecker::checkFinished, [this](JavaChecker::Result result) { m_results << result; }); connect(checker, &JavaChecker::checkFinished, [this](const JavaChecker::Result& result) { m_results << result; });
job->addTask(Task::Ptr(checker)); job->addTask(Task::Ptr(checker));
id++; id++;
} }
@ -181,7 +181,7 @@ void JavaListLoadTask::executeTask()
void JavaListLoadTask::javaCheckerFinished() void JavaListLoadTask::javaCheckerFinished()
{ {
QList<JavaInstallPtr> candidates; QList<JavaInstallPtr> candidates;
std::sort(m_results.begin(), m_results.end(), [](JavaChecker::Result a, JavaChecker::Result b) { return a.id < b.id; }); std::sort(m_results.begin(), m_results.end(), [](const JavaChecker::Result& a, const JavaChecker::Result& b) { return a.id < b.id; });
qDebug() << "Found the following valid Java installations:"; qDebug() << "Found the following valid Java installations:";
for (auto result : m_results) { for (auto result : m_results) {

4
launcher/java/JavaVersion.cpp
View File

@ -43,12 +43,12 @@ QString JavaVersion::toString() const
return m_string; return m_string;
} }
bool JavaVersion::requiresPermGen() bool JavaVersion::requiresPermGen() const
{ {
return !m_parseable || m_major < 8; return !m_parseable || m_major < 8;
} }
bool JavaVersion::isModular() bool JavaVersion::isModular() const
{ {
return m_parseable && m_major >= 9; return m_parseable && m_major >= 9;
} }

4
launcher/java/JavaVersion.h
View File

@ -24,9 +24,9 @@ class JavaVersion {
bool operator==(const JavaVersion& rhs); bool operator==(const JavaVersion& rhs);
bool operator>(const JavaVersion& rhs); bool operator>(const JavaVersion& rhs);
bool requiresPermGen(); bool requiresPermGen() const;
bool isModular(); bool isModular() const;
QString toString() const; QString toString() const;

1
launcher/java/download/ArchiveJavaDownloader.cpp
View File

@ -49,7 +49,6 @@ void ArchiveJavaDownloader::executeTask()
auto fullPath = entry->getFullPath(); auto fullPath = entry->getFullPath();
connect(download.get(), &NetJob::finished, [download, this] { disconnect(this, &Task::aborted, download.get(), &NetJob::abort); }); connect(download.get(), &NetJob::finished, [download, this] { disconnect(this, &Task::aborted, download.get(), &NetJob::abort); });
// connect(download.get(), &NetJob::aborted, [path] { APPLICATION->instances()->destroyStagingPath(path); });
connect(download.get(), &NetJob::progress, this, &ArchiveJavaDownloader::progress); connect(download.get(), &NetJob::progress, this, &ArchiveJavaDownloader::progress);
connect(download.get(), &NetJob::failed, this, &ArchiveJavaDownloader::emitFailed); connect(download.get(), &NetJob::failed, this, &ArchiveJavaDownloader::emitFailed);
connect(this, &Task::aborted, download.get(), &NetJob::abort); connect(this, &Task::aborted, download.get(), &NetJob::abort);

2
launcher/launch/steps/CheckJava.cpp
View File

@ -106,7 +106,7 @@ void CheckJava::executeTask()
emitSucceeded(); emitSucceeded();
} }
void CheckJava::checkJavaFinished(JavaChecker::Result result) void CheckJava::checkJavaFinished(const JavaChecker::Result& result)
{ {
switch (result.validity) { switch (result.validity) {
case JavaChecker::Result::Validity::Errored: { case JavaChecker::Result::Validity::Errored: {

2
launcher/launch/steps/CheckJava.h
View File

@ -28,7 +28,7 @@ class CheckJava : public LaunchStep {
virtual void executeTask(); virtual void executeTask();
virtual bool canAbort() const { return false; } virtual bool canAbort() const { return false; }
private slots: private slots:
void checkJavaFinished(JavaChecker::Result result); void checkJavaFinished(const JavaChecker::Result& result);
private: private:
void printJavaInfo(const QString& version, const QString& architecture, const QString& realArchitecture, const QString& vendor); void printJavaInfo(const QString& version, const QString& architecture, const QString& realArchitecture, const QString& vendor);

2
launcher/ui/widgets/JavaSettingsWidget.cpp
View File

@ -377,7 +377,7 @@ void JavaSettingsWidget::checkJavaPath(const QString& path)
m_checker->start(); m_checker->start();
} }
void JavaSettingsWidget::checkFinished(JavaChecker::Result result) void JavaSettingsWidget::checkFinished(const JavaChecker::Result& result)
{ {
m_result = result; m_result = result;
switch (result.validity) { switch (result.validity) {

2
launcher/ui/widgets/JavaSettingsWidget.h
View File

@ -51,7 +51,7 @@ class JavaSettingsWidget : public QWidget {
void on_javaBrowseBtn_clicked(); void on_javaBrowseBtn_clicked();
void on_javaStatusBtn_clicked(); void on_javaStatusBtn_clicked();
void on_javaDownloadBtn_clicked(); void on_javaDownloadBtn_clicked();
void checkFinished(JavaChecker::Result result); void checkFinished(const JavaChecker::Result& result);
protected: /* methods */ protected: /* methods */
void checkJavaPathOnEdit(const QString& path); void checkJavaPathOnEdit(const QString& path);