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

Merge pull request #1537 from Trial97/warnings

Browse Source
This commit is contained in:
Sefa Eyeoglu
2023-10-04 09:40:38 +02:00
committed by GitHub
parent d186c34385 d3acac16e6
commit 03ad430699
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/java/JavaInstall.h
View File

@ -24,11 +24,11 @@
struct JavaInstall : public BaseVersion {
JavaInstall() {}
JavaInstall(QString id, QString arch, QString path) : id(id), arch(arch), path(path) {}
virtual QString descriptor() { return id.toString(); }
virtual QString descriptor() override { return id.toString(); }
virtual QString name() { return id.toString(); }
virtual QString name() override { return id.toString(); }
virtual QString typeString() const { return arch; }
virtual QString typeString() const override { return arch; }
virtual bool operator<(BaseVersion& a) override;
virtual bool operator>(BaseVersion& a) override;

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

@ -330,7 +330,8 @@ void ResourceFolderModel::applyUpdates(QSet<QString>& current_set, QSet<QString>
// When you have a Qt build with assertions turned on, proceeding here will abort the application
if (added_set.size() > 0) {
beginInsertRows(QModelIndex(), m_resources.size(), m_resources.size() + added_set.size() - 1);
beginInsertRows(QModelIndex(), static_cast<int>(m_resources.size()),
static_cast<int>(m_resources.size() + added_set.size() - 1));
for (auto& added : added_set) {
auto res = new_resources[added];

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

@ -82,7 +82,7 @@ class VersionSelectWidget : public QWidget {
void selectedVersionChanged(BaseVersion::Ptr version);
protected:
virtual void closeEvent(QCloseEvent*);
virtual void closeEvent(QCloseEvent*) override;
private slots:
void onTaskSucceeded();