Index: head/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp
===================================================================
--- head/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp	(nonexistent)
+++ head/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp	(revision 487863)
@@ -0,0 +1,25 @@
+--- qtiplot/src/core/ApplicationWindow.cpp.orig	2018-12-20 07:24:36 UTC
++++ qtiplot/src/core/ApplicationWindow.cpp
+@@ -10933,11 +10933,11 @@ QStringList ApplicationWindow::depending
+ 			foreach(Graph *g, layers){
+ 				QStringList onPlot = g->curveNamesList();
+ 				onPlot = onPlot.grep (name,TRUE);
+-				if (int(onPlot.count()) && plots.contains(w->objectName())<=0)
++				if (onPlot.count() && !plots.contains(w->objectName()))
+ 					plots << w->objectName();
+ 			}
+ 		}else if (w->isA("Graph3D")){
+-			if ((((Graph3D*)w)->formula()).contains(name,TRUE) && plots.contains(w->objectName())<=0)
++			if ((((Graph3D*)w)->formula()).contains(name,TRUE) && !plots.contains(w->objectName()))
+ 				plots << w->objectName();
+ 		}
+ 	}
+@@ -10954,7 +10954,7 @@ QStringList ApplicationWindow::multilaye
+ 		for (int j=0; j<onPlot.count(); j++)
+ 		{
+ 			QStringList tl = onPlot[j].split("_", QString::SkipEmptyParts);
+-			if (tables.contains(tl[0])<=0)
++			if (!tables.contains(tl[0]))
+ 				tables << tl[0];
+ 		}
+ 	}

Property changes on: head/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp
===================================================================
--- head/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp	(nonexistent)
+++ head/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp	(revision 487863)
@@ -0,0 +1,11 @@
+--- qtiplot/src/plot3D/Graph3D.cpp.orig	2011-08-24 10:25:10 UTC
++++ qtiplot/src/plot3D/Graph3D.cpp
+@@ -3283,7 +3283,7 @@ Graph3D* Graph3D::restore(ApplicationWin
+ 				return 0;
+ 			plot->addRibbon(t, l[0], l[1], fList[2].toDouble(), fList[3].toDouble(),
+ 					fList[4].toDouble(), fList[5].toDouble(), fList[6].toDouble(), fList[7].toDouble());
+-		} else if (formula.contains("(Z)",true) > 0){
++		} else if (formula.contains("(Z)",true)){
+ 			formula.remove("(X)").remove("(Y)").remove("(Z)");
+ 			QStringList l = formula.split(",");
+ 			if (l.size() < 3)

Property changes on: head/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp
===================================================================
--- head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp	(revision 487862)
+++ head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp	(revision 487863)
@@ -1,18 +1,27 @@
 Description: if you don't initialize the "i" variable, or initialize it to 0.0
  qtiplot won't let you set the column values using muparser.
 Author: Scott Howard <showard@debian.org>
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707736
 
 Index: qtiplot/qtiplot/src/table/Table.cpp
 ===================================================================
 --- qtiplot/src/table/Table.cpp.orig	2011-09-13 11:20:29 UTC
 +++ qtiplot/src/table/Table.cpp
 @@ -564,7 +564,7 @@ bool Table::muParserCalculate(int col, i
  	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
  
      muParserScript *mup = new muParserScript(scriptEnv, cmd, this,  QString("<%1>").arg(colName(col)));
 -    double *r = mup->defineVariable("i");
 +    double *r = mup->defineVariable("i",startRow + 1.0);
      mup->defineVariable("j", (double)col);
      mup->defineVariable("sr", startRow + 1.0);
      mup->defineVariable("er", endRow + 1.0);
+@@ -1080,7 +1080,7 @@ void Table::setColName(int col, const QS
+ 		if (enumerateRight)
+             newLabel += QString::number(n);
+ 
+-		if (col_label.contains(newLabel) > 0){
++		if (col_label.contains(newLabel)){
+ 			if (warn){
+ 				QMessageBox::critical(0, tr("QtiPlot - Error"),
+ 				tr("There is already a column called : <b>"+newLabel+"</b> in table <b>"+caption+"</b>!<p>Please choose another name!"));