Revert renaming of send(QByteArray) to sendByteArray

12 files changed, 16 insertions, 16 deletions

diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp
index cec7c93e3a..bc4e0cf187 100644
--- a/src/controllers/bulk/bulkcontroller.cpp
+++ b/src/controllers/bulk/bulkcontroller.cpp
@@ -238,10 +238,10 @@ void BulkController::send(QList<int> data, unsigned int length) {
     foreach (int datum, data) {
         temp.append(datum);
     }
-    sendByteArray(temp);
+    send(temp);
 }
 
-void BulkController::sendByteArray(QByteArray data) {
+void BulkController::send(QByteArray data) {
     int ret;
     int transferred;
 
diff --git a/src/controllers/bulk/bulkcontroller.h b/src/controllers/bulk/bulkcontroller.h
index 33dbd20f4e..6b2a2f5b67 100644
--- a/src/controllers/bulk/bulkcontroller.h
+++ b/src/controllers/bulk/bulkcontroller.h
@@ -78,7 +78,7 @@ class BulkController : public Controller {
   private:
     // For devices which only support a single report, reportID must be set to
     // 0x0.
-    void sendByteArray(QByteArray data) override;
+    void send(QByteArray data) override;
 
     // Returns a pointer to the currently loaded controller preset. For internal
     // use only.
diff --git a/src/controllers/controller.cpp b/src/controllers/controller.cpp
index ded35d3aff..ebf9b4ca3e 100644
--- a/src/controllers/controller.cpp
+++ b/src/controllers/controller.cpp
@@ -98,7 +98,7 @@ void Controller::send(QList<int> data, unsigned int length) {
     for (unsigned int i = 0; i < length; ++i) {
         msg[i] = data.at(i);
     }
-    sendByteArray(msg);
+    send(msg);
 }
 
 void Controller::triggerActivity()
diff --git a/src/controllers/controller.h b/src/controllers/controller.h
index a0e8364fc6..5df89a0f12 100644
--- a/src/controllers/controller.h
+++ b/src/controllers/controller.h
@@ -101,6 +101,10 @@ class Controller : public QObject, ConstControllerPresetVisitor {
     // were required to specify it.
     virtual void send(QList<int> data, unsigned int length = 0);
 
+    // This must be reimplemented by sub-classes desiring to send raw bytes to a
+    // controller.
+    virtual void send(QByteArray data) = 0;
+
     // To be called in sub-class' open() functions after opening the device but
     // before starting any input polling/processing.
     void startEngine();
@@ -146,10 +150,6 @@ class Controller : public QObject, ConstControllerPresetVisitor {
     }
 
   private:
-    // This must be reimplemented by sub-classes desiring to send raw bytes to a
-    // controller.
-    virtual void sendByteArray(QByteArray data) = 0;
-
     // Returns a pointer to the currently loaded controller preset. For internal
     // use only.
     virtual ControllerPreset* preset() = 0;
diff --git a/src/controllers/hid/hidcontroller.cpp b/src/controllers/hid/hidcontroller.cpp
index 276e39e76c..23c55cfaa1 100644
--- a/src/controllers/hid/hidcontroller.cpp
+++ b/src/controllers/hid/hidcontroller.cpp
@@ -309,7 +309,7 @@ void HidController::send(QList<int> data, unsigned int length, unsigned int repo
     send(temp, reportID);
 }
 
-void HidController::sendByteArray(QByteArray data) {
+void HidController::send(QByteArray data) {
     send(data, 0);
 }
 
diff --git a/src/controllers/hid/hidcontroller.h b/src/controllers/hid/hidcontroller.h
index e10c62549a..31d4659e25 100644
--- a/src/controllers/hid/hidcontroller.h
+++ b/src/controllers/hid/hidcontroller.h
@@ -84,7 +84,7 @@ class HidController final : public Controller {
   private:
     // For devices which only support a single report, reportID must be set to
     // 0x0.
-    void sendByteArray(QByteArray data) override;
+    void send(QByteArray data) override;
     void virtual send(QByteArray data, unsigned int reportID);
 
     // Returns a pointer to the currently loaded controller preset. For internal
diff --git a/src/controllers/midi/hss1394controller.cpp b/src/controllers/midi/hss1394controller.cpp
index 87d2ff270c..ff8a7ae1c4 100644
--- a/src/controllers/midi/hss1394controller.cpp
+++ b/src/controllers/midi/hss1394controller.cpp
@@ -185,7 +185,7 @@ void Hss1394Controller::sendShortMsg(unsigned char status, unsigned char byte1,
     //}
 }
 
-void Hss1394Controller::sendByteArray(QByteArray data) {
+void Hss1394Controller::send(QByteArray data) {
     int bytesSent = m_pChannel->SendChannelBytes(
         (unsigned char*)data.constData(), data.size());
 
diff --git a/src/controllers/midi/hss1394controller.h b/src/controllers/midi/hss1394controller.h
index 5770d5f272..ec6e550309 100644
--- a/src/controllers/midi/hss1394controller.h
+++ b/src/controllers/midi/hss1394controller.h
@@ -57,7 +57,7 @@ class Hss1394Controller : public MidiController {
   private:
     // The sysex data must already contain the start byte 0xf0 and the end byte
     // 0xf7.
-    void sendByteArray(QByteArray data) override;
+    void send(QByteArray data) override;
 
     hss1394::TNodeInfo m_deviceInfo;
     int m_iDeviceIndex;
diff --git a/src/controllers/midi/portmidicontroller.cpp b/src/controllers/midi/portmidicontroller.cpp
index 8957a007b1..c4479a1ae6 100644
--- a/src/controllers/midi/portmidicontroller.cpp
+++ b/src/controllers/midi/portmidicontroller.cpp
@@ -230,7 +230,7 @@ void PortMidiController::sendShortMsg(unsigned char status, unsigned char byte1,
     }
 }
 
-void PortMidiController::sendByteArray(QByteArray data) {
+void PortMidiController::send(QByteArray data) {
     // PortMidi does not receive a length argument for the buffer we provide to
     // Pm_WriteSysEx. Instead, it scans for a MIDI_EOX byte to know when the
     // message is over. If one is not provided, it will overflow the buffer and
diff --git a/src/controllers/midi/portmidicontroller.h b/src/controllers/midi/portmidicontroller.h
index 119fa960d3..96da9afce1 100644
--- a/src/controllers/midi/portmidicontroller.h
+++ b/src/controllers/midi/portmidicontroller.h
@@ -78,7 +78,7 @@ class PortMidiController : public MidiController {
   private:
     // The sysex data must already contain the start byte 0xf0 and the end byte
     // 0xf7.
-    void sendByteArray(QByteArray data) override;
+    void send(QByteArray data) override;
 
     bool isPolling() const override {
         return true;
diff --git a/src/test/controller_preset_validation_test.cpp b/src/test/controller_preset_validation_test.cpp
index d2e619ce5b..32145f3df6 100644
--- a/src/test/controller_preset_validation_test.cpp
+++ b/src/test/controller_preset_validation_test.cpp
@@ -89,7 +89,7 @@ class FakeController : public Controller {
     }
 
   private:
-    void sendByteArray(QByteArray data) override {
+    void send(QByteArray data) override {
         Q_UNUSED(data);
     }
     virtual void send(QByteArray data, unsigned int reportID) {
diff --git a/src/test/midicontrollertest.cpp b/src/test/midicontrollertest.cpp
index e8edeaab10..696483c05f 100644
--- a/src/test/midicontrollertest.cpp
+++ b/src/test/midicontrollertest.cpp
@@ -20,7 +20,7 @@ class MockMidiController : public MidiController {
     MOCK_METHOD3(sendShortMsg, void(unsigned char status,
                                     unsigned char byte1,
                                     unsigned char byte2));
-    MOCK_METHOD1(sendByteArray, void(QByteArray data));
+    MOCK_METHOD1(send, void(QByteArray data));
     MOCK_CONST_METHOD0(isPolling, bool());
 };