diff --git a/Source/Plugins/NetworkEvents/NetworkEvents.cpp b/Source/Plugins/NetworkEvents/NetworkEvents.cpp index 0dcfa935322079232e0d4e0a35be12e6a0195b65..0982e85d85acd260b2329ba808304b55f513da87 100644 --- a/Source/Plugins/NetworkEvents/NetworkEvents.cpp +++ b/Source/Plugins/NetworkEvents/NetworkEvents.cpp @@ -298,7 +298,7 @@ void NetworkEvents::postTimestamppedStringToMidiBuffer(StringTS s, MidiBuffer& e (uint8) s.len+1,//+8, msg_with_ts); - delete msg_with_ts; + delete[] msg_with_ts; } void NetworkEvents::simulateStopRecord() @@ -594,7 +594,7 @@ void NetworkEvents::run() zmq_close(responder); - delete buffer; + delete[] buffer; threadRunning = false; return; #endif diff --git a/Source/Plugins/SpikeSorter/SpikeSortBoxes.cpp b/Source/Plugins/SpikeSorter/SpikeSortBoxes.cpp index 835c972e47685d400b612d3151904d45a31126c0..6158a63fa29e45212bb1ab8656e6054e83e9e9c7 100644 --- a/Source/Plugins/SpikeSorter/SpikeSortBoxes.cpp +++ b/Source/Plugins/SpikeSorter/SpikeSortBoxes.cpp @@ -2029,7 +2029,7 @@ void PCAjob::computeCov() cov[j][i] = sum / (dim-1); } } - delete mean; + delete[] mean; // delete covariances //for (int k = 0; k < dim; k++) diff --git a/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp b/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp index f2e842cda2573d009c5b8cfcfcd152a089126f4e..cc87903c33c9797b58dce989e256fa5f7c66161e 100644 --- a/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp +++ b/Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp @@ -1437,10 +1437,10 @@ void AudioInterface::paint(Graphics& g) // Clock Divider options ClockDivideInterface::ClockDivideInterface(RHD2000Thread* board_, RHD2000Editor* editor_) : - board(board_) - , editor(editor_) - , name("Clock Divider") + name("Clock Divider") , lastDivideRatioString("1") + , board(board_) + , editor(editor_) , actualDivideRatio(1) { diff --git a/Source/Processors/Editors/ChannelSelector.cpp b/Source/Processors/Editors/ChannelSelector.cpp index 6caf21b16e690bfc83dfc596f8cbe530dbd5e9a6..70d4cdec49b7ad7a4a146beb9b9b991845cf823f 100755 --- a/Source/Processors/Editors/ChannelSelector.cpp +++ b/Source/Processors/Editors/ChannelSelector.cpp @@ -684,7 +684,7 @@ void ChannelSelector::buttonClicked(Button* button) selectButtonParam->removeListener(this); deselectButtonParam->removeListener(this); std::vector<int> getBoxList; - int fa, lim, comd, i, j; + int fa, lim, comd, i; getBoxList = paramBox->getBoxInfo(parameterButtons.size()); if (getBoxList.size() < 3) { @@ -712,7 +712,7 @@ void ChannelSelector::buttonClicked(Button* button) selectButtonRecord->removeListener(this); deselectButtonRecord->removeListener(this); std::vector<int> getBoxList; - int fa, lim, comd, i, j; + int fa, lim, comd, i; getBoxList = recordBox->getBoxInfo(recordButtons.size()); if (getBoxList.size() < 3) { @@ -740,7 +740,7 @@ void ChannelSelector::buttonClicked(Button* button) selectButtonAudio->removeListener(this); deselectButtonAudio->removeListener(this); std::vector<int> getBoxList; - int fa, lim, comd, i, j; + int fa, lim, comd, i; getBoxList = audioBox->getBoxInfo(audioButtons.size()); if (getBoxList.size() < 3) { @@ -768,7 +768,7 @@ void ChannelSelector::buttonClicked(Button* button) selectButtonParam->removeListener(this); deselectButtonParam->removeListener(this); std::vector<int> getBoxList; - int fa, lim, comd, i, j; + int fa, lim, comd, i; getBoxList = paramBox->getBoxInfo(parameterButtons.size()); if (getBoxList.size() < 3) { @@ -796,7 +796,7 @@ void ChannelSelector::buttonClicked(Button* button) selectButtonRecord->removeListener(this); deselectButtonRecord->removeListener(this); std::vector<int> getBoxList; - int fa, lim, comd, i, j; + int fa, lim, comd, i; getBoxList = recordBox->getBoxInfo(recordButtons.size()); if (getBoxList.size() < 3) { @@ -824,7 +824,7 @@ void ChannelSelector::buttonClicked(Button* button) selectButtonAudio->removeListener(this); deselectButtonAudio->removeListener(this); std::vector<int> getBoxList; - int fa, lim, comd, i, j; + int fa, lim, comd, i; getBoxList = audioBox->getBoxInfo(audioButtons.size()); if (getBoxList.size() < 3) { @@ -1239,7 +1239,7 @@ ChannelSelectorBox::~ChannelSelectorBox() int ChannelSelectorBox::convertToInteger(std::string s) { char ar[20]; - int i, j, k = 0; + int i, k = 0; for (i = 0; i < s.size(); i++) { if (s[i] >= 48 && s[i] <= 57)