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

NOISSUE fix all clang warnings

Browse Source
This commit is contained in:
Petr Mrázek
2015-09-26 04:04:09 +02:00
parent 0af04dc060
commit cca6700134
52 changed files with 132 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/pages/InstanceSettingsPage.h
View File

@ -49,12 +49,12 @@ public:
{
return "settings";
}
virtual bool apply();
virtual bool apply() override;
virtual QString helpPage() const override
{
return "Instance-settings";
}
virtual bool shouldDisplay() const;
virtual bool shouldDisplay() const override;
private slots:
void on_javaDetectBtn_clicked();

8
application/pages/LegacyJarModPage.h
View File

@ -36,15 +36,15 @@ public:
explicit LegacyJarModPage(LegacyInstance *inst, QWidget *parent = 0);
virtual ~LegacyJarModPage();
virtual QString displayName() const
virtual QString displayName() const override
{
return tr("Jar Mods");
}
virtual QIcon icon() const
virtual QIcon icon() const override
{
return MMC->getThemedIcon("jarmods");
}
virtual QString id() const
virtual QString id() const override
{
return "jarmods";
}
@ -52,7 +52,7 @@ public:
{
return "Legacy-jar-mods";
}
virtual bool shouldDisplay() const;
virtual bool shouldDisplay() const override;
private
slots:

2
application/pages/LegacyUpgradePage.h
View File

@ -49,7 +49,7 @@ public:
{
return "Legacy-upgrade";
}
virtual bool shouldDisplay() const;
virtual bool shouldDisplay() const override;
private
slots:
void on_upgradeButton_clicked();

6
application/pages/LogPage.h
View File

@ -48,13 +48,13 @@ public:
{
return "console";
}
virtual bool apply();
virtual bool apply() override;
virtual QString helpPage() const override
{
return "Minecraft-Logs";
}
virtual bool shouldDisplay() const;
virtual void setParentContainer(BasePageContainer *);
virtual bool shouldDisplay() const override;
virtual void setParentContainer(BasePageContainer *) override;
private slots:
/**

8
application/pages/ModFolderPage.h
View File

@ -58,12 +58,12 @@ public:
{
return m_helpName;
}
virtual bool shouldDisplay() const;
virtual bool shouldDisplay() const override;
virtual void opened();
virtual void closed();
virtual void opened() override;
virtual void closed() override;
protected:
bool eventFilter(QObject *obj, QEvent *ev);
bool eventFilter(QObject *obj, QEvent *ev) override;
bool modListFilter(QKeyEvent *ev);
protected:

2
application/pages/NotesPage.h
View File

@ -48,7 +48,7 @@ public:
{
return "notes";
}
virtual bool apply();
virtual bool apply() override;
virtual QString helpPage() const override
{
return "Notes";

3
application/pages/ScreenshotsPage.cpp
View File

@ -73,7 +73,6 @@ public:
small = image.scaledToWidth(512).scaledToWidth(256, Qt::SmoothTransformation);
else
small = image.scaledToHeight(512).scaledToHeight(256, Qt::SmoothTransformation);
auto smallSize = small.size();
QPoint offset((256 - small.width()) / 2, (256 - small.height()) / 2);
QImage square(QSize(256, 256), QImage::Format_ARGB32);
square.fill(Qt::transparent);
@ -302,7 +301,7 @@ void ScreenshotsPage::on_uploadBtn_clicked()
task.addTask(job.unwrap());
task.addTask(albumTask.unwrap());
ProgressDialog prog(this);
if (prog.exec(&task) != QDialog::Accepted)
if (prog.execWithTask(&task) != QDialog::Accepted)
{
CustomMessageBox::selectable(this, tr("Failed to upload screenshots!"),
tr("Unknown error"), QMessageBox::Warning)->exec();

2
application/pages/ScreenshotsPage.h
View File

@ -46,7 +46,7 @@ public:
NothingDone = 0x42
};
virtual bool eventFilter(QObject *, QEvent *);
virtual bool eventFilter(QObject *, QEvent *) override;
virtual QString displayName() const override
{
return tr("Screenshots");

8
application/pages/VersionPage.cpp
View File

@ -275,7 +275,7 @@ int VersionPage::doUpdate()
}
ProgressDialog tDialog(this);
connect(updateTask.get(), SIGNAL(failed(QString)), SLOT(onGameUpdateError(QString)));
int ret = tDialog.exec(updateTask.get());
int ret = tDialog.execWithTask(updateTask.get());
updateButtons();
return ret;
}
@ -290,7 +290,7 @@ void VersionPage::on_forgeBtn_clicked()
if (vselect.exec() && vselect.selectedVersion())
{
ProgressDialog dialog(this);
dialog.exec(
dialog.execWithTask(
ForgeInstaller().createInstallTask(m_inst, vselect.selectedVersion(), this));
preselect(m_version->rowCount(QModelIndex())-1);
}
@ -307,7 +307,7 @@ void VersionPage::on_liteloaderBtn_clicked()
if (vselect.exec() && vselect.selectedVersion())
{
ProgressDialog dialog(this);
dialog.exec(
dialog.execWithTask(
LiteLoaderInstaller().createInstallTask(m_inst, vselect.selectedVersion(), this));
preselect(m_version->rowCount(QModelIndex())-1);
}
@ -447,7 +447,7 @@ void VersionPage::on_revertBtn_clicked()
return;
}
}
if(!m_version->revert(version))
if(!m_version->revertToBase(version))
{
// TODO: some error box here
}

4
application/pages/VersionPage.h
View File

@ -45,9 +45,9 @@ public:
{
return "Instance-Versions";
}
virtual bool shouldDisplay() const;
virtual bool shouldDisplay() const override;
virtual void setParentContainer(BasePageContainer *);
virtual void setParentContainer(BasePageContainer *) override;
private slots:
void on_forgeBtn_clicked();

2
application/pages/WorldListPage.cpp
View File

@ -31,7 +31,7 @@
WorldListPage::WorldListPage(BaseInstance *inst, std::shared_ptr<WorldList> worlds, QString id,
QString iconName, QString displayName, QString helpPage,
QWidget *parent)
: QWidget(parent), ui(new Ui::WorldListPage), m_worlds(worlds), m_inst(inst), m_id(id), m_displayName(displayName), m_iconName(iconName), m_helpName(helpPage)
: QWidget(parent), m_inst(inst), ui(new Ui::WorldListPage), m_worlds(worlds), m_iconName(iconName), m_id(id), m_displayName(displayName), m_helpName(helpPage)
{
ui->setupUi(this);
ui->tabWidget->tabBar()->hide();

8
application/pages/WorldListPage.h
View File

@ -54,13 +54,13 @@ public:
{
return m_helpName;
}
virtual bool shouldDisplay() const;
virtual bool shouldDisplay() const override;
virtual void opened();
virtual void closed();
virtual void opened() override;
virtual void closed() override;
protected:
bool eventFilter(QObject *obj, QEvent *ev);
bool eventFilter(QObject *obj, QEvent *ev) override;
bool worldListFilter(QKeyEvent *ev);
protected:

2
application/pages/global/ExternalToolsPage.h
View File

@ -53,7 +53,7 @@ public:
{
return "Tools";
}
virtual bool apply();
virtual bool apply() override;
private:
void loadSettings();