From 42aa24108c1245955f2e3cfdebce464cb3bbda3b Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Thu, 18 Jan 2024 11:47:01 -0300 Subject: [PATCH] Revert "There are two overloads for QStringList and QVector (#3977)" This reverts commit 466bdf19397addda4e263d8dd506061392f31ff1. PythonChart connect failed without the removed overload, as reported in #3893 --- src/Charts/GenericChart.cpp | 3 --- src/Charts/GenericChart.h | 4 ---- 2 files changed, 7 deletions(-) diff --git a/src/Charts/GenericChart.cpp b/src/Charts/GenericChart.cpp index d31704a76..62b68dde5 100644 --- a/src/Charts/GenericChart.cpp +++ b/src/Charts/GenericChart.cpp @@ -151,8 +151,6 @@ GenericChart::addCurve(QString name, QVector xseries, QVector ys return true; } -#if QT_VERSION < 0x060000 -// In Qt 6, QStringList is a QVector, so we don't need an additional overload // helper for python - no aggregateby, no annotations bool GenericChart::addCurve(QString name, QVector xseries, QVector yseries, QStringList fseries, QString xname, QString yname, @@ -165,7 +163,6 @@ GenericChart::addCurve(QString name, QVector xseries, QVector ys opengl, legend, datalabels, fill, RideMetric::Average, QList()); return true; } -#endif // configure axis, after curves added bool diff --git a/src/Charts/GenericChart.h b/src/Charts/GenericChart.h index 4506f40bb..6e731a993 100644 --- a/src/Charts/GenericChart.h +++ b/src/Charts/GenericChart.h @@ -319,14 +319,10 @@ class GenericChart : public QWidget { int line, int symbol, int size, QString color, int opacity, bool opengl, bool legend, bool datalabels, bool fill, RideMetric::MetricType mtype, QListannotations); -#if QT_VERSION < 0x060000 - // In Qt 6, QStringList is a QVector, so we don't need an additional overload - // helper for Python and R charts fseries is a stringlist bool addCurve(QString name, QVector xseries, QVector yseries, QStringList fseries, QString xname, QString yname, QStringList labels, QStringList colors, int line, int symbol, int size, QString color, int opacity, bool opengl, bool legend, bool datalabels, bool fill); -#endif // configure axis, after curves added bool configureAxis(QString name, bool visible, int align, double min, double max,