Differential D9771 Diff 27856 head/math/qtiplot/files/patch-gentoogit_68af1bc_qtiplot-0.9.8.9-sip-4.19
Changeset View
Changeset View
Standalone View
Standalone View
head/math/qtiplot/files/patch-gentoogit_68af1bc_qtiplot-0.9.8.9-sip-4.19
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
Obtained from: https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-visualization/qtiplot | |||||
sci-visualization/qtiplot: Fix build with >=sip-4.19 | |||||
Thanks-to: Fabio Rossi <rossi.f@inwind.it> | |||||
Gentoo-bug: 609280 | |||||
Package-Manager: Portage-2.3.3, Repoman-2.3.1 | |||||
--- qtiplot/src/scripting/qti.sip 2017-02-13 17:01:03.123828499 +0100 | |||||
+++ qtiplot/src/scripting/qti.sip 2017-02-13 17:02:12.628828234 +0100 | |||||
@@ -148,14 +148,14 @@ | |||||
} | |||||
break; | |||||
case Table::Date: | |||||
- if (sipCanConvertToType(item, sipType_QDateTime, 0)) { | |||||
+ if (sipCanConvertToType(item, sipFindType("QDateTime"), 0)) { | |||||
int isErr = 0; | |||||
- QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipType_QDateTime, | |||||
+ QDateTime* dateTime = reinterpret_cast<QDateTime*>(sipConvertToType(item, sipFindType("QDateTime"), | |||||
0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr)); | |||||
if (isErr) | |||||
return 1; | |||||
table->setText(row, col, dateTime->toString(table->columnFormat(col))); | |||||
- delete dateTime; | |||||
+ //delete dateTime; | |||||
} | |||||
else { | |||||
if (PyType_Ready(item_type) == 0) | |||||
@@ -164,14 +164,14 @@ | |||||
} | |||||
break; | |||||
case Table::Time: | |||||
- if (sipCanConvertToType(item, sipType_QTime, 0)) { | |||||
+ if (sipCanConvertToType(item, sipFindType("QTime"), 0)) { | |||||
int isErr = 0; | |||||
- QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipType_QTime, | |||||
+ QTime* time = reinterpret_cast<QTime*>(sipConvertToType(item, sipFindType("QTime"), | |||||
0/*sipTransferObj*/, 0/*flags*/, 0/*state*/, &isErr)); | |||||
if (isErr) | |||||
return 1; | |||||
table->setText(row, col, time->toString(table->columnFormat(col))); | |||||
- delete time; | |||||
+ //delete time; | |||||
} | |||||
else { | |||||
if (PyType_Ready(item_type) == 0) |