From c31d41e161b4c2a7e26e3564c6e323c1e2787e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Sat, 6 May 2017 20:34:03 +0200 Subject: Fix FreeBSD compile error. --- plugingui/maintab.cc | 2 +- plugingui/resamplingframecontent.cc | 3 +-- plugingui/resamplingframecontent.h | 6 +----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/plugingui/maintab.cc b/plugingui/maintab.cc index 503a0a1..aeb34b6 100644 --- a/plugingui/maintab.cc +++ b/plugingui/maintab.cc @@ -38,7 +38,7 @@ MainTab::MainTab(Widget* parent, , statusframe_content{this, settings_notifier} , humanizerframe_content{this, settings, settings_notifier} , diskstreamingframe_content{this, settings, settings_notifier} - , resamplingframe_content{this, settings, settings_notifier} + , resamplingframe_content{this, settings_notifier} , settings(settings) , settings_notifier(settings_notifier) { diff --git a/plugingui/resamplingframecontent.cc b/plugingui/resamplingframecontent.cc index 1f752d3..92102e3 100644 --- a/plugingui/resamplingframecontent.cc +++ b/plugingui/resamplingframecontent.cc @@ -32,9 +32,8 @@ namespace GUI { ResamplingframeContent::ResamplingframeContent( - Widget* parent, Settings& settings, SettingsNotifier& settings_notifier) + Widget* parent, SettingsNotifier& settings_notifier) : Widget(parent) - , settings(settings) , settings_notifier(settings_notifier) { CONNECT(this, settings_notifier.drumkit_samplerate, diff --git a/plugingui/resamplingframecontent.h b/plugingui/resamplingframecontent.h index e98e09b..b45f1ee 100644 --- a/plugingui/resamplingframecontent.h +++ b/plugingui/resamplingframecontent.h @@ -29,7 +29,6 @@ #include "widget.h" #include "textedit.h" -struct Settings; class SettingsNotifier; namespace GUI @@ -39,9 +38,7 @@ class ResamplingframeContent : public Widget { public: - ResamplingframeContent(Widget* parent, - Settings& settings, - SettingsNotifier& settings_notifier); + ResamplingframeContent(Widget* parent, SettingsNotifier& settings_notifier); // From Widget virtual void resize(std::size_t width, std::size_t height) override; @@ -55,7 +52,6 @@ public: private: TextEdit text_field{this}; - Settings& settings; SettingsNotifier& settings_notifier; std::string drumkit_samplerate; -- cgit v1.2.3