Merge branch 'PrismLauncher:develop' into data-packs
This commit is contained in:
commit
e4ed3b4546
125 changed files with 3925 additions and 1596 deletions
|
@ -178,7 +178,7 @@ QStringList CheckComboBox::checkedItems() const
|
|||
|
||||
void CheckComboBox::setCheckedItems(const QStringList& items)
|
||||
{
|
||||
foreach (auto text, items) {
|
||||
for (auto text : items) {
|
||||
auto index = findText(text);
|
||||
setItemCheckState(index, index != -1 ? Qt::Checked : Qt::Unchecked);
|
||||
}
|
||||
|
|
|
@ -293,7 +293,7 @@ void InfoFrame::setDescription(QString text)
|
|||
QChar rem('\n');
|
||||
QString finaltext;
|
||||
finaltext.reserve(intermediatetext.size());
|
||||
foreach (const QChar& c, intermediatetext) {
|
||||
for (const QChar& c : intermediatetext) {
|
||||
if (c == rem && prev) {
|
||||
continue;
|
||||
}
|
||||
|
@ -347,7 +347,7 @@ void InfoFrame::setLicense(QString text)
|
|||
QChar rem('\n');
|
||||
QString finaltext;
|
||||
finaltext.reserve(intermediatetext.size());
|
||||
foreach (const QChar& c, intermediatetext) {
|
||||
for (const QChar& c : intermediatetext) {
|
||||
if (c == rem && prev) {
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -49,9 +49,9 @@
|
|||
#include "Application.h"
|
||||
#include "minecraft/PackProfile.h"
|
||||
|
||||
unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(MinecraftInstance* instance, bool extended, QWidget* parent)
|
||||
std::unique_ptr<ModFilterWidget> ModFilterWidget::create(MinecraftInstance* instance, bool extended)
|
||||
{
|
||||
return unique_qobject_ptr<ModFilterWidget>(new ModFilterWidget(instance, extended, parent));
|
||||
return std::unique_ptr<ModFilterWidget>(new ModFilterWidget(instance, extended));
|
||||
}
|
||||
|
||||
class VersionBasicModel : public QIdentityProxyModel {
|
||||
|
@ -107,8 +107,8 @@ class AllVersionProxyModel : public QSortFilterProxyModel {
|
|||
}
|
||||
};
|
||||
|
||||
ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended, QWidget* parent)
|
||||
: QTabWidget(parent), ui(new Ui::ModFilterWidget), m_instance(instance), m_filter(new Filter())
|
||||
ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended)
|
||||
: QTabWidget(), ui(new Ui::ModFilterWidget), m_instance(instance), m_filter(new Filter())
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ class ModFilterWidget : public QTabWidget {
|
|||
}
|
||||
};
|
||||
|
||||
static unique_qobject_ptr<ModFilterWidget> create(MinecraftInstance* instance, bool extended, QWidget* parent = nullptr);
|
||||
static std::unique_ptr<ModFilterWidget> create(MinecraftInstance* instance, bool extended);
|
||||
virtual ~ModFilterWidget();
|
||||
|
||||
auto getFilter() -> std::shared_ptr<Filter>;
|
||||
|
@ -96,7 +96,7 @@ class ModFilterWidget : public QTabWidget {
|
|||
void setCategories(const QList<ModPlatform::Category>&);
|
||||
|
||||
private:
|
||||
ModFilterWidget(MinecraftInstance* instance, bool extendedSupport, QWidget* parent = nullptr);
|
||||
ModFilterWidget(MinecraftInstance* instance, bool extendedSupport);
|
||||
|
||||
void loadVersionList();
|
||||
void prepareBasicFilter();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue