diff options
author | Petr Mrázek <peterix@gmail.com> | 2019-08-04 05:08:40 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2019-08-04 05:08:40 +0200 |
commit | ce4a55bc3b32d75db1d31cad6928be2ee2a74235 (patch) | |
tree | 1495dffd936cbe358fd9717c3d5c1f442968e876 /api/logic/minecraft/mod | |
parent | 6b82e942d002cefebe1396dc51a7e9515b502782 (diff) | |
download | PrismLauncher-ce4a55bc3b32d75db1d31cad6928be2ee2a74235.tar.gz PrismLauncher-ce4a55bc3b32d75db1d31cad6928be2ee2a74235.tar.bz2 PrismLauncher-ce4a55bc3b32d75db1d31cad6928be2ee2a74235.zip |
NOISSUE fix listing of mods in log, improve display with unicode
Diffstat (limited to 'api/logic/minecraft/mod')
-rw-r--r-- | api/logic/minecraft/mod/ModFolderModel.cpp | 12 | ||||
-rw-r--r-- | api/logic/minecraft/mod/ModFolderModel.h | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/api/logic/minecraft/mod/ModFolderModel.cpp b/api/logic/minecraft/mod/ModFolderModel.cpp index 79459dac..632dd959 100644 --- a/api/logic/minecraft/mod/ModFolderModel.cpp +++ b/api/logic/minecraft/mod/ModFolderModel.cpp @@ -81,12 +81,12 @@ bool ModFolderModel::update() auto task = new ModFolderLoadTask(m_dir); m_update = task->result(); QThreadPool *threadPool = QThreadPool::globalInstance(); - connect(task, &ModFolderLoadTask::succeeded, this, &ModFolderModel::updateFinished); + connect(task, &ModFolderLoadTask::succeeded, this, &ModFolderModel::finishUpdate); threadPool->start(task); return true; } -void ModFolderModel::updateFinished() +void ModFolderModel::finishUpdate() { QSet<QString> currentSet = modsIndex.keys().toSet(); auto & newMods = m_update->mods; @@ -159,7 +159,7 @@ void ModFolderModel::updateFinished() m_update.reset(); - emit changed(); + emit updateFinished(); if(scheduled_update) { scheduled_update = false; @@ -180,11 +180,11 @@ void ModFolderModel::resolveMod(Mod& m) m.setResolving(true, nextResolutionTicket); nextResolutionTicket++; QThreadPool *threadPool = QThreadPool::globalInstance(); - connect(task, &LocalModParseTask::finished, this, &ModFolderModel::modParseFinished); + connect(task, &LocalModParseTask::finished, this, &ModFolderModel::finishModParse); threadPool->start(task); } -void ModFolderModel::modParseFinished(int token) +void ModFolderModel::finishModParse(int token) { auto iter = activeTickets.find(token); if(iter == activeTickets.end()) { @@ -317,7 +317,6 @@ bool ModFolderModel::enableMods(const QModelIndexList& indexes, bool enable) m.enable(enable); emit dataChanged(i, i); } - emit changed(); return true; } @@ -335,7 +334,6 @@ bool ModFolderModel::deleteMods(const QModelIndexList& indexes) Mod &m = mods[i.row()]; m.destroy(); } - emit changed(); return true; } diff --git a/api/logic/minecraft/mod/ModFolderModel.h b/api/logic/minecraft/mod/ModFolderModel.h index 776c0c87..ff56be4a 100644 --- a/api/logic/minecraft/mod/ModFolderModel.h +++ b/api/logic/minecraft/mod/ModFolderModel.h @@ -116,11 +116,11 @@ public slots: private slots: void directoryChanged(QString path); - void updateFinished(); - void modParseFinished(int token); + void finishUpdate(); + void finishModParse(int token); signals: - void changed(); + void updateFinished(); private: void resolveMod(Mod& m); |