Fix built-in plugin clang warnings

open-ephys · Jul 4, 2024 · 5a3721c · 5a3721c
1 parent 0c4b41f
commit 5a3721c
Show file tree

Hide file tree

Showing 29 changed files with 105 additions and 70 deletions.
diff --git a/Plugins/ArduinoOutput/CMakeLists.txt b/Plugins/ArduinoOutput/CMakeLists.txt
@@ -15,6 +15,8 @@ add_sources(${PLUGIN_NAME}
 	)
 if(MSVC)
 	target_link_libraries(${PLUGIN_NAME} Winmm.lib)
+elseif(APPLE)
+	set_target_properties(${PLUGIN_NAME} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.open-ephys.plugin.ArduinoOutput")
 endif()
 
 if(BUILD_TESTS)

diff --git a/Plugins/ArduinoOutput/serial/ofArduino.cpp b/Plugins/ArduinoOutput/serial/ofArduino.cpp
@@ -466,10 +466,10 @@ bool ofArduino::isInitialized()
 
 // ------------------------------ private functions
 
-void ofArduino::processData (unsigned char inputData)
+void ofArduino::processData(unsigned char inputData)
 {
     char msg[100];
-    sprintf (msg, "Received Byte: %i", inputData);
+    snprintf(msg, sizeof(msg), "Received Byte: %i", inputData);
     //Logger::get("Application").information(msg);
 
     // we have command data
@@ -959,4 +959,4 @@ unsigned long ofArduino::ofGetSystemTimeMicros()
     return timeGetTime() * 1000;
 #endif
 #endif
-}
+}
diff --git a/Plugins/BandpassFilter/CMakeLists.txt b/Plugins/BandpassFilter/CMakeLists.txt
@@ -11,6 +11,11 @@ add_sources(${PLUGIN_NAME}
 	BandpassFilterEditor.cpp
 	BandpassFilterEditor.h
 	)
