CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE remove status checker from application object

Browse Source
This commit is contained in:
Petr Mrázek 2015-01-29 08:57:38 +01:00
parent 791221e923
commit 7334b8e520
5 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MultiMC.cpp
View File

@ -21,8 +21,6 @@
#include "logic/forge/ForgeVersionList.h" #include "logic/forge/ForgeVersionList.h"
#include "logic/status/StatusChecker.h"
#include "logic/net/HttpMetaCache.h" #include "logic/net/HttpMetaCache.h"
#include "logic/net/URLConstants.h" #include "logic/net/URLConstants.h"
@ -199,9 +197,6 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar
// initialize the notification checker // initialize the notification checker
m_notificationChecker.reset(new NotificationChecker()); m_notificationChecker.reset(new NotificationChecker());
// initialize the status checker
m_statusChecker.reset(new StatusChecker());
m_translationChecker.reset(new TranslationDownloader()); m_translationChecker.reset(new TranslationDownloader());
// and instances // and instances

7
MultiMC.h
View File

@ -20,7 +20,6 @@ class LiteLoaderVersionList;
class JavaVersionList; class JavaVersionList;
class UpdateChecker; class UpdateChecker;
class NotificationChecker; class NotificationChecker;
class StatusChecker;
class BaseProfilerFactory; class BaseProfilerFactory;
class BaseDetachedToolFactory; class BaseDetachedToolFactory;
class TranslationDownloader; class TranslationDownloader;
@ -101,11 +100,6 @@ public:
return m_notificationChecker; return m_notificationChecker;
} }
std::shared_ptr<StatusChecker> statusChecker()
{
return m_statusChecker;
}
std::shared_ptr<LWJGLVersionList> lwjgllist(); std::shared_ptr<LWJGLVersionList> lwjgllist();
std::shared_ptr<ForgeVersionList> forgelist(); std::shared_ptr<ForgeVersionList> forgelist();
@ -191,7 +185,6 @@ private:
std::shared_ptr<InstanceList> m_instances; std::shared_ptr<InstanceList> m_instances;
std::shared_ptr<UpdateChecker> m_updateChecker; std::shared_ptr<UpdateChecker> m_updateChecker;
std::shared_ptr<NotificationChecker> m_notificationChecker; std::shared_ptr<NotificationChecker> m_notificationChecker;
std::shared_ptr<StatusChecker> m_statusChecker;
std::shared_ptr<MojangAccountList> m_accounts; std::shared_ptr<MojangAccountList> m_accounts;
std::shared_ptr<IconList> m_icons; std::shared_ptr<IconList> m_icons;
std::shared_ptr<QNetworkAccessManager> m_qnam; std::shared_ptr<QNetworkAccessManager> m_qnam;

2
gui/MainWindow.cpp
View File

@ -373,8 +373,6 @@ namespace Ui {
#include "logic/news/NewsChecker.h" #include "logic/news/NewsChecker.h"
#include "logic/status/StatusChecker.h"
#include "logic/net/URLConstants.h" #include "logic/net/URLConstants.h"
#include "logic/net/NetJob.h" #include "logic/net/NetJob.h"

7
gui/widgets/ServerStatus.cpp
View File

@ -39,12 +39,13 @@ ServerStatus::ServerStatus(QWidget *parent, Qt::WindowFlags f) : QWidget(parent,
setLayout(layout); setLayout(layout);
// Start status checker // Start status checker
m_statusChecker.reset(new StatusChecker());
{ {
auto reloader = MMC->statusChecker().get(); auto reloader = m_statusChecker.get();
connect(reloader, &StatusChecker::statusChanged, this, &ServerStatus::StatusChanged); connect(reloader, &StatusChecker::statusChanged, this, &ServerStatus::StatusChanged);
connect(reloader, &StatusChecker::statusLoading, this, &ServerStatus::StatusReloading); connect(reloader, &StatusChecker::statusLoading, this, &ServerStatus::StatusReloading);
connect(m_statusRefresh, &QAbstractButton::clicked, this, &ServerStatus::reloadStatus); connect(m_statusRefresh, &QAbstractButton::clicked, this, &ServerStatus::reloadStatus);
MMC->statusChecker()->startTimer(60000); m_statusChecker->startTimer(60000);
reloadStatus(); reloadStatus();
} }
} }
@ -55,7 +56,7 @@ ServerStatus::~ServerStatus()
void ServerStatus::reloadStatus() void ServerStatus::reloadStatus()
{ {
MMC->statusChecker()->reloadStatus(); m_statusChecker->reloadStatus();
} }
void ServerStatus::addLine() void ServerStatus::addLine()

2
gui/widgets/ServerStatus.h
View File

@ -8,6 +8,7 @@
class IconLabel; class IconLabel;
class QToolButton; class QToolButton;
class QHBoxLayout; class QHBoxLayout;
class StatusChecker;
class ServerStatus: public QWidget class ServerStatus: public QWidget
{ {
@ -32,4 +33,5 @@ private: /* data */
QIcon goodIcon; QIcon goodIcon;
QIcon yellowIcon; QIcon yellowIcon;
QIcon badIcon; QIcon badIcon;
std::shared_ptr<StatusChecker> m_statusChecker;
}; };