From e947c13525ddeb82ae70537528f87ee3b556dca3 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sat, 24 Sep 2016 15:10:56 +0300 Subject: [PATCH] Remove alternative constructor for SourcesEditor --- src/UserInterface/SourcesEditor.cpp | 11 +---------- src/UserInterface/SourcesEditor.h | 5 ----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/UserInterface/SourcesEditor.cpp b/src/UserInterface/SourcesEditor.cpp index 74c6332..33c3a87 100644 --- a/src/UserInterface/SourcesEditor.cpp +++ b/src/UserInterface/SourcesEditor.cpp @@ -5,8 +5,7 @@ namespace piMapper { SourcesEditor::SourcesEditor(){ init(); - // Create new MediaServer instance, - // we will need to clear this in the deconstr + mediaServer = new MediaServer(); isMediaServerExternal = false; addMediaServerListeners(); @@ -21,14 +20,6 @@ void SourcesEditor::init(){ isMediaServerExternal = false; } -SourcesEditor::SourcesEditor(MediaServer * externalMediaServer){ - init(); - // Assign external MediaServer instance pointer - mediaServer = externalMediaServer; - isMediaServerExternal = true; - addMediaServerListeners(); -} - SourcesEditor::~SourcesEditor(){ //unregisterAppEvents(); delete imageSelector; diff --git a/src/UserInterface/SourcesEditor.h b/src/UserInterface/SourcesEditor.h index f643ab2..a9eb351 100644 --- a/src/UserInterface/SourcesEditor.h +++ b/src/UserInterface/SourcesEditor.h @@ -13,12 +13,7 @@ namespace piMapper { class SourcesEditor { public: - // Default contructor that initializes media server locally, - // thus requiring to delete the media server from memory on deconstr SourcesEditor(); - - // Alternative constructor that allows to assign external media server - SourcesEditor(MediaServer * externalMediaServer); ~SourcesEditor(); void setup();