Merge d6d67a0 into 3295700

.clang-tidy

@@ -1,5 +1,11 @@
-# Note: the full list of Clang-Tidy checks can be found at
-#       https://clang.llvm.org/extra/clang-tidy/checks/list.html...
+# Note #1: the full list of Clang-Tidy checks can be found at
+#          https://clang.llvm.org/extra/clang-tidy/checks/list.html...
+# Note #2: performance-no-automatic-move shouldn't be disabled, but we have to
+#          due to an issue with Qt (see
+#          https://bugreports.qt.io/browse/QTBUG-85415)...
+# Note #3: readability-redundant-access-specifiers shouldn't normally be
+#          disabled, but Clang-Tidy gets a bit confused with access specifiers
+#          like "public" vs. "public slots"...
 
 ---
 Checks: >-
@@ -45,9 +51,11 @@ Checks: >-
   -modernize-pass-by-value,
   -modernize-use-trailing-return-type,
   performance-*,
+  -performance-no-automatic-move,
   readability-*,
   -readability-isolate-declaration,
-  -readability-magic-numbers
+  -readability-magic-numbers,
+  -readability-redundant-access-specifiers
 WarningsAsErrors: '*'
 HeaderFilterRegex: '.*'
 ...

cmake/common.cmake

@@ -11,9 +11,12 @@ macro(configure_clang_and_clang_tidy TARGET_NAME)
         # Note #2: besides C++98 compatibility, which we are not after, some
         #          warnings are disabled so that Qt-related files can be
         #          compiled without any problems...
+        # Note #3: no-anon-enum-enum-conversion is disabled so that we can
+        #          safely use Type.h from Clang...
 
         set(COMPILE_OPTIONS
             -Weverything
+            -Wno-anon-enum-enum-conversion
             -Wno-c++98-compat
             -Wno-c++98-compat-pedantic
             -Wno-documentation

src/3rdparty/diff_match_patch/src/diff_match_patch.h

@@ -966,8 +966,8 @@ class diff_match_patch {
           int overlap_length1 = diff_commonOverlap(deletion, insertion);
           int overlap_length2 = diff_commonOverlap(insertion, deletion);
           if (overlap_length1 >= overlap_length2) {
-            if (overlap_length1 >= deletion.size() / 2.0 ||
-                overlap_length1 >= insertion.size() / 2.0) {
+            if (overlap_length1 >= double(deletion.size()) / 2.0 ||
+                overlap_length1 >= double(insertion.size()) / 2.0) {
               // Overlap found.  Insert an equality and trim the surrounding edits.
               diffs.insert(cur_diff, Diff(EQUAL, insertion.substr(0, overlap_length1)));
               prev_diff->text =
@@ -977,8 +977,8 @@ class diff_match_patch {
               // no need to step past the new element.
             }
           } else {
-            if (overlap_length2 >= deletion.length() / 2.0 ||
-                overlap_length2 >= insertion.length() / 2.0) {
+            if (overlap_length2 >= double(deletion.length()) / 2.0 ||
+                overlap_length2 >= double(insertion.length()) / 2.0) {
               // Reverse overlap found.
               // Insert an equality and swap and trim the surrounding edits.
               diffs.insert(cur_diff, Diff(EQUAL, deletion.substr(0, overlap_length2)));

src/plugins/datastoreinterface.cpp

@@ -593,7 +593,7 @@ DataStoreImportData::DataStoreImportData(const QString &pFileName,
     mNbOfVariables(pNbOfVariables),
     mNbOfDataPoints(pNbOfDataPoints),
     mRunSizes(pRunSizes),
-    mOneOverTotalProgress(1.0/pNbOfDataPoints)
+    mOneOverTotalProgress(1.0/double(pNbOfDataPoints))
 {
     // Initialise our hierarchy
 
@@ -767,7 +767,7 @@ double DataStoreImportData::progress()
 {
     // Increase and return our normalised progress
 
-    return (++mProgress)*mOneOverTotalProgress;
+    return double(++mProgress)*mOneOverTotalProgress;
 }
 
 //==============================================================================

src/plugins/miscellaneous/Core/src/corecliutils.cpp

@@ -266,7 +266,7 @@ QString sizeAsString(quint64 pSize, int pPrecision)
                                                 };
 
     auto i = ulong(qFloor(log(pSize)/log(1024.0)));
-    double size = pSize/qPow(1024.0, i);
+    double size = double(pSize)/qPow(1024.0, double(i));
     double scaling = qPow(10.0, pPrecision);
 
     size = qRound(scaling*size)/scaling;

src/plugins/miscellaneous/Core/src/coreguiutils.cpp

@@ -906,22 +906,15 @@ QColor lockedColor(const QColor &pColor)
 {
     // Return the resulting locked version of the given colour
 
-    int red = pColor.red();
-    int green = pColor.green();
-    int blue = pColor.blue();
-
-    enum {
-        lockedRed = 255,
-        lockedGreen = 0,
-        lockedBlue = 0
-    };
-
     static const double Alpha = 0.05;
     static const double OneMinusAlpha = 1.0-Alpha;
+    static const double LockedRed = 255.0;
+    static const double LockedGreen = 0.0;
+    static const double LockedBlue = 0.0;
 
-    return { int(Alpha*lockedRed+OneMinusAlpha*red),
-             int(Alpha*lockedGreen+OneMinusAlpha*green),
-             int(Alpha*lockedBlue+OneMinusAlpha*blue) };
+    return { int(Alpha*LockedRed+OneMinusAlpha*pColor.red()),
+             int(Alpha*LockedGreen+OneMinusAlpha*pColor.green()),
+             int(Alpha*LockedBlue+OneMinusAlpha*pColor.blue()) };
 }
 
 //==============================================================================

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp

@@ -1814,7 +1814,7 @@ bool SimulationExperimentViewSimulationWidget::createSedmlFile(SEDMLSupport::Sed
     double endingPoint = mSimulation->data()->endingPoint();
     double pointInterval = mSimulation->data()->pointInterval();
     auto nbOfPoints = quint64(ceil((endingPoint-startingPoint)/pointInterval));
-    bool needOneStepTask = !qFuzzyCompare((endingPoint-startingPoint)/nbOfPoints, pointInterval);
+    bool needOneStepTask = !qFuzzyCompare((endingPoint-startingPoint)/double(nbOfPoints), pointInterval);
 
     libsedml::SedUniformTimeCourse *sedmlUniformTimeCourse = sedmlDocument->createUniformTimeCourse();
 
@@ -1827,7 +1827,7 @@ bool SimulationExperimentViewSimulationWidget::createSedmlFile(SEDMLSupport::Sed
     sedmlUniformTimeCourse->setId(QString("simulation%1").arg(simulationNumber).toStdString());
     sedmlUniformTimeCourse->setInitialTime(startingPoint);
     sedmlUniformTimeCourse->setOutputStartTime(startingPoint);
-    sedmlUniformTimeCourse->setOutputEndTime(startingPoint+nbOfPoints*pointInterval);
+    sedmlUniformTimeCourse->setOutputEndTime(startingPoint+double(nbOfPoints)*pointInterval);
     sedmlUniformTimeCourse->setNumberOfPoints(int(nbOfPoints));
 
     addSedmlSimulation(sedmlDocument, sedmlModel, sedmlRepeatedTask,
@@ -3656,7 +3656,7 @@ void SimulationExperimentViewSimulationWidget::updateGui(bool pCheckVisibility)
 
     // Make sure that our progress bar is up to date
 
-    mProgressBarWidget->setValue(mViewWidget->simulationResultsSize(mSimulation->fileName())/double(mSimulation->size()));
+    mProgressBarWidget->setValue(double(mViewWidget->simulationResultsSize(mSimulation->fileName()))/double(mSimulation->size()));
 }
 
 //==============================================================================
@@ -3814,7 +3814,7 @@ void SimulationExperimentViewSimulationWidget::updateSimulationResults(Simulatio
 
     if (simulation == mSimulation) {
         QString simulationFileName = mSimulation->fileName();
-        double simulationProgress = double(mViewWidget->simulationResultsSize(simulationFileName))/simulation->size();
+        double simulationProgress = double(mViewWidget->simulationResultsSize(simulationFileName))/double(simulation->size());
 
         if ((pTask != Task::None) || visible) {
             mProgressBarWidget->setValue(simulationProgress);

src/plugins/support/SimulationSupport/src/simulationworker.cpp

@@ -178,11 +178,9 @@ void SimulationWorker::run()
 
             // Determine our next point and compute our model up to it
 
-            ++pointCounter;
-
             odeSolver->solve(mCurrentPoint,
                              qMin(endingPoint,
-                                  startingPoint+pointCounter*pointInterval));
+                                  startingPoint+double(++pointCounter)*pointInterval));
 
             // Make sure that no error occurred
 

src/plugins/widget/EditorWidget/src/editorwidgetfindreplacewidget.cpp

@@ -548,7 +548,7 @@ void EditorWidgetFindReplaceWidget::searchOptionChanged()
         };
 
         MagnifierIcon.paint(&dropDownPixmapPainter,
-                            0, (IconSize-MagnifierIconHeight)/2,
+                            0, (int(IconSize)-int(MagnifierIconHeight))/2,
                             IconSize, MagnifierIconHeight);
     }