+
+if(APPLE)
+	set_target_properties(${PLUGIN_NAME} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.open-ephys.plugin.BandpassFilter")
+endif()
+
 if(BUILD_TESTS)
     add_subdirectory(Tests)
 endif()
diff --git a/Plugins/ChannelMap/CMakeLists.txt b/Plugins/ChannelMap/CMakeLists.txt
@@ -15,6 +15,10 @@ add_sources(
   ChannelMapEditor.h
   PrbFormat.h)
 
+if(APPLE)
+  set_target_properties(${PLUGIN_NAME} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.open-ephys.plugin.ChannelMap")
+endif()
+
 if(BUILD_TESTS)
   add_subdirectory(Tests)
 endif()
diff --git a/Plugins/ChannelMap/ChannelMapActions.h b/Plugins/ChannelMap/ChannelMapActions.h
@@ -42,10 +42,10 @@ class MapChannelsAction : public ProcessorAction
     void restoreOwner (GenericProcessor* processor) override;
 
     /** Perform the action*/
-    bool perform();
+    bool perform() override;
 
     /** Undo the action*/
-    bool undo();
+    bool undo() override;
 
     XmlElement* settings;
 
@@ -71,10 +71,10 @@ class EnableChannelAction : public ProcessorAction
     void restoreOwner (GenericProcessor* processor) override;
 
     /** Perform the action*/
-    bool perform();
+    bool perform() override;
 
     /** Undo the action*/
-    bool undo();
+    bool undo() override;
 
     XmlElement* settings;
 
@@ -98,10 +98,10 @@ class ResetStreamAction : public ProcessorAction
     void restoreOwner (GenericProcessor* processor) override;
 
     /** Perform the action*/
-    bool perform();
+    bool perform() override;
 
     /** Undo the action*/
-    bool undo();
+    bool undo() override;
 
     XmlElement* settings;
 
@@ -113,4 +113,4 @@ class ResetStreamAction : public ProcessorAction
     Array<bool> channelStates;
 };
 
-#endif /* ChannelMapActions_h */
+#endif /* ChannelMapActions_h */
diff --git a/Plugins/ChannelMap/ChannelMapEditor.cpp b/Plugins/ChannelMap/ChannelMapEditor.cpp
@@ -317,7 +317,7 @@ void ChannelMapEditor::mouseDrag (const MouseEvent& e)
 
                 dragImage.multiplyAllAlphas (0.6f);
 
-                startDragging (dragDescription, this, dragImage, false);
+                startDragging (dragDescription, this, ScaledImage (dragImage), false);
                 button->setVisible (false);
                 initialDraggedButton = electrodeButtons.indexOf (button);
                 lastHoverButton = initialDraggedButton;

diff --git a/Plugins/CommonAvgRef/CMakeLists.txt b/Plugins/CommonAvgRef/CMakeLists.txt
@@ -12,6 +12,10 @@ add_sources(${PLUGIN_NAME}
 	CommonAvgRefEditor.h
 	)
 
+if(APPLE)
+	set_target_properties(${PLUGIN_NAME} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.open-ephys.plugin.CommonAvgRef")
+endif()
+
 if(BUILD_TESTS)
     add_subdirectory(Tests)
 endif()

diff --git a/Plugins/LfpViewer/CMakeLists.txt b/Plugins/LfpViewer/CMakeLists.txt
@@ -58,6 +58,10 @@ add_sources(${PLUGIN_NAME}
 	ColourSchemes/LightBackgroundColourScheme.h
 	)
 
+if(APPLE)
+	set_target_properties(${PLUGIN_NAME} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.open-ephys.plugin.LfpViewer")
+endif()
+
 if(BUILD_TESTS)
     add_subdirectory(Tests)
 endif()

diff --git a/Plugins/LfpViewer/EventDisplayInterface.h b/Plugins/LfpViewer/EventDisplayInterface.h
@@ -52,10 +52,10 @@ class EventDisplayInterface : public Component,
     ~EventDisplayInterface();
 
     /** Renders the background */
-    void paintOverChildren (Graphics& g);
+    void paintOverChildren (Graphics& g) override;
 
     /** Responds to button presses */
-    void buttonClicked (Button* button);
+    void buttonClicked (Button* button) override;
 
     void resized() override;
 

diff --git a/Plugins/LfpViewer/LfpChannelDisplay.h b/Plugins/LfpViewer/LfpChannelDisplay.h
@@ -193,7 +193,7 @@ class LfpChannelDisplay : public Component
     float depth;
     bool isRecorded;
 
-    Font channelFont;
+    FontOptions channelFont;
 
     Colour lineColour;
 

diff --git a/Plugins/LfpViewer/LfpDisplay.h b/Plugins/LfpViewer/LfpDisplay.h
@@ -60,13 +60,13 @@ class LfpDisplay : public Component,
     Image lfpChannelBitmap;
 
     /** Draws the full channel image */
-    void paint (Graphics& g);
+    void paint (Graphics& g) override;
 
     /** Updates the channel image from the screen buffer*/
     void refresh();
 
     /** Updates the size and location of individual channels*/
-    void resized();
+    void resized() override;
 
     /** Updates the number of displayed channels */
     void setNumChannels (int numChannels);
@@ -84,10 +84,10 @@ class LfpDisplay : public Component,
     void reactivateChannels();
 
     /** Selects channels / switches to single channel mode on double click*/
-    void mouseDown (const MouseEvent& event);
+    void mouseDown (const MouseEvent& event) override;
 
     /** Scrolls the display*/
-    void mouseWheelMove (const MouseEvent& event, const MouseWheelDetails& wheel);
+    void mouseWheelMove (const MouseEvent& event, const MouseWheelDetails& wheel) override;
 
     /** Sets the display range for a particular channel type*/
     void setRange (float range, ContinuousChannel::Type type);

diff --git a/Plugins/LfpViewer/LfpDisplayCanvas.cpp b/Plugins/LfpViewer/LfpDisplayCanvas.cpp
@@ -1113,7 +1113,7 @@ void LfpDisplaySplitter::updateScreenBuffer()
         // std::cout << "Update screen buffer" << std::endl;
 
         int triggerTime = triggerChannel >= 0
-                              ? processor->getLatestTriggerTime (splitID)
+                              ? int(processor->getLatestTriggerTime (splitID))
                               : -1;
 
         int maxSamples = screenBufferWidth;

diff --git a/Plugins/LfpViewer/LfpDisplayNode.cpp b/Plugins/LfpViewer/LfpDisplayNode.cpp
@@ -223,7 +223,7 @@ void LfpDisplayNode::handleTTLEvent (TTLEventPtr event)
     const int eventChannel = event->getLine();
     const uint16 eventStreamId = event->getChannelInfo()->getStreamId();
     const int eventSourceNodeId = event->getChannelInfo()->getSourceNodeId();
-    const int eventTime = event->getSampleNumber() - getFirstSampleNumberForBlock (eventStreamId);
+    const int eventTime = int(event->getSampleNumber() - getFirstSampleNumberForBlock (eventStreamId));
 
     //LOGD("LFP Viewer received: ", eventSourceNodeId, " ", eventId, " ", event->getSampleNumber(), " ", getFirstSampleNumberForBlock(eventStreamId));
 

diff --git a/Plugins/LfpViewer/LfpTimescale.h b/Plugins/LfpViewer/LfpTimescale.h
@@ -86,7 +86,7 @@ class LfpTimescale : public Component,
 
     bool isPaused;
 
-    Font font;
+    FontOptions font;
 
     Array<String> labels;
     Array<bool> isMajor;

diff --git a/Plugins/PhaseDetector/CMakeLists.txt b/Plugins/PhaseDetector/CMakeLists.txt
@@ -12,6 +12,10 @@ add_sources(${PLUGIN_NAME}
 	PhaseDetectorEditor.h
 	)
 
+if(APPLE)
+	set_target_properties(${PLUGIN_NAME} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.open-ephys.plugin.PhaseDetector")
+endif()
+
 if(BUILD_TESTS)
     add_subdirectory(Tests)
 endif()
diff --git a/Plugins/RecordControl/CMakeLists.txt b/Plugins/RecordControl/CMakeLists.txt
@@ -12,6 +12,10 @@ add_sources(${PLUGIN_NAME}
 	RecordControlEditor.h
 	)
 
+if(APPLE)
+	set_target_properties(${PLUGIN_NAME} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.open-ephys.plugin.RecordControl")
+endif()
+
 if(BUILD_TESTS)
     add_subdirectory(Tests)
 endif()
diff --git a/Plugins/SpikeDetector/CMakeLists.txt b/Plugins/SpikeDetector/CMakeLists.txt
@@ -16,6 +16,10 @@ add_sources(${PLUGIN_NAME}
 	SpikeDetectorActions.h
 	)
 
+if(APPLE)
+	set_target_properties(${PLUGIN_NAME} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.open-ephys.plugin.SpikeDetector")
+endif()
+
 if(BUILD_TESTS)
     add_subdirectory(Tests)
 endif()
diff --git a/Plugins/SpikeDetector/PopupConfigurationWindow.h b/Plugins/SpikeDetector/PopupConfigurationWindow.h
@@ -159,10 +159,10 @@ class PopupThresholdComponent : public PopupComponent,
     void createSliders();
 
     /** Responds to slider value changes */
-    void sliderValueChanged (Slider* slider);
+    void sliderValueChanged (Slider* slider) override;
 
     /** Responds to button clicks */
-    void buttonClicked (Button* button);
+    void buttonClicked (Button* button) override;
 
     /** Updates the view */
     void updatePopup() override { repaint(); }
@@ -466,7 +466,7 @@ class PopupConfigurationWindow : public PopupComponent,
     std::unique_ptr<TableListBox> electrodeTable;
 
     /** Listens for viewport scrolling */
-    void scrollBarMoved (ScrollBar* scrollBar, double newRangeStart);
+    void scrollBarMoved (ScrollBar* scrollBar, double newRangeStart) override;
 
 private:
     SpikeDetectorEditor* editor;

diff --git a/Plugins/SpikeDetector/SpikeDetectorActions.h b/Plugins/SpikeDetector/SpikeDetectorActions.h
@@ -53,10 +53,10 @@ class AddSpikeChannels : public ProcessorAction
     void restoreOwner (GenericProcessor* processor) override;
 
     /** Perform the action*/
-    bool perform();
+    bool perform() override;
 
     /** Undo the action*/
-    bool undo();
+    bool undo() override;
 
     XmlElement* settings;
 
@@ -87,10 +87,10 @@ class RemoveSpikeChannels : public ProcessorAction
     void restoreOwner (GenericProcessor* processor) override;
 
     /** Perform the action*/
-    bool perform();
+    bool perform() override;
 
     /** Undo the action*/
-    bool undo();
+    bool undo() override;
 
     std::unique_ptr<XmlElement> settings;
 

diff --git a/Plugins/SpikeViewer/CMakeLists.txt b/Plugins/SpikeViewer/CMakeLists.txt
@@ -18,6 +18,10 @@ add_sources(${PLUGIN_NAME}
 	SpikeDisplayNode.h
 	)
 
+if(APPLE)
+	set_target_properties(${PLUGIN_NAME} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "org.open-ephys.plugin.SpikeViewer")
+endif()
+
 if(BUILD_TESTS)
     add_subdirectory(Tests)
 endif()
diff --git a/Plugins/SpikeViewer/SpikeDisplayCanvas.h b/Plugins/SpikeViewer/SpikeDisplayCanvas.h
@@ -173,10 +173,10 @@ class SpikeDisplayCanvas : public Visualizer,
     void setPlotScaleFactor (float scale);
 
     /** Saves display parameters */
-    void saveCustomParametersToXml (XmlElement* xml);
+    void saveCustomParametersToXml (XmlElement* xml) override;
 
     /** Loads display parameters */
-    void loadCustomParametersFromXml (XmlElement* xml);
+    void loadCustomParametersFromXml (XmlElement* xml) override;
 
     /** Loads spike plot settings */
     void loadSpikeDisplaySettingsFromXml (XmlElement* xml);

diff --git a/Plugins/SpikeViewer/SpikePlots.cpp b/Plugins/SpikeViewer/SpikePlots.cpp
@@ -502,19 +502,19 @@ void GenericAxes::makeLabel (int val, int gain, bool convert, char* s)
         if (abs (val) > 1e6)
         {
             //val = val/(1e6);
-            sprintf (s, "%.2fV", volt);
+            snprintf (s, sizeof(s), "%.2fV", volt);
         }
         else if (abs (val) > 1e3)
         {
             //val = val/(1e3);
-            sprintf (s, "%.2fmV", volt);
+            snprintf (s, sizeof(s), "%.2fmV", volt);
         }
         else
-            sprintf (s, "%.2fuV", volt);
+            snprintf (s, sizeof(s), "%.2fuV", volt);
     }
     else
     {
-        sprintf (s, "%d", (int) val);
+        snprintf (s, sizeof(s), "%d", (int) val);
     }
 }
 
@@ -615,7 +615,7 @@ void WaveAxes::plotSpike (const Spike* s, Graphics& g)
     // sample based upon which channel is getting plotted
     int sampIdx = nSamples * channel;
 
-    int dataSize = s->getChannelInfo()->getDataSize();
+    int dataSize = int( s->getChannelInfo()->getDataSize() );
 
     // prevent crashes when acquisition is not active,
     // or immediately after acquisition starts

diff --git a/Plugins/SpikeViewer/SpikePlots.h b/Plugins/SpikeViewer/SpikePlots.h
@@ -179,7 +179,7 @@ class SpikePlot : public Component,
     void updateAxesPositions();
 
     String name;
-    Font font;
+    FontOptions font;
 
     CriticalSection spikeArrayLock;
 
@@ -228,7 +228,7 @@ class GenericAxes : public Component
 
     const SpikePlotType type;
 
-    Font font;
+    FontOptions font;
 
     Array<Colour> colours;
 
@@ -310,7 +310,7 @@ class WaveAxes : public GenericAxes
 
     int spikesReceivedSinceLastRedraw;
 
-    Font font;
+    FontOptions font;
 
     OwnedArray<Spike> spikeBuffer;