Replace use of "slave" with "proxy" or "follower" everywhere.

2 files changed, 4 insertions, 4 deletions

diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp
index d06de123a4..61227cfe3c 100644
--- a/src/recording/recordingmanager.cpp
+++ b/src/recording/recordingmanager.cpp
@@ -9,7 +9,7 @@
 #include "engine/sidechain/enginesidechain.h"
 #include "engine/sidechain/enginerecord.h"
 #include "control/controlpushbutton.h"
-#include "control/controlobjectslave.h"
+#include "control/controlproxy.h"
 #include "engine/enginemaster.h"
 
 RecordingManager::RecordingManager(UserSettingsPointer pConfig, EngineMaster* pEngine)
@@ -27,7 +27,7 @@ RecordingManager::RecordingManager(UserSettingsPointer pConfig, EngineMaster* pE
     connect(m_pToggleRecording, SIGNAL(valueChanged(double)),
             this, SLOT(slotToggleRecording(double)));
     m_recReadyCO = new ControlObject(ConfigKey(RECORDING_PREF_KEY, "status"));
-    m_recReady = new ControlObjectSlave(m_recReadyCO->getKey(), this);
+    m_recReady = new ControlProxy(m_recReadyCO->getKey(), this);
 
     m_split_size = getFileSplitSize();
 
diff --git a/src/recording/recordingmanager.h b/src/recording/recordingmanager.h
index 3801d0a4a7..f0b0f5b785 100644
--- a/src/recording/recordingmanager.h
+++ b/src/recording/recordingmanager.h
@@ -22,7 +22,7 @@
 
 class EngineMaster;
 class ControlPushButton;
-class ControlObjectSlave;
+class ControlProxy;
 
 class RecordingManager : public QObject
 {
@@ -65,7 +65,7 @@ class RecordingManager : public QObject
 
   private:
     QString formatDateTimeForFilename(QDateTime dateTime) const;
-    ControlObjectSlave* m_recReady;
+    ControlProxy* m_recReady;
     ControlObject* m_recReadyCO;
     ControlPushButton* m_pToggleRecording;