Merge b8bbf9d into 134632d

opencor · Aug 4, 2018 · 97e96cf · 97e96cf
2 parents 134632d + b8bbf9d
commit 97e96cf
Show file tree

Hide file tree

Showing 149 changed files with 995 additions and 866 deletions.
diff --git a/src/checkforupdatesdialog.cpp b/src/checkforupdatesdialog.cpp
@@ -218,15 +218,15 @@ CheckForUpdatesDialog::CheckForUpdatesDialog(QSettings *pSettings,
 CheckForUpdatesDialog::CheckForUpdatesDialog(QSettings *pSettings,
                                              const QString &pApplicationDate,
                                              QWidget *pParent) :
-    CheckForUpdatesDialog(pSettings, pApplicationDate, 0, pParent)
+    CheckForUpdatesDialog(pSettings, pApplicationDate, nullptr, pParent)
 {
 }
 
 //==============================================================================
 
 CheckForUpdatesDialog::CheckForUpdatesDialog(QSettings *pSettings,
                                              CheckForUpdatesEngine *pEngine) :
-    CheckForUpdatesDialog(pSettings, QString(), pEngine, 0)
+    CheckForUpdatesDialog(pSettings, QString(), pEngine, nullptr)
 {
 }
 

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -90,12 +90,12 @@ MainWindow::MainWindow(const QString &pApplicationDate) :
     mLoadedGuiPlugins(Plugins()),
     mLoadedPreferencesPlugins(Plugins()),
     mLoadedWindowPlugins(Plugins()),
-    mCoreInterface(0),
+    mCoreInterface(nullptr),
     mRawLocale(QString()),
     mMenus(QMap<QString, QMenu *>()),
-    mFileNewMenu(0),
-    mViewWindowsMenu(0),
-    mViewSeparator(0),
+    mFileNewMenu(nullptr),
+    mViewWindowsMenu(nullptr),
+    mViewSeparator(nullptr),
     mDockedWindowsVisible(true),
     mDockedWindowsState(QByteArray())
 {
@@ -492,8 +492,11 @@ void MainWindow::registerOpencorUrlScheme()
         exec("xdg-mime", QStringList() << "default" << "opencor.desktop" << "x-scheme-handler/opencor");
     }
 #elif defined(Q_OS_MAC)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
     LSSetDefaultHandlerForURLScheme(CFSTR("opencor"),
                                     CFBundleGetIdentifier(CFBundleGetMainBundle()));
+#pragma clang diagnostic pop
 #else
     #error Unsupported platform
 #endif
@@ -556,7 +559,7 @@ void MainWindow::initializeGuiPlugin(Plugin *pPlugin)
         for (int i = guiMenuActions.count()-1; i >= 0; --i) {
             // Insert the action/separator to the right menu, if any
 
-            QMenu *menu = 0;
+            QMenu *menu = nullptr;
 
             if (guiMenuActions[i].type() == Gui::MenuAction::File)
                 menu = mGui->menuFile;

diff --git a/src/misc/cliapplication.cpp b/src/misc/cliapplication.cpp
@@ -44,7 +44,7 @@ namespace OpenCOR {
 //==============================================================================
 
 CliApplication::CliApplication(int &pArgC, char **pArgV) :
-    mPluginManager(0),
+    mPluginManager(nullptr),
     mLoadedPluginPlugins(Plugins()),
     mLoadedCliPlugins(Plugins())
 {

diff --git a/src/misc/cliutils.cpp b/src/misc/cliutils.cpp
@@ -49,10 +49,13 @@ namespace OpenCOR {
 
 //==============================================================================
 
-QtMessageHandler defaultMessageHandler;
+#ifdef QT_DEBUG
+static QtMessageHandler gDefaultMessageHandler;
+#endif
 
 //==============================================================================
 
+#ifdef QT_DEBUG
 void messageHandler(QtMsgType pType, const QMessageLogContext &pContext,
                      const QString &pMessage)
 {
@@ -63,8 +66,9 @@ void messageHandler(QtMsgType pType, const QMessageLogContext &pContext,
     //       hence our filtering it out...
 
     if (pMessage.compare("libpng warning: iCCP: known incorrect sRGB profile"))
-        defaultMessageHandler(pType, pContext, pMessage);
+        gDefaultMessageHandler(pType, pContext, pMessage);
 }
+#endif
 
 //==============================================================================
 
@@ -75,7 +79,7 @@ void initQtMessagePattern()
     // we want to filter out
 
 #ifdef QT_DEBUG
-    defaultMessageHandler = qInstallMessageHandler(messageHandler);
+    gDefaultMessageHandler = qInstallMessageHandler(messageHandler);
 #else
     qSetMessagePattern("%{if-debug}%{endif}"
                        "%{if-warning}%{endif}"

diff --git a/src/misc/cliutils.h b/src/misc/cliutils.h
@@ -74,7 +74,7 @@ void initQtMessagePattern();
 
 void initPluginsPath(int pArgC, char *pArgV[]);
 
-void initApplication(QString *pAppDate = 0);
+void initApplication(QString *pAppDate = nullptr);
 
 QString applicationDescription(bool pGuiMode = true);
 

diff --git a/src/plugins/cliinterface.cpp b/src/plugins/cliinterface.cpp
@@ -38,6 +38,12 @@ extern "C" Q_DECL_EXPORT int cliInterfaceVersion()
 
 //==============================================================================
 
+CliInterface::~CliInterface()
+{
+}
+
+//==============================================================================
+
 }   // namespace OpenCOR
 
 //==============================================================================

diff --git a/src/plugins/cliinterface.h b/src/plugins/cliinterface.h
@@ -40,6 +40,8 @@ extern "C" Q_DECL_EXPORT int cliInterfaceVersion();
 class CliInterface
 {
 public:
+    virtual ~CliInterface();
+
 #define INTERFACE_DEFINITION
     #include "cliinterface.inl"
 #undef INTERFACE_DEFINITION

diff --git a/src/plugins/coreinterface.cpp b/src/plugins/coreinterface.cpp
@@ -38,6 +38,12 @@ extern "C" Q_DECL_EXPORT int coreInterfaceVersion()
 
 //==============================================================================
 
+CoreInterface::~CoreInterface()
+{
+}
+
+//==============================================================================
+
 }   // namespace OpenCOR
 
 //==============================================================================

diff --git a/src/plugins/coreinterface.h b/src/plugins/coreinterface.h
@@ -40,6 +40,8 @@ extern "C" Q_DECL_EXPORT int coreInterfaceVersion();
 class CoreInterface
 {
 public:
+    virtual ~CoreInterface();
+
 #define INTERFACE_DEFINITION
     #include "coreinterface.inl"
 #undef INTERFACE_DEFINITION

diff --git a/src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreexporter.cpp b/src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreexporter.cpp
@@ -68,7 +68,7 @@ void BiosignalmlDataStoreExporter::execute(QString &pErrorMessage) const
 
     // Export the given data store to a BioSignalML file
 
-    bsml::HDF5::Recording *recording = 0;
+    bsml::HDF5::Recording *recording = nullptr;
 
     try {
         // Create and populate a recording
@@ -124,10 +124,13 @@ void BiosignalmlDataStoreExporter::execute(QString &pErrorMessage) const
             };
 
             bsml::HDF5::SignalArray::Ptr signalArray = recording->new_signalarray(uris, units, clock);
-            int j = -1;
+            bsml::HDF5::SignalArray::size_type j = 0;
 
-            foreach (DataStore::DataStoreVariable *variable, variables)
-                (*signalArray)[++j]->set_label(variable->label().toStdString());
+            foreach (DataStore::DataStoreVariable *variable, variables) {
+                (*signalArray)[j]->set_label(variable->label().toStdString());
+
+                ++j;
+            }
 
             double *data = new double[variables.count()*BufferRows] {};
             double *dataPointer = data;
@@ -140,7 +143,7 @@ void BiosignalmlDataStoreExporter::execute(QString &pErrorMessage) const
                 ++rowCount;
 
                 if (rowCount >= BufferRows) {
-                    signalArray->extend(data, variables.count()*BufferRows);
+                    signalArray->extend(data, size_t(variables.count()*BufferRows));
 
                     dataPointer = data;
 
@@ -150,7 +153,7 @@ void BiosignalmlDataStoreExporter::execute(QString &pErrorMessage) const
                 emit progress(++stepNb*oneOverNbOfSteps);
             }
 
-            signalArray->extend(data, variables.count()*rowCount);
+            signalArray->extend(data, size_t(variables.count()*rowCount));
 
             delete[] data;
         }

diff --git a/src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreplugin.cpp b/src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreplugin.cpp
@@ -110,7 +110,7 @@ DataStore::DataStoreData * BioSignalMLDataStorePlugin::getData(const QString &pF
         }
     }
 
-    return 0;
+    return nullptr;
 }
 
 //==============================================================================

diff --git a/src/plugins/dataStore/CSVDataStore/src/csvdatastoreexporter.cpp b/src/plugins/dataStore/CSVDataStore/src/csvdatastoreexporter.cpp
@@ -62,7 +62,7 @@ void CsvDataStoreExporter::execute(QString &pErrorMessage) const
 
         DataStore::DataStore *dataStore = mDataStoreData->dataStore();
         DataStore::DataStoreVariables variables = mDataStoreData->variables();
-        DataStore::DataStoreVariable *voi = variables.contains(dataStore->voi())?dataStore->voi():0;
+        DataStore::DataStoreVariable *voi = variables.contains(dataStore->voi())?dataStore->voi():nullptr;
 
         variables.removeOne(voi);
 
@@ -157,7 +157,7 @@ void CsvDataStoreExporter::execute(QString &pErrorMessage) const
         if (res) {
             emit progress(++stepNb*oneOverNbOfSteps);
 
-            for (quint64 i = 0, iMax = voiValues.count(); i < iMax; ++i) {
+            for (int i = 0, iMax = voiValues.count(); i < iMax; ++i) {
                 QString rowData = QString();
                 double voiValue = voiValues[i];
 
@@ -180,7 +180,7 @@ void CsvDataStoreExporter::execute(QString &pErrorMessage) const
                             rowData += ',';
 
                         if (   (runsIndex[j] < dataStore->size(j))
-                            && (dataStore->voi()->value(runsIndex[j], j) == voiValue)) {
+                            && qIsNull(dataStore->voi()->value(runsIndex[j], j)-voiValue)) {
                             rowData += QString::number(variableRun->value(runsIndex[j], j));
 
                             updateRunsIndex[j] = true;

diff --git a/src/plugins/dataStore/CSVDataStore/src/csvdatastoreplugin.cpp b/src/plugins/dataStore/CSVDataStore/src/csvdatastoreplugin.cpp
@@ -103,7 +103,7 @@ DataStore::DataStoreData * CSVDataStorePlugin::getData(const QString &pFileName,
             return new DataStore::DataStoreData(fileName, pDataStore, dataStoreDialog.selectedData());
     }
 
-    return 0;
+    return nullptr;
 }
 
 //==============================================================================

diff --git a/src/plugins/dataStore/DataStore/src/datastoredialog.cpp b/src/plugins/dataStore/DataStore/src/datastoredialog.cpp
@@ -111,7 +111,7 @@ DataStoreDialog::DataStoreDialog(DataStore *pDataStore, bool pIncludeVoi,
     mGui->treeView->setItemDelegate(new DataItemDelegate(this));
 
     QString dataHierarchy = QString();
-    QStandardItem *hierarchyItem = 0;
+    QStandardItem *hierarchyItem = nullptr;
 
     foreach (DataStoreVariable *variable,
              pIncludeVoi?pDataStore->voiAndVariables():pDataStore->variables()) {
@@ -131,7 +131,7 @@ DataStoreDialog::DataStoreDialog(DataStore *pDataStore, bool pIncludeVoi,
                 QStandardItem *parentHierarchyItem = mModel->invisibleRootItem();
 
                 foreach (const QString &hierarchyPart, crtDataHierarchy.split('/')) {
-                    hierarchyItem = 0;
+                    hierarchyItem = nullptr;
 
                     for (int i = 0, iMax = parentHierarchyItem->rowCount(); i < iMax; ++i) {
                         QStandardItem *childHierarchyItem = parentHierarchyItem->child(i);
@@ -181,7 +181,7 @@ DataStoreDialog::DataStoreDialog(DataStore *pDataStore, bool pIncludeVoi,
 
     mGui->treeView->expandAll();
 
-    updateDataSelectedState(0);
+    updateDataSelectedState(nullptr);
 
     // Set our minimum size
 

diff --git a/src/plugins/datastoreinterface.cpp b/src/plugins/datastoreinterface.cpp
@@ -334,12 +334,12 @@ double * DataStoreVariable::values(int pRun) const
     // Return the values for the given run, if any
 
     if (mRuns.isEmpty()) {
-        return 0;
+        return nullptr;
     } else {
         if (pRun == -1)
             return mRuns.last()->values();
         else
-            return ((pRun >= 0) && (pRun < mRuns.count()))?mRuns[pRun]->values():0;
+            return ((pRun >= 0) && (pRun < mRuns.count()))?mRuns[pRun]->values():nullptr;
     }
 }
 
@@ -501,7 +501,7 @@ DataStoreVariable * DataStore::addVariable(double *pValue)
     // some runs
 
     if (mVoi->runsCount())
-        return 0;
+        return nullptr;
 
     DataStoreVariable *variable = new DataStoreVariable(pValue);
 
@@ -611,6 +611,15 @@ void DataStoreExporter::started()
 //==============================================================================
 
 }   // namespace DataStore
+
+//==============================================================================
+
+DataStoreInterface::~DataStoreInterface()
+{
+}
+
+//==============================================================================
+
 }   // namespace OpenCOR
 
 //==============================================================================

diff --git a/src/plugins/datastoreinterface.h b/src/plugins/datastoreinterface.h
@@ -65,7 +65,7 @@ typedef QList<DataStoreVariableRun *> DataStoreVariableRuns;
 class DataStoreVariable
 {
 public:
-    explicit DataStoreVariable(double *pValue = 0);
+    explicit DataStoreVariable(double *pValue = nullptr);
     ~DataStoreVariable();
 
     static bool compare(DataStoreVariable *pVariable1,
@@ -155,7 +155,7 @@ class DataStore
     DataStoreVariables variables();
     DataStoreVariables voiAndVariables();
 
-    DataStoreVariable * addVariable(double *pValue = 0);
+    DataStoreVariable * addVariable(double *pValue = nullptr);
     DataStoreVariables addVariables(double *pValues, int pCount);
 
     void addValues(double pVoiValue);
@@ -208,6 +208,8 @@ extern "C" Q_DECL_EXPORT int dataStoreInterfaceVersion();
 class DataStoreInterface
 {
 public:
+    virtual ~DataStoreInterface();
+
 #define INTERFACE_DEFINITION
     #include "datastoreinterface.inl"
 #undef INTERFACE_DEFINITION

diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewcellmllistwidget.cpp b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewcellmllistwidget.cpp
@@ -103,7 +103,7 @@ CellmlAnnotationViewCellmlElementItem::CellmlAnnotationViewCellmlElementItem(boo
 
 CellmlAnnotationViewCellmlElementItem::CellmlAnnotationViewCellmlElementItem(bool pError,
                                                                              const QString &pText) :
-    CellmlAnnotationViewCellmlElementItem(false, pError?Error:Warning, pText, 0, -1)
+    CellmlAnnotationViewCellmlElementItem(false, pError?Error:Warning, pText, nullptr, -1)
 {
     // Disable the item and use its text as a tooltip (in case it's too long and
     // doesn't fit within the allocated space we have)
@@ -121,7 +121,7 @@ CellmlAnnotationViewCellmlElementItem::CellmlAnnotationViewCellmlElementItem(boo
 
 CellmlAnnotationViewCellmlElementItem::CellmlAnnotationViewCellmlElementItem(Type pType,
                                                                              const QString &pText) :
-    CellmlAnnotationViewCellmlElementItem(true, pType, pText, 0, -1)
+    CellmlAnnotationViewCellmlElementItem(true, pType, pText, nullptr, -1)
 {
     // Use its text as a tooltip (in case it's too long and doesn't fit within
     // the allocated space we have)
@@ -283,10 +283,6 @@ void CellmlAnnotationViewCellmlElementItem::setIcon(Type pType)
         QStandardItem::setIcon(ConnectionIcon);
 
         break;
-    default:
-        // A type that doesn't require an icon
-
-        ;
     }
 }
 

diff --git a/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.cpp b/src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewmetadatadetailswidget.cpp
@@ -51,7 +51,7 @@ CellmlAnnotationViewMetadataDetailsWidget::CellmlAnnotationViewMetadataDetailsWi
     Widget(pParent),
     mPlugin(pPlugin),
     mCellmlFile(pParent->cellmlFile()),
-    mElement(0)
+    mElement(nullptr)
 {
     // Create and set our vertical layout