diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-07 04:00:58 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-07 04:00:58 +0200 |
| commit | 6892c11e9f287dcfb1e698f8f46233a01fb7abb6 (patch) | |
| tree | ee94607e92bcf39faef7f35842499fafbb2e270f /logic/lists/InstanceList.cpp | |
| parent | 3f30055afe757637ae865b2adc7cf021edd9b8b5 (diff) | |
| download | MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar.gz MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar.lz MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.tar.xz MultiMC-6892c11e9f287dcfb1e698f8f46233a01fb7abb6.zip | |
Move a good chunk of the singleton objects into a new QApplication subclass.
Diffstat (limited to 'logic/lists/InstanceList.cpp')
| -rw-r--r-- | logic/lists/InstanceList.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/logic/lists/InstanceList.cpp b/logic/lists/InstanceList.cpp index 1d13e3f2..b930f781 100644 --- a/logic/lists/InstanceList.cpp +++ b/logic/lists/InstanceList.cpp @@ -22,13 +22,13 @@ #include <QJsonDocument> #include <QJsonObject> #include <QJsonArray> +#include <pathutils.h> +#include "MultiMC.h" #include "logic/lists/InstanceList.h" +#include "logic/lists/IconList.h" #include "logic/BaseInstance.h" #include "logic/InstanceFactory.h" -#include <logic/IconListModel.h> - -#include "pathutils.h" const static int GROUP_FILE_FORMAT_VERSION = 1; @@ -81,9 +81,8 @@ QVariant InstanceList::data ( const QModelIndex& index, int role ) const } case Qt::DecorationRole: { - IconList * ic = IconList::instance(); QString key = pdata->iconKey(); - return ic->getIcon(key); + return MMC->icons()->getIcon(key); } // for now. case KCategorizedSortFilterProxyModel::CategorySortRole: @@ -413,5 +412,3 @@ bool InstanceProxyModel::subSortLessThan (const QModelIndex& left, const QModelI return QString::localeAwareCompare(pdataLeft->name(), pdataRight->name()) < 0; //return pdataLeft->name() < pdataRight->name(); } - -#include "InstanceList.moc"
\ No newline at end of file |