Resolve a compiler warnings and make compiler more strict

Engine/API/Hardware/rhxcontroller.cpp

@@ -160,8 +160,8 @@ bool RHXController::uploadFPGABitfile(const string& filename)
     boardId = dev->GetWireOutValue(WireOutBoardId);
     boardVersion = dev->GetWireOutValue(WireOutBoardVersion);
 
-    cout << "Rhythm configuration file successfully loaded.  Rhythm version number: " <<
-            boardVersion << "\n\n";
+    std::cout << "Rhythm configuration file successfully loaded.  Rhythm version number: " <<
+        boardVersion << "\n" << std::endl;
 
     return true;
 }

Engine/Processing/DataFileReaders/fileperchannelmanager.cpp

@@ -512,7 +512,7 @@ void FilePerChannelManager::updateEndOfData()
     // TODO - polish up to get the actual end of all data, not just assume from end of shortest amp file
     int tempTotalNumSamples = 0;
     for (int stream = 0; stream < info->numDataStreams; ++stream) {
-        for (int channel = 0; channel < amplifierFiles[stream].size(); ++channel) {
+        for (uint channel = 0; channel < amplifierFiles[stream].size(); ++channel) {
             if (amplifierWasSaved[stream][channel]) {
                 int64_t numAmpSamples = amplifierFiles[stream][channel]->fileSize() / 2;
                 if (numAmpSamples < tempTotalNumSamples || tempTotalNumSamples == 0) {

Engine/Processing/DataFileReaders/fileperchannelmanager.h

@@ -49,7 +49,7 @@ class FilePerChannelManager : public DataFileManager
                           DataFileReader* parent);
     ~FilePerChannelManager();
 
-    long readDataBlocksRaw(int numBlocks, uint8_t* buffer);
+    long readDataBlocksRaw(int numBlocks, uint8_t* buffer) override;
     int64_t getLastTimeStamp() override;
     int64_t jumpToTimeStamp(int64_t target) override;
     void loadDataFrame() override;

Engine/Processing/DataFileReaders/traditionalintanfilemanager.cpp

@@ -379,7 +379,7 @@ int64_t TraditionalIntanFileManager::blocksPresent()
 {
     // Should remain accurate even if data file continues growing
     int dataSizeBytes = 0;
-    for (int i = 0; i < consecutiveFiles.size(); i++) {
+    for (uint i = 0; i < consecutiveFiles.size(); i++) {
         dataSizeBytes += QFileInfo(consecutiveFiles[i].fileName).size() - info->headerSizeInBytes;
     }
     return dataSizeBytes / info->bytesPerDataBlock;

Engine/Processing/XPUInterfaces/gpuinterface.cpp

@@ -539,8 +539,12 @@ bool GPUInterface::createKernel(int devIndex)
     state->writeToLog("Completed clCreateContext()");
 
     state->writeToLog("About to call clCreateCommandQueue");
+    cl_queue_properties properties[] = {
+        CL_QUEUE_PROPERTIES,
+        0 // Terminates the list
+    };
     // Create command queue.
-    commandQueue = clCreateCommandQueue(context, id, 0, &ret);
+    commandQueue = clCreateCommandQueueWithProperties(context, id, properties, &ret);
     if (ret != CL_SUCCESS) {
         state->writeToLog("Failure creating OpenCL commandqueue. Ret: " + QString::number(ret));
         gpuErrorMessage("Error creating OpenCL commandqueue. Returned error code: " + QString::number(ret));

Engine/Processing/XPUInterfaces/xpucontroller.cpp

@@ -32,9 +32,9 @@
 
 XPUController::XPUController(SystemState *state_, bool useOpenCL_, QObject *parent) :
     QObject(parent),
+    useOpenCL(useOpenCL_),
     state(state_),
-    usedXPUIndex(-1),
-    useOpenCL(useOpenCL_)
+    usedXPUIndex(-1)
 {
     state->writeToLog("Entered XPUController ctor");
     connect(state, SIGNAL(stateChanged()), this, SLOT(updateFromState()));
@@ -126,7 +126,11 @@ void XPUController::updateFromState()
     if (state->usedXPUIndex() != usedXPUIndex) {
         activeInterface->cleanupMemory();
         usedXPUIndex = state->usedXPUIndex();
-        activeInterface = (usedXPUIndex == 0) ? activeInterface = cpuInterface : activeInterface = gpuInterface;
+        if (usedXPUIndex == 0) {
+            activeInterface = cpuInterface;
+        } else {
+            activeInterface = gpuInterface;
+        }
         activeInterface->setupMemory();
     }
     activeInterface->updateFromState();

Engine/Processing/commandparser.cpp

@@ -33,8 +33,8 @@
 
 CommandParser::CommandParser(SystemState* state_, ControllerInterface *controllerInterface_, QObject *parent) :
     QObject(parent),
-    controllerInterface(controllerInterface_),
     controlWindow(nullptr),
+    controllerInterface(controllerInterface_),
     state(state_)
 {
     // These connections allow for interactions with communicators that may live in another thread
@@ -871,6 +871,8 @@ QString CommandParser::validateStimParams(StimParameters *stimParams) const
         if (stimParams->pulseTrainPeriod->getValue() < stimDuration)
             return "PulseTrainPeriodMicroseconds cannot be less than total pulse duration (sum of all phases used for this Shape)";
 
+        break;
+
     case BoardDacSignal:
         // PulseTrainPeriod cannot be less than stimDuration (which depends on Shape)
         // Biphasic: stimDuration = FirstPhaseDuration + SecondPhaseDuration
@@ -888,11 +890,15 @@ QString CommandParser::validateStimParams(StimParameters *stimParams) const
         if (stimParams->pulseTrainPeriod->getValue() < stimDuration)
             return "PulseTrainPeriodMicroseconds cannot be less than total pulse duration (sum of all phases used for this Shape)";
 
+        break;
+
     case BoardDigitalOutSignal:
         // PulseTrainPeriod cannot be less than FirstPhaseDuration
         if (stimParams->pulseTrainPeriod->getValue() < stimParams->firstPhaseDuration->getValue())
             return "PulseTrainPeriodMicroseconds cannot be less than pulse duration (FirstPhaseDurationMicroseconds)";
 
+        break;
+
     default:
         break;
     }

Engine/Processing/controllerinterface.cpp

@@ -298,7 +298,7 @@ int ControllerInterface::scanPorts(vector<ChipType> &chipType, vector<int> &port
                                                         state->previousDelaySelectedPort->getValue(),
                                                         state->lastDetectedChip->getValue());
 
-    for (int i = 0; i < chipType.size(); i++) {
+    for (uint i = 0; i < chipType.size(); i++) {
         if (chipType[i] != NoChip) {
             state->lastDetectedChip->setValue((int) chipType[i]);
             break;

Engine/Processing/softwarereferenceprocessor.cpp

@@ -342,7 +342,7 @@ void SoftwareReferenceProcessor::readReferenceSamples(vector<StreamChannelPair>
 {
     const uint16_t* pRead;
 
-    for (int i = 0; i < addresses.size(); ++i) {
+    for (uint i = 0; i < addresses.size(); ++i) {
         pRead = start;
         pRead += 6; // Skip header and timestamp.
         pRead += misoWordSize * (numDataStreams * 3);  // Skip auxiliary channels.

Engine/Processing/stateitem.h

@@ -142,7 +142,7 @@ class StateFilenameItem : public StateItem
     bool isValid() const { return !path.isEmpty() && !baseFilename.isEmpty(); }
     QString getFullFilename() const { return isValid() ? path + "/" + baseFilename : ""; }
 
-    QString getValidValues() const { return "Path: [path/to/file], BaseFilename: [filename.rhx]"; }
+    QString getValidValues() const override { return "Path: [path/to/file], BaseFilename: [filename.rhx]"; }
 
 private:
     QString path;

Engine/Processing/waveformfifo.cpp

@@ -35,12 +35,12 @@
 #include "waveformfifo.h"
 
 WaveformFifo::WaveformFifo(SignalSources *signalSources_, int bufferSizeInDataBlocks_, int memorySizeInDataBlocks_, int maxWriteSizeInDataBlocks_, SystemState* state_) :
+    state(state_),
     signalSources(signalSources_),
     bufferSizeInDataBlocks(bufferSizeInDataBlocks_),
     memorySizeInDataBlocks(memorySizeInDataBlocks_),
     maxWriteSizeInDataBlocks(maxWriteSizeInDataBlocks_),
-    numReaders(NumberOfReaders),
-    state(state_)
+    numReaders(NumberOfReaders)
 {
     if (numReaders < 1) {
         cerr << "WaveformFifo constructor: numReaders must be one or greater." << '\n';
@@ -64,7 +64,7 @@ WaveformFifo::WaveformFifo(SignalSources *signalSources_, int bufferSizeInDataBl
     bufferAllocateSize = bufferSize + maxWriteSizeInSamples;
     bufferAllocateSizeInBlocks = bufferSizeInDataBlocks + maxWriteSizeInDataBlocks;
 
-    usedWordsNewData = new Semaphore [numReaders];
+    usedWordsNewData = new Semaphore[numReaders];
     bufferReadIndex.resize(numReaders);
     bufferMemoryIndex.resize(numReaders);
     numWordsToBeRead.resize(numReaders);

Engine/Processing/waveformfifo.h

@@ -36,7 +36,6 @@
 #include <map>
 #include <vector>
 #include <mutex>
-#include "rhxglobals.h"
 #include "semaphore.h"
 #include "minmax.h"
 #include "signalsources.h"
@@ -76,7 +75,7 @@ const uint8_t SpikeIdLikelyArtifact = 0x80u;
 class WaveformFifo
 {
 public:
-    enum Reader {
+    enum Reader : uint {
         ReaderDisplay = 0,
         ReaderDisk,
         ReaderAudio,

Engine/Processing/xmlinterface.cpp

@@ -517,7 +517,7 @@ bool XMLInterface::checkConsistentChannels(const QByteArray &byteArray, QString
                             errorMessage.append("\n");
                         }
                         errorMessage.append("Warning: The following channels are currently detected by the Intan controller but are not included in the settings file:");
-                        for (int i = 0; i < uninitializedChannels.size(); ++i) {
+                        for (uint i = 0; i < uninitializedChannels.size(); ++i) {
                             errorMessage.append("\n" + QString::fromStdString(uninitializedChannels[i]));
                         }
                     }
@@ -576,7 +576,7 @@ bool XMLInterface::checkConsistentChannels(const QByteArray &byteArray, QString
 vector<string> XMLInterface::findUninitializedChannels(vector<string> allChannels, vector<bool> channelsInitializedFromXML) const
 {
     vector<string> uninitializedChannels;
-    for (int i = 0; i < allChannels.size(); ++i) {
+    for (uint i = 0; i < allChannels.size(); ++i) {
         if (!channelsInitializedFromXML[i]) {
             uninitializedChannels.push_back(allChannels[i]);
         }

Engine/Threads/tcpdataoutputthread.cpp

@@ -34,6 +34,7 @@ TCPDataOutputThread::TCPDataOutputThread(WaveformFifo *waveformFifo_, const doub
     QThread(parent),
     tcpWaveformDataCommunicator(state_->tcpWaveformDataCommunicator),
     tcpSpikeDataCommunicator(state_->tcpSpikeDataCommunicator),
+    previousSample(nullptr),
     waveformFifo(waveformFifo_),
     signalSources(state_->signalSources),
     sampleRate(sampleRate_),
@@ -42,8 +43,7 @@ TCPDataOutputThread::TCPDataOutputThread(WaveformFifo *waveformFifo_, const doub
     stopThread(false),
     parentObject(parent),
     connected(false),
-    state(state_),
-    previousSample(nullptr)
+    state(state_)
 {
 }
 

GUI/Dialogs/advancedstartupdialog.cpp

@@ -16,11 +16,11 @@ AdvancedStartupDialog::AdvancedStartupDialog(bool &useOpenCL_, uint8_t &playback
     playbackFCheckBox(nullptr),
     playbackGCheckBox(nullptr),
     playbackHCheckBox(nullptr),
-    playbackPorts(&playbackPorts_),
-    demoMode(demoMode_),
     buttonBox(nullptr),
     useOpenCL(&useOpenCL_),
-    tempUseOpenCL(useOpenCL_)
+    tempUseOpenCL(useOpenCL_),
+    playbackPorts(&playbackPorts_),
+    demoMode(demoMode_)
 {
     useOpenCLDescription = new QLabel(tr(
         "OpenCL is a platform-independent framework that allows the CPU to\n"

GUI/Dialogs/advancedstartupdialog.h

@@ -17,7 +17,7 @@ class AdvancedStartupDialog : public QDialog
     static uint8_t portsBoolToInt(QVector<bool> portsBool);
 
 public slots:
-    void accept();
+    void accept() override;
 
 private slots:
     void changeUseOpenCL(bool use);

GUI/Dialogs/anoutdialog.h

@@ -55,7 +55,7 @@ class AnOutDialog : public QDialog
     void loadParameters(StimParameters* parameters);
 
 public slots:
-    void accept();
+    void accept() override;
     void notifyFocusChanged(QWidget *lostFocus, QWidget *gainedFocus);
 
 private:

GUI/Dialogs/boardselectdialog.cpp

@@ -369,8 +369,6 @@ BoardSelectDialog::BoardSelectDialog(QWidget *parent) :
     openButton(nullptr),
     playbackButton(nullptr),
     advancedButton(nullptr),
-    useOpenCL(true),
-    playbackPorts(255),
     defaultSampleRateCheckBox(nullptr),
     defaultSettingsFileCheckBox(nullptr),
     splash(nullptr),
@@ -380,7 +378,9 @@ BoardSelectDialog::BoardSelectDialog(QWidget *parent) :
     state(nullptr),
     controllerInterface(nullptr),
     parser(nullptr),
-    controlWindow(nullptr)
+    controlWindow(nullptr),
+    useOpenCL(true),
+    playbackPorts(255)
 {
     // Information used by QSettings to save basic settings across sessions.
     QCoreApplication::setOrganizationName(OrganizationName);

GUI/Dialogs/digoutdialog.h

@@ -54,7 +54,7 @@ class DigOutDialog : public QDialog
     void loadParameters(StimParameters* parameters);
 
 public slots:
-    void accept();
+    void accept() override;
     void notifyFocusChanged(QWidget *lostFocus, QWidget *gainedFocus);
 
 private:

GUI/Dialogs/stimparamdialog.h

@@ -57,7 +57,7 @@ class StimParamDialog : public QDialog
     void activate();
 
 public slots:
-    void accept();
+    void accept() override;
 
 private slots:
     void notifyFocusChanged(QWidget* lostFocus, QWidget* gainedFocus);

GUI/Widgets/abstractpanel.cpp

@@ -32,10 +32,10 @@ void ColorWidget::setColor(QColor color)
 }
 
 AbstractPanel::AbstractPanel(ControllerInterface* controllerInterface_, SystemState* state_, CommandParser* parser_, ControlWindow *parent) :
-    controlWindow(parent),
-    controllerInterface(controllerInterface_),
     state(state_),
     parser(parser_),
+    controlWindow(parent),
+    controllerInterface(controllerInterface_),
     filterDisplaySelector(nullptr),
     tabWidget(nullptr),
     configureTab(nullptr),

GUI/Widgets/anoutfigure.h

@@ -40,7 +40,7 @@ class AnOutFigure : public AbstractFigure
     Q_OBJECT
 public:
     explicit AnOutFigure(StimParameters* stimParameters, QWidget *parent = nullptr);
-    void uniqueRedraw(QPainter &painter);
+    void uniqueRedraw(QPainter &painter) override;
 
 public slots:
     void updateMonophasicAndPositive(bool logicValue);
@@ -51,8 +51,8 @@ public slots:
     void highlightBaselineVoltage(bool highlight);
 
 private:
-    QSize sizeHint() const;
-    QSize minimumSizeHint() const;
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
     bool localMonophasicAndPositive;
     QColor oldColor;
 };

GUI/Widgets/controlpanel.cpp

@@ -28,9 +28,6 @@
 //
 //------------------------------------------------------------------------------
 
-#include "stimparamdialog.h"
-#include "anoutdialog.h"
-#include "digoutdialog.h"
 #include "controlpanelbandwidthtab.h"
 #include "controlpanelimpedancetab.h"
 #include "controlpanelaudioanalogtab.h"
@@ -182,6 +179,8 @@ QString ControlPanel::currentTabName() const
     } else {
         qDebug() << "Unrecognized tab widget.";
     }
+
+    return QString();
 }
 
 QHBoxLayout* ControlPanel::createSelectionLayout()

GUI/Widgets/controlpanelconfiguretab.cpp

@@ -37,13 +37,13 @@
 ControlPanelConfigureTab::ControlPanelConfigureTab(ControllerInterface* controllerInterface_, SystemState* state_,
                                                    CommandParser* parser_, QWidget *parent) :
     QWidget(parent),
+    fastSettleCheckBox(nullptr),
     state(state_),
     parser(parser_),
     controllerInterface(controllerInterface_),
     scanButton(nullptr),
     setCableDelayButton(nullptr),
     digOutButton(nullptr),
-    fastSettleCheckBox(nullptr),
     externalFastSettleCheckBox(nullptr),
     externalFastSettleSpinBox(nullptr),
     note1LineEdit(nullptr),

GUI/Widgets/digfigure.h

@@ -40,11 +40,11 @@ class DigFigure : public AbstractFigure
     Q_OBJECT
 public:
     explicit DigFigure(StimParameters* stimParameters, QWidget* parent = nullptr);
-    void uniqueRedraw(QPainter &painter);
+    void uniqueRedraw(QPainter &painter) override;
 
 private:
-    QSize sizeHint() const;
-    QSize minimumSizeHint() const;
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
 };