0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE remove notification checker form application object

Browse Source
This commit is contained in:
Petr Mrázek 2015-01-29 09:03:11 +01:00
parent 7334b8e520
commit 360ec557b2
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MultiMC.cpp
View File

@ -27,7 +27,6 @@
#include "logic/java/JavaUtils.h"
#include "logic/updater/UpdateChecker.h"
#include "logic/updater/NotificationChecker.h"
#include "logic/tools/JProfiler.h"
#include "logic/tools/JVisualVM.h"
@ -194,9 +193,6 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar
// initialize the updater
m_updateChecker.reset(new UpdateChecker());
// initialize the notification checker
m_notificationChecker.reset(new NotificationChecker());
m_translationChecker.reset(new TranslationDownloader());
// and instances

7
MultiMC.h
View File

@ -19,7 +19,6 @@ class ForgeVersionList;
class LiteLoaderVersionList;
class JavaVersionList;
class UpdateChecker;
class NotificationChecker;
class BaseProfilerFactory;
class BaseDetachedToolFactory;
class TranslationDownloader;
@ -95,11 +94,6 @@ public:
return m_updateChecker;
}
std::shared_ptr<NotificationChecker> notificationChecker()
{
return m_notificationChecker;
}
std::shared_ptr<LWJGLVersionList> lwjgllist();
std::shared_ptr<ForgeVersionList> forgelist();
@ -184,7 +178,6 @@ private:
std::shared_ptr<SettingsObject> m_settings;
std::shared_ptr<InstanceList> m_instances;
std::shared_ptr<UpdateChecker> m_updateChecker;
std::shared_ptr<NotificationChecker> m_notificationChecker;
std::shared_ptr<MojangAccountList> m_accounts;
std::shared_ptr<IconList> m_icons;
std::shared_ptr<QNetworkAccessManager> m_qnam;

6
gui/MainWindow.cpp
View File

@ -622,8 +622,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
auto updater = MMC->updateChecker();
updater->checkForUpdate(false);
}
connect(MMC->notificationChecker().get(),
m_notificationChecker.reset(new NotificationChecker());
connect(m_notificationChecker.get(),
&NotificationChecker::notificationCheckFinished, this,
&MainWindow::notificationsChanged);
}
@ -956,7 +956,7 @@ QString intListToString(const QList<int> &list)
void MainWindow::notificationsChanged()
{
QList<NotificationChecker::NotificationEntry> entries =
MMC->notificationChecker()->notificationEntries();
m_notificationChecker->notificationEntries();
QList<int> shownNotifications =
stringToIntList(MMC->settings()->get("ShownNotifications").toString());
for (auto it = entries.begin(); it != entries.end(); ++it)

2
gui/MainWindow.h
View File

@ -25,6 +25,7 @@
#include "logic/net/NetJob.h"
class NewsChecker;
class NotificationChecker;
class QToolButton;
class LabeledToolButton;
class QLabel;
@ -200,6 +201,7 @@ private:
std::shared_ptr<GenericPageProvider> m_globalSettingsProvider;
std::shared_ptr<NewsChecker> m_newsChecker;
std::shared_ptr<NotificationChecker> m_notificationChecker;
InstancePtr m_selectedInstance;
QString m_currentInstIcon;