casa-mp-base
Public
Commits
Marcus Calhoun-Lopez authored b1c12ea93e3
| 1 1 | Avoid |
| 2 2 | error: ordered comparison between pointer and zero ('const void *' and 'int') |
| 3 + | |
| 4 + | Patch taken from FreeBSD (https://svnweb.freebsd.org/ports?view=revision&revision=487863). |
| 5 + | |
| 3 6 | --- qtiplot/src/core/ApplicationWindow.cpp.orig 2019-08-20 16:39:14.000000000 -0700 |
| 4 7 | +++ qtiplot/src/core/ApplicationWindow.cpp 2019-08-20 16:42:40.000000000 -0700 |
| 5 8 | |
| 6 9 | foreach(Graph *g, layers){ |
| 7 10 | QStringList onPlot = g->curveNamesList(); |
| 8 11 | onPlot = onPlot.grep (name,TRUE); |
| 9 12 | - if (int(onPlot.count()) && plots.contains(w->objectName())<=0) |
| 10 - | + if (int(onPlot.count()) && plots.contains(w->objectName())<=(void*)0) |
| 13 + | + if (onPlot.count() && !plots.contains(w->objectName())) |
| 11 14 | plots << w->objectName(); |
| 12 15 | } |
| 13 16 | }else if (w->isA("Graph3D")){ |
| 14 17 | - if ((((Graph3D*)w)->formula()).contains(name,TRUE) && plots.contains(w->objectName())<=0) |
| 15 - | + if ((((Graph3D*)w)->formula()).contains(name,TRUE) && plots.contains(w->objectName())<=(void*)0) |
| 18 + | + if ((((Graph3D*)w)->formula()).contains(name,TRUE) && !plots.contains(w->objectName())) |
| 16 19 | plots << w->objectName(); |
| 17 20 | } |
| 18 21 | } |
| 19 22 | |
| 20 23 | for (int j=0; j<onPlot.count(); j++) |
| 21 24 | { |
| 22 25 | QStringList tl = onPlot[j].split("_", QString::SkipEmptyParts); |
| 23 26 | - if (tables.contains(tl[0])<=0) |
| 24 - | + if (tables.contains(tl[0])<=(void*)0) |
| 27 + | + if (!tables.contains(tl[0])) |
| 25 28 | tables << tl[0]; |
| 26 29 | } |
| 27 30 | } |
| 28 31 | --- qtiplot/src/plot3D/Graph3D.cpp.orig 2011-08-24 12:25:12.000000000 -0700 |
| 29 32 | +++ qtiplot/src/plot3D/Graph3D.cpp 2019-08-20 16:43:59.000000000 -0700 |
| 30 33 | |
| 31 34 | return 0; |
| 32 35 | plot->addRibbon(t, l[0], l[1], fList[2].toDouble(), fList[3].toDouble(), |
| 33 36 | fList[4].toDouble(), fList[5].toDouble(), fList[6].toDouble(), fList[7].toDouble()); |
| 34 37 | - } else if (formula.contains("(Z)",true) > 0){ |
| 35 - | + } else if (formula.contains("(Z)",true) > (void*)0){ |
| 38 + | + } else if (formula.contains("(Z)",true)){ |
| 36 39 | formula.remove("(X)").remove("(Y)").remove("(Z)"); |
| 37 40 | QStringList l = formula.split(","); |
| 38 41 | if (l.size() < 3) |
| 39 42 | --- qtiplot/src/table/Table.cpp.orig 2011-09-13 13:20:30.000000000 -0700 |
| 40 43 | +++ qtiplot/src/table/Table.cpp 2019-08-20 16:37:54.000000000 -0700 |
| 41 44 | |
| 42 45 | if (enumerateRight) |
| 43 46 | newLabel += QString::number(n); |
| 44 47 | |
| 45 48 | - if (col_label.contains(newLabel) > 0){ |
| 46 - | + if (col_label.contains(newLabel) > (void*)0){ |
| 49 + | + if (col_label.contains(newLabel)){ |
| 47 50 | if (warn){ |
| 48 51 | QMessageBox::critical(0, tr("QtiPlot - Error"), |
| 49 52 | tr("There is already a column called : <b>"+newLabel+"</b> in table <b>"+caption+"</b>!<p>Please choose another name!")); |