Move a good chunk of the singleton objects into a new QApplication subclass.

logic/lists/IconList.cpp

@@ -0,0 +1,257 @@
+#include "IconList.h"
+#include <pathutils.h>
+#include <QMap>
+#include <QEventLoop>
+#include <QDir>
+#include <QMimeData>
+#include <QUrl>
+#define MAX_SIZE 1024
+
+struct entry
+{
+	QString key;
+	QString name;
+	QIcon icon;
+	bool is_builtin;
+	QString filename;
+};
+
+class Private : public QObject
+{
+	Q_OBJECT
+public:
+	QMap<QString, int> index;
+	QVector<entry> icons;
+	Private()
+	{
+	}
+};
+
+
+IconList::IconList() : QAbstractListModel(), d(new Private())
+{
+	QDir instance_icons(":/icons/instances/");
+	auto file_info_list = instance_icons.entryInfoList(QDir::Files, QDir::Name);
+	for(auto file_info: file_info_list)
+	{
+		QString key = file_info.baseName();
+		addIcon(key, key, file_info.absoluteFilePath(), true);
+	}
+	
+	// FIXME: get from settings
+	ensureFolderPathExists("icons");
+	QDir user_icons("icons");
+	file_info_list = user_icons.entryInfoList(QDir::Files, QDir::Name);
+	for(auto file_info: file_info_list)
+	{
+		QString filename = file_info.absoluteFilePath();
+		QString key = file_info.baseName();
+		addIcon(key, key, filename);
+	}
+}
+
+IconList::~IconList()
+{
+	delete d;
+	d = nullptr;
+}
+
+QStringList IconList::mimeTypes() const
+{
+	QStringList types;
+	types << "text/uri-list";
+	return types;
+}
+Qt::DropActions IconList::supportedDropActions() const
+{
+	return Qt::CopyAction;
+}
+
+bool IconList::dropMimeData ( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent )
+{
+	if (action == Qt::IgnoreAction)
+        return true;
+	// check if the action is supported
+	if (!data || !(action & supportedDropActions()))
+		return false;
+
+	// files dropped from outside?
+	if(data->hasUrls())
+	{
+		/*
+		bool was_watching = is_watching;
+		if(was_watching)
+			stopWatching();
+		*/
+		auto urls = data->urls();
+		QStringList iconFiles;
+		for(auto url: urls)
+		{
+			// only local files may be dropped...
+			if(!url.isLocalFile())
+				continue;
+			iconFiles += url.toLocalFile();
+		}
+		installIcons(iconFiles);
+		/*
+		if(was_watching)
+			startWatching();
+		*/
+		return true;
+	}
+	return false;
+}
+
+Qt::ItemFlags IconList::flags ( const QModelIndex& index ) const
+{
+	Qt::ItemFlags defaultFlags = QAbstractListModel::flags ( index );
+	if (index.isValid())
+		return Qt::ItemIsDropEnabled | defaultFlags;
+	else
+		return Qt::ItemIsDropEnabled | defaultFlags;
+}
+
+QVariant IconList::data ( const QModelIndex& index, int role ) const
+{
+	if(!index.isValid())
+		return QVariant();
+	
+	int row = index.row();
+	
+	if(row < 0 || row >= d->icons.size())
+		return QVariant();
+	
+	switch(role)
+	{
+		case Qt::DecorationRole:
+			return d->icons[row].icon;
+		case Qt::DisplayRole:
+			return d->icons[row].name;
+		case Qt::UserRole:
+			return d->icons[row].key;
+		default:
+			return QVariant();
+	}
+}
+
+int IconList::rowCount ( const QModelIndex& parent ) const
+{
+	return d->icons.size();
+}
+
+void IconList::installIcons ( QStringList iconFiles )
+{
+	for(QString file: iconFiles)
+	{
+		QFileInfo fileinfo(file);
+		if(!fileinfo.isReadable() || !fileinfo.isFile())
+			continue;
+		QString target = PathCombine("icons", fileinfo.fileName());
+		
+		QString suffix = fileinfo.suffix();
+		if(suffix != "jpeg" && suffix != "png" && suffix != "jpg")
+			continue;
+		
+		if(!QFile::copy(file, target))
+			continue;
+		
+		QString key = fileinfo.baseName();
+		addIcon(key, key, target);
+	}
+}
+
+bool IconList::deleteIcon ( QString key )
+{
+	int iconIdx = getIconIndex(key);
+	if(iconIdx == -1)
+		return false;
+	auto & iconEntry = d->icons[iconIdx];
+	if(iconEntry.is_builtin)
+		return false;
+	if(QFile::remove(iconEntry.filename))
+	{
+		beginRemoveRows(QModelIndex(), iconIdx, iconIdx);
+		d->icons.remove(iconIdx);
+		reindex();
+		endRemoveRows();
+	}
+	return true;
+}
+
+bool IconList::addIcon ( QString key, QString name, QString path, bool is_builtin )
+{
+	auto iter = d->index.find(key);
+	if(iter != d->index.end())
+	{
+		if(d->icons[*iter].is_builtin)
+			return false;
+		
+		QIcon icon(path);
+		if(icon.isNull())
+			return false;
+		
+		auto & oldOne = d->icons[*iter];
+		
+		if(!QFile::remove(oldOne.filename))
+			return false;
+
+		// replace the icon
+		oldOne = {key, name, icon, is_builtin, path};
+		dataChanged(index(*iter),index(*iter));
+		return true;
+	}
+	else
+	{
+		QIcon icon(path);
+		if(icon.isNull()) return false;
+		
+		// add a new icon
+		beginInsertRows(QModelIndex(), d->icons.size(),d->icons.size());
+		d->icons.push_back({key, name, icon, is_builtin, path});
+		d->index[key] = d->icons.size() - 1;
+		endInsertRows();
+		return true;
+	}
+}
+
+void IconList::reindex()
+{
+	d->index.clear();
+	int i = 0;
+	for(auto& iter: d->icons)
+	{
+		d->index[iter.key] = i;
+		i++;
+	}
+}
+
+
+QIcon IconList::getIcon ( QString key )
+{
+	int icon_index = getIconIndex(key);
+
+	if(icon_index != -1)
+		return d->icons[icon_index].icon;
+	
+	// Fallback for icons that don't exist.
+	icon_index = getIconIndex("infinity");
+	
+	if(icon_index != -1)
+		return d->icons[icon_index].icon;
+	return QIcon();
+}
+
+int IconList::getIconIndex ( QString key )
+{
+	if(key == "default")
+		key = "infinity";
+	
+	auto iter = d->index.find(key);
+	if(iter != d->index.end())
+		return *iter;
+	
+	
+	return -1;
+}
+
+#include "IconList.moc"

logic/lists/IconList.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#include <QMutex>
+#include <QAbstractListModel>
+#include <QtGui/QIcon>
+
+class Private;
+
+class IconList : public QAbstractListModel
+{
+public:
+	IconList();
+	virtual ~IconList();
+	
+	QIcon getIcon ( QString key );
+	int getIconIndex ( QString key );
+	
+	virtual QVariant data ( const QModelIndex& index, int role = Qt::DisplayRole ) const;
+	virtual int rowCount ( const QModelIndex& parent = QModelIndex() ) const;
+	
+	bool addIcon(QString key, QString name, QString path, bool is_builtin = false);
+	bool deleteIcon(QString key);
+	
+	virtual QStringList mimeTypes() const;
+	virtual Qt::DropActions supportedDropActions() const;
+	virtual bool dropMimeData ( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent );
+	virtual Qt::ItemFlags flags ( const QModelIndex& index ) const;
+	
+	void installIcons ( QStringList iconFiles );
+	
+private:
+	// hide copy constructor
+	IconList ( const IconList & ) = delete;
+	// hide assign op
+	IconList& operator= ( const IconList & ) = delete;
+	void reindex();
+	Private* d;
+};

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"

logic/lists/LwjglVersionList.cpp

@@ -14,7 +14,7 @@
  */
 
 #include "LwjglVersionList.h"
-#include "logic/net/NetWorker.h"
+#include "MultiMC.h"
 
 #include <QtNetwork>
 
@@ -91,8 +91,8 @@ void LWJGLVersionList::loadList()
 	Q_ASSERT_X(!m_loading, "loadList", "list is already loading (m_loading is true)");
 	
 	setLoading(true);
-	auto & worker = NetWorker::qnam();
-	reply = worker.get(QNetworkRequest(QUrl(RSS_URL)));
+	auto worker = MMC->qnam();
+	reply = worker->get(QNetworkRequest(QUrl(RSS_URL)));
 	connect(reply, SIGNAL(finished()), SLOT(netRequestComplete()));
 }
 

logic/lists/MinecraftVersionList.cpp

@@ -14,7 +14,7 @@
  */
 
 #include "MinecraftVersionList.h"
-#include <logic/net/NetWorker.h>
+#include <MultiMC.h>
 
 #include <QDebug>
 
@@ -151,8 +151,8 @@ MCVListLoadTask::~MCVListLoadTask()
 void MCVListLoadTask::executeTask()
 {
 	setStatus("Loading instance version list...");
-	auto & worker = NetWorker::qnam();
-	vlistReply = worker.get(QNetworkRequest(QUrl(QString(MCVLIST_URLBASE) + "versions.json")));
+	auto worker = MMC->qnam();
+	vlistReply = worker->get(QNetworkRequest(QUrl(QString(MCVLIST_URLBASE) + "versions.json")));
 	connect(vlistReply, SIGNAL(finished()), this, SLOT(list_downloaded()));
 }