<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5699ea0b3d9e610e8f8b913b75123141f5cdbf75">https://github.com/macports/macports-ports/commit/5699ea0b3d9e610e8f8b913b75123141f5cdbf75</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5699ea0b3d9 qtiplot: fix the build (#15641)
</span>5699ea0b3d9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5699ea0b3d9e610e8f8b913b75123141f5cdbf75
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sun Aug 7 06:28:39 2022 +0545
<span style='display:block; white-space:pre;color:#404040;'> qtiplot: fix the build (#15641)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/65614
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/64792
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/54456
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/41202
</span>---
aqua/qtiplot/Portfile | 13 +++-
aqua/qtiplot/files/patch-boolean.diff | 121 +++++++++++++++++++++++++++++++
aqua/qtiplot/files/patch-unsetflags.diff | 85 ++++++++++++++++++++++
3 files changed, 216 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qtiplot/Portfile b/aqua/qtiplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c1999bb399a..e1f62079538 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qtiplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qtiplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup boost 1.0
</span>
name qtiplot
version 0.9.8.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 21
</span> categories aqua science
license GPL-2+
maintainers {nicos @NicosPavlov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,6 @@ long_description Similar to Origin or SigmaPlot, QtiPlot can be used to \
</span> It is a full-featured data analysis and plotting package available \
on Linux, Windows and Mac OS X platforms that supports python scripting.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> homepage http://www.qtiplot.com/
master_sites sourceforge:${name}.berlios
use_zip yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,12 +40,20 @@ patchfiles patch-ApplicationWindow.diff \
</span> patch-qwt3d_openglhelper.diff \
patch-gsl2.diff \
patch-sip-4.15.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-comparison.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-comparison.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-boolean.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-unsetflags.diff
</span>
# error: unknown type name 'constexpr'
compiler.cxx_standard 2014
configure.cxxflags-append -std=c++14
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qwt3d_lighting.cpp: error: non-constant-expression cannot be narrowed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from type 'double' to 'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -Wno-c++11-narrowing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
# don't step into the manual dir, we don't have all the tools to build it
reinplace "/manual/d" ${worksrcpath}/qtiplot.pro
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qtiplot/files/patch-boolean.diff b/aqua/qtiplot/files/patch-boolean.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d609e142d94
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qtiplot/files/patch-boolean.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,121 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# error: no matching function for call to 'QComboBox::QComboBox(bool)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# error: no matching function for call to 'PatternBox::PatternBox(bool)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qtiplot/src/plot2D/dialogs/LayerDialog.cpp.orig 2010-09-27 09:12:48.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qtiplot/src/plot2D/dialogs/LayerDialog.cpp 2022-08-07 00:46:58.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,14 +69,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QGridLayout *gl2 = new QGridLayout(gb2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2->addWidget(new QLabel(tr("Horizontal")), 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- alignHorBox = new QComboBox( false );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ alignHorBox = new QComboBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ alignHorBox->setEditable(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alignHorBox->insertItem( tr( "Center" ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alignHorBox->insertItem( tr( "Left" ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alignHorBox->insertItem( tr( "Right" ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2->addWidget(alignHorBox, 0, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2->addWidget(new QLabel( tr( "Vertical" )), 1, 0 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- alignVertBox = new QComboBox( false );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ alignVertBox = new QComboBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ alignVertBox->setEditable(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alignVertBox->insertItem( tr( "Center" ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alignVertBox->insertItem( tr( "Top" ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alignVertBox->insertItem( tr( "Bottom" ) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qtiplot/src/plot2D/dialogs/PlotDialog.cpp.orig 2011-09-13 13:50:36.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qtiplot/src/plot2D/dialogs/PlotDialog.cpp 2022-08-07 00:40:39.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -954,7 +954,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ l4->setBuddy(boxFirstColor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2->addWidget(l4, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boxPiePattern = new PatternBox(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boxPiePattern = new PatternBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boxPiePattern->setEditable(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2->addWidget(boxPiePattern, 1, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2->setRowStretch(2, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1337,7 +1338,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hb->addWidget(boxCurveOpacity);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2->addLayout(hb, 1, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boxPattern = new PatternBox(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boxPattern = new PatternBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boxPattern->setEditable(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl2->addWidget(boxPattern, 2, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QLabel *l6 = new QLabel("&" + tr("Pattern"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2126,17 +2128,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QGridLayout *gl3 = new QGridLayout(GroupBoxVectEnd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ labelXEnd = new QLabel(tr( "X End" ));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl3->addWidget(labelXEnd, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xEndBox = new QComboBox(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xEndBox = new QComboBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xEndBox->setEditable(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl3->addWidget(xEndBox, 0, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ labelYEnd = new QLabel(tr( "Y End" ));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl3->addWidget(labelYEnd, 1, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- yEndBox = new QComboBox( false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ yEndBox = new QComboBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ yEndBox->setEditable(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl3->addWidget(yEndBox, 1, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ labelPosition = new QLabel(tr( "Position" ));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl3->addWidget(labelPosition, 2, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vectPosBox = new QComboBox( false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vectPosBox = new QComboBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vectPosBox->setEditable(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vectPosBox->addItem(tr("Tail"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vectPosBox->addItem(tr("Middle"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vectPosBox->addItem(tr("Head"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qtiplot/src/table/TableDialog.cpp.orig 2011-08-31 20:11:22.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qtiplot/src/table/TableDialog.cpp 2022-08-07 00:42:42.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,7 +127,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ labelFormat = new QLabel(tr( "Format:" ));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl1->addWidget(labelFormat, 2, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- formatBox = new QComboBox(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ formatBox = new QComboBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ formatBox->setEditable(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl1->addWidget(formatBox, 2, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ labelNumeric = new QLabel(tr( "Precision:" ));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qtiplot/src/table/SetColValuesDialog.cpp.orig 2010-09-27 09:12:50.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qtiplot/src/table/SetColValuesDialog.cpp 2022-08-07 01:29:11.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,12 +72,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hbox1->addWidget(end);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QGridLayout *gl1 = new QGridLayout();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- functions = new QComboBox(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ functions = new QComboBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ functions->setEditable(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ functions->addItems(muParserScripting::functionsList(true));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl1->addWidget(functions, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ btnAddFunction = new QPushButton(tr( "Add function" ));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl1->addWidget(btnAddFunction, 0, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- boxColumn = new QComboBox(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boxColumn = new QComboBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ boxColumn->setEditable(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl1->addWidget(boxColumn, 1, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ btnAddCol = new QPushButton(tr( "Add column" ));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl1->addWidget(btnAddCol, 1, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qtiplot/src/matrix/MatrixValuesDialog.cpp.orig 2010-09-27 09:12:46.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qtiplot/src/matrix/MatrixValuesDialog.cpp 2022-08-07 00:41:00.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endCol->setRange(1, INT_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gl1->addWidget(endCol, 1, 3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- functions = new QComboBox(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ functions = new QComboBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ functions->setEditable(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ functions->addItems(scriptEnv->mathFunctions());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ btnAddFunction = new QPushButton(tr( "Add &Function" ));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ btnAddCell = new QPushButton(tr( "Add Ce&ll" ));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qtiplot/files/patch-unsetflags.diff b/aqua/qtiplot/files/patch-unsetflags.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7650d89301a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qtiplot/files/patch-unsetflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,85 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# error: cannot convert 'bool' to 'Qt::ItemFlags'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qtiplot/src/core/ConfigDialog.cpp.orig 2011-10-25 11:50:24.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qtiplot/src/core/ConfigDialog.cpp 2022-08-07 02:50:23.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1390,7 +1390,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colorsList->setRowCount(colors);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < colors; i++){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTableWidgetItem *it = new QTableWidgetItem();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if defined(Q_CC_MSVC) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ it->setFlags(it->flags() & (~Qt::ItemIsEditable));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setFlags(!Qt::ItemIsEditable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setBackground(QBrush(colList[i]));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ colorsList->setItem(i, 0, it);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qtiplot/src/lib/src/ColorMapEditor.cpp.orig 2011-07-02 09:23:54.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qtiplot/src/lib/src/ColorMapEditor.cpp 2022-08-07 02:47:20.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -155,7 +155,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QColor c = color_map.color(i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTableWidgetItem *it = new QTableWidgetItem(c.name());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #ifdef Q_CC_MSVC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if defined(Q_CC_MSVC) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setFlags(it->flags() & (~Qt::ItemIsEditable));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setFlags(!Qt::ItemIsEditable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -246,7 +246,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ table->setCellWidget(row, 0, sb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTableWidgetItem *it = new QTableWidgetItem(c.name());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef Q_CC_MSVC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(Q_CC_MSVC) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setFlags(it->flags() & (~Qt::ItemIsEditable));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setFlags(!Qt::ItemIsEditable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qtiplot/src/analysis/dialogs/FitDialog.cpp.orig 2011-10-17 12:38:08.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qtiplot/src/analysis/dialogs/FitDialog.cpp 2022-08-06 23:09:47.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1019,11 +1019,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int prec = boxPrecision->value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i<parameters; i++){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTableWidgetItem *it = new QTableWidgetItem(paramList[i]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef Q_CC_MSVC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if defined(Q_CC_MSVC) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setFlags(it->flags() & (~Qt::ItemIsEditable));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setFlags(!Qt::ItemIsEditable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setBackground(QBrush(Qt::lightGray));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setForeground(Qt::black);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QFont font = it->font();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1049,7 +1049,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boxParams->setCellWidget(i, 2, sb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it = new QTableWidgetItem();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- it->setFlags(!Qt::ItemIsEditable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if defined(Q_CC_MSVC) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ it->setFlags(it->flags() & (~Qt::ItemIsEditable));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ it->setFlags(!Qt::ItemIsEditable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setText("--");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boxParams->setItem(i, 5, it);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1061,11 +1065,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boxParams->showColumn(4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i<boxParams->rowCount(); i++ ){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTableWidgetItem *it = new QTableWidgetItem();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef Q_CC_MSVC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if defined(Q_CC_MSVC) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setFlags(it->flags() & (~Qt::ItemIsEditable));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setFlags(!Qt::ItemIsEditable);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it->setBackground(QBrush(Qt::lightGray));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boxParams->setItem(i, 4, it);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>