Browse Source

refactor: remove Core::getInstance from SettingsWidget

reviewable/pr6124/r6
sudden6 5 years ago
parent
commit
2809cd91f5
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 4
      src/widget/form/settingswidget.cpp
  2. 3
      src/widget/form/settingswidget.h
  3. 6
      src/widget/widget.cpp

4
src/widget/form/settingswidget.cpp

@ -41,10 +41,10 @@
#include <memory> #include <memory>
SettingsWidget::SettingsWidget(UpdateCheck* updateCheck, IAudioControl& audio, Widget* parent) SettingsWidget::SettingsWidget(UpdateCheck* updateCheck, IAudioControl& audio, Core* core, Widget* parent)
: QWidget(parent, Qt::Window) : QWidget(parent, Qt::Window)
{ {
CoreAV* coreAV = Core::getInstance()->getAv(); CoreAV* coreAV = core->getAv();
IAudioSettings* audioSettings = &Settings::getInstance(); IAudioSettings* audioSettings = &Settings::getInstance();
IVideoSettings* videoSettings = &Settings::getInstance(); IVideoSettings* videoSettings = &Settings::getInstance();
CameraSource& camera = CameraSource::getInstance(); CameraSource& camera = CameraSource::getInstance();

3
src/widget/form/settingswidget.h

@ -28,6 +28,7 @@
#include <memory> #include <memory>
class Camera; class Camera;
class Core;
class GenericForm; class GenericForm;
class GeneralForm; class GeneralForm;
class IAudioControl; class IAudioControl;
@ -43,7 +44,7 @@ class SettingsWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
SettingsWidget(UpdateCheck* updateCheck, IAudioControl& audio, Widget* parent = nullptr); SettingsWidget(UpdateCheck* updateCheck, IAudioControl& audio, Core *core, Widget* parent = nullptr);
~SettingsWidget(); ~SettingsWidget();
bool isShown() const; bool isShown() const;

6
src/widget/widget.cpp

@ -276,16 +276,18 @@ void Widget::init()
filesForm = new FilesForm(); filesForm = new FilesForm();
addFriendForm = new AddFriendForm; addFriendForm = new AddFriendForm;
groupInviteForm = new GroupInviteForm; groupInviteForm = new GroupInviteForm;
core = Nexus::getCore();
#if UPDATE_CHECK_ENABLED #if UPDATE_CHECK_ENABLED
updateCheck = std::unique_ptr<UpdateCheck>(new UpdateCheck(settings)); updateCheck = std::unique_ptr<UpdateCheck>(new UpdateCheck(settings));
connect(updateCheck.get(), &UpdateCheck::updateAvailable, this, &Widget::onUpdateAvailable); connect(updateCheck.get(), &UpdateCheck::updateAvailable, this, &Widget::onUpdateAvailable);
#endif #endif
settingsWidget = new SettingsWidget(updateCheck.get(), audio, this); settingsWidget = new SettingsWidget(updateCheck.get(), audio, core, this);
#if UPDATE_CHECK_ENABLED #if UPDATE_CHECK_ENABLED
updateCheck->checkForUpdate(); updateCheck->checkForUpdate();
#endif #endif
core = Nexus::getCore();
CoreFile* coreFile = core->getCoreFile(); CoreFile* coreFile = core->getCoreFile();
Profile* profile = Nexus::getProfile(); Profile* profile = Nexus::getProfile();
profileInfo = new ProfileInfo(core, profile); profileInfo = new ProfileInfo(core, profile);

Loading…
Cancel
Save