diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-22 14:03:05 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-22 14:03:05 +0200 |
| commit | 1bed5e4023f503cb95a914c1e6886e045b7f34e2 (patch) | |
| tree | 6c2a2eb34b93bdd24e7db1f9378b231084c0b27a /gui/IconPickerDialog.cpp | |
| parent | 930b07afd4229e952d0cd47ca62cd94235499a0c (diff) | |
| parent | 9d03a9c1e3b9c24a4146adedb2971591d23b037a (diff) | |
| download | MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar.gz MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar.lz MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar.xz MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.zip | |
Merge branch 'feature_onesix_forge' into develop
Diffstat (limited to 'gui/IconPickerDialog.cpp')
| -rw-r--r-- | gui/IconPickerDialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/IconPickerDialog.cpp b/gui/IconPickerDialog.cpp index f3947d21..8f5d8256 100644 --- a/gui/IconPickerDialog.cpp +++ b/gui/IconPickerDialog.cpp @@ -39,7 +39,7 @@ IconPickerDialog::IconPickerDialog(QWidget *parent) : contentsWidget->installEventFilter(this); - contentsWidget->setModel(MMC->icons()); + contentsWidget->setModel(MMC->icons().data()); auto buttonAdd = ui->buttonBox->addButton(tr("Add Icon"),QDialogButtonBox::ResetRole); auto buttonRemove = ui->buttonBox->addButton(tr("Remove Icon"),QDialogButtonBox::ResetRole); @@ -119,7 +119,7 @@ void IconPickerDialog::selectionChanged ( QItemSelection selected, QItemSelectio int IconPickerDialog::exec ( QString selection ) { - IconList * list = MMC->icons(); + auto list = MMC->icons(); auto contentsWidget = ui->iconView; selectedIconKey = selection; |