adjust to Qt5 on linux

orion-project · Nov 24, 2023 · 7c7a04e · 7c7a04e
1 parent 3faf01f
commit 7c7a04e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/libs/orion b/libs/orion
diff --git a/src/core/Formula.cpp b/src/core/Formula.cpp
@@ -3,7 +3,7 @@
 #include "LuaHelper.h"
 
 #include <QApplication>
-#include <QRegularExpression.h>
+#include <QRegularExpression>
 
 namespace Z {
 
@@ -15,7 +15,7 @@ Formula::Formula(Parameter* target): _target(target)
 Formula::~Formula()
 {
     _target->setValueDriver(ParamValueDriver::None);
-    for (Z::Parameter* dep : _deps)
+    foreach (Z::Parameter* dep, _deps)
         dep->removeListener(this);
 }
 
@@ -42,7 +42,7 @@ void Formula::calculate()
         return;
     }
 
-    for (auto dep : _deps)
+    foreach (auto dep, _deps)
         lua.setGlobalVar(dep->alias(), dep->value().toSi());
 
     auto res = lua.calculate(_code);
@@ -122,7 +122,7 @@ void Formulas::free(Parameter *p)
 
 void Formulas::clear()
 {
-    qDeleteAll(_items.values());
+    qDeleteAll(_items);
     _items.clear();
 }
 
@@ -150,8 +150,8 @@ bool Formulas::ifDependsOn(Parameter *whichParam, Parameter *onParam) const
 Parameters Formulas::dependentParams(Parameter *whichParam) const
 {
     Parameters result;
-    for (Formula *formula : _items.values())
-        for (Parameter *param : formula->deps())
+    foreach (Formula *formula, _items.values())
+        foreach (Parameter *param, formula->deps())
             if (param == whichParam)
             {
                 if (!result.contains(formula->target()))

diff --git a/src/funcs/PlotFuncWindow.h b/src/funcs/PlotFuncWindow.h
@@ -7,6 +7,10 @@
 #include <QToolButton>
 #include <QPen>
 
+#ifdef Q_OS_LINUX
+#include <optional>
+#endif
+
 QT_BEGIN_NAMESPACE
 class QAction;
 class QLabel;

diff --git a/src/math/StabilityMapFunction.cpp b/src/math/StabilityMapFunction.cpp
@@ -6,6 +6,10 @@
 
 #include <QApplication>
 
+#ifdef Q_OS_LINUX
+#include <optional>
+#endif
+
 void StabilityMapFunction::calculate(CalculationMode calcMode)
 {
     _approxStabBounds.T.clear();