0003796: qt-json dependency is duplicated to different files (2nd report)

$ diff -s src/core/json.cpp src/wadseeker/protocols/json.cpp Files src/core/json.cpp and src/wadseeker/protocols/json.cpp are identical $ diff -s src/core/json.h src/wadseeker/protocols/json.h Files src/core/json.h and src/wadseeker/protocols/json.h are identical

Notes
(0021355) WubTheCaptain (reporter) 2020-06-05 08:04	0003794:0021354: Quote from WubTheCaptain $ diff -u src/core/json.cpp src/wadseeker/protocols/json.cpp # master branch --- src/core/json.cpp 2020-06-05 07:48:38.577780264 +0000 +++ src/wadseeker/protocols/json.cpp 2020-06-05 07:48:38.577780264 +0000 @@ -468,11 +468,11 @@ index = lastIndex + 1; if (numberStr.contains('.')) { - return QVariant(numberStr.toDouble(NULL)); + return QVariant(numberStr.toDouble(nullptr)); } else if (numberStr.startsWith('-')) { - return QVariant(numberStr.toLongLong(NULL)); + return QVariant(numberStr.toLongLong(nullptr)); } else { - return QVariant(numberStr.toULongLong(NULL)); + return QVariant(numberStr.toULongLong(nullptr)); } } Though I agree with preferring nullptr over NULL (with little C++ knowledge), my patch in 0003794 would revert this back to NULL to match upstream. But more importantly, to make my point here, even we haven't been consistent with these duplicated files in our source tree. This wasn't noticed or brought up in 0003310.

(0021422) Blzut3 (administrator) 2020-06-08 04:24	Technically would be done as a result of migrating to Qt 5's JSON support, but I guess this ticket can be resolved when that happens.

(0021423) WubTheCaptain (reporter) 2020-06-08 05:34	I'll resolve this now. OP assumes it would be resolved so that qt-json becomes available from one place, but 0003821 is the apparent solution here. And 0003821 fixes this issue too, so technically this is not "won't fix" but "no change required".

(0021730) WubTheCaptain (reporter) 2021-08-16 18:42	Reopening to resolved status. Addressed in 0003821 with commit fc903e1, QtJson has been replaced.

**Issue Community Support**
This issue is already marked as resolved. If you feel that is not the case, please reopen it and explain why.
Supporters:	No one explicitly supports this issue yet.
Opponents:	No one explicitly opposes this issue yet.

Issue Community Support

This issue is already marked as resolved.
If you feel that is not the case, please reopen it and explain why.

Supporters:

No one explicitly supports this issue yet.

Opponents:

No one explicitly opposes this issue yet.

Issue History
Date Modified	Username	Field	Change
2020-06-05 07:40	WubTheCaptain	New Issue
2020-06-05 07:41	WubTheCaptain	Description Updated	View Revisions
2020-06-05 07:41	WubTheCaptain	Relationship added	related to 0003310
2020-06-05 08:04	WubTheCaptain	Note Added: 0021355
2020-06-08 04:23	Blzut3	Relationship added	related to 0003821
2020-06-08 04:24	Blzut3	Note Added: 0021422
2020-06-08 04:24	Blzut3	Assigned To	=> Blzut3
2020-06-08 04:24	Blzut3	Status	new => acknowledged
2020-06-08 04:24	Blzut3	Assigned To	Blzut3 =>
2020-06-08 05:34	WubTheCaptain	Note Added: 0021423
2020-06-08 05:34	WubTheCaptain	Status	acknowledged => resolved
2020-06-08 05:34	WubTheCaptain	Resolution	open => no change required
2020-06-08 05:34	WubTheCaptain	Assigned To	=> WubTheCaptain
2021-08-07 16:52	Blzut3	Status	resolved => closed
2021-08-16 18:42	WubTheCaptain	Note Added: 0021730
2021-08-16 18:42	WubTheCaptain	Status	closed => resolved
2021-08-16 18:42	WubTheCaptain	Resolution	no change required => fixed
2021-08-16 18:42	WubTheCaptain	Fixed in Version	=> 1.3.3
2021-08-16 18:42	WubTheCaptain	Target Version	=> 1.3.3
2021-08-16 18:45	WubTheCaptain	Resolution	fixed => no change required
2022-03-22 11:11	WubTheCaptain	Status	resolved => closed