Zandronum Chat @ irc.zandronum.com
#zandronum
Get the latest version: 3.0
Source Code

View Issue Details Jump to Notes ] Issue History ] Print ]
IDProjectCategoryView StatusDate SubmittedLast Update
0003794Doomseeker[All Projects] Cleanuppublic2020-06-05 07:052020-06-08 02:31
ReporterWubTheCaptain 
Assigned ToWubTheCaptain 
PrioritylowSeveritytrivialReproducibilityalways
StatusresolvedResolutionwon't fix 
PlatformOSOS Version
Product Version1.3.1 
Target Version1.4Fixed in Version 
Summary0003794: qt-json is older than aa0930a (stray #include <iostream>)
DescriptionA stray #include <iostream> in src/core/json.cpp triggered me today:
Nothing in the file depends on standard library header <iostream>. Then
I remembered that file is from Eeli Reilin's JSON library (qt-json). I
then found out upstream had already fixed this issue (e84dce6), but the
copy included in Doomseeker was older and didn't have this patch.
Attached Filespatch file icon 0001-qt-json-Update-to-commit-aa0930a.patch [^] (31,483 bytes) 2020-06-05 07:06 [Show Content]
patch file icon 0002-Update-qt-json-in-wadseeker-too.patch [^] (31,390 bytes) 2020-06-05 07:22 [Show Content]
patch file icon 0003-Fix-QtJson-parse-class-reference-in-freedoominfopars.patch [^] (1,069 bytes) 2020-06-05 08:34 [Show Content]

- Relationships
related to 0003821confirmed Replacing Eili Reilin's JSON library (qt-json) with JSON support in Qt 
related to 0003803confirmed C++11 support 

-  Notes
User avatar (0021351)
WubTheCaptain (developer)
2020-06-05 07:17

I got bitten by issue 0003310 after sharing the first patch file, so two patch files are attached.
User avatar (0021352)
WubTheCaptain (developer)
2020-06-05 07:25

(re-attached 0002-Update-qt-json-in-wadseeker-too.patch, because I initially forgot to update Wadseeker's references to the class and that failed to build from source.)
User avatar (0021353)
WubTheCaptain (developer)
2020-06-05 07:49
edited on: 2020-06-05 07:50

Quote
 src/core/json.cpp                      | 272 ++++++++++++++++---------
 src/core/json.h                        | 272 ++++++++-----------------

Quote
 src/wadseeker/protocols/json.cpp              | 274 +++++++++++-------
 src/wadseeker/protocols/json.h                | 272 ++++++-----------


I hadn't noticed this before, but huh. Despite the line differences in json.cpp, but show to be the same json.cpp file in the master branch and my patch branch.

User avatar (0021354)
WubTheCaptain (developer)
2020-06-05 07:51
edited on: 2020-06-05 07:52

0003794:0021353:
Quote from WubTheCaptain
Despite the line differences in json.cpp, but show to be the same json.cpp file in the master branch and my patch branch.

Nevermind, git diff doesn't catch it but diff -u does.
$ 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));
         }
 }


User avatar (0021408)
Blzut3 (administrator)
2020-06-08 01:50

Given that Qt JSON was added years before we added support for Qt5 much less dropped Qt4 support, should we instead have a ticket for switching to Qt 5's own JSON classes?
User avatar (0021415)
WubTheCaptain (developer)
2020-06-08 02:31

Quote from Blzut3
Given that Qt JSON was added years before we added support for Qt5 much less dropped Qt4 support, should we instead have a ticket for switching to Qt 5's own JSON classes?

Unaware those existed, yes. 0003821 (excuse the summary).
https://doc.qt.io/qt-5/json.html [^]

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:05 WubTheCaptain New Issue
2020-06-05 07:05 WubTheCaptain Status new => assigned
2020-06-05 07:05 WubTheCaptain Assigned To => WubTheCaptain
2020-06-05 07:06 WubTheCaptain File Added: 0001-qt-json-Update-to-commit-aa0930a.patch
2020-06-05 07:06 WubTheCaptain Status assigned => needs review
2020-06-05 07:16 WubTheCaptain File Added: 0002-Update-qt-json-in-wadseeker-too.patch
2020-06-05 07:17 WubTheCaptain Note Added: 0021351
2020-06-05 07:19 WubTheCaptain File Deleted: 0002-Update-qt-json-in-wadseeker-too.patch
2020-06-05 07:22 WubTheCaptain File Added: 0002-Update-qt-json-in-wadseeker-too.patch
2020-06-05 07:25 WubTheCaptain Note Added: 0021352
2020-06-05 07:33 WubTheCaptain Assigned To WubTheCaptain =>
2020-06-05 07:49 WubTheCaptain Note Added: 0021353
2020-06-05 07:49 WubTheCaptain Note Edited: 0021353 View Revisions
2020-06-05 07:50 WubTheCaptain Note Edited: 0021353 View Revisions
2020-06-05 07:51 WubTheCaptain Note Added: 0021354
2020-06-05 07:52 WubTheCaptain Note Edited: 0021354 View Revisions
2020-06-05 08:31 WubTheCaptain Assigned To => WubTheCaptain
2020-06-05 08:31 WubTheCaptain Status needs review => assigned
2020-06-05 08:34 WubTheCaptain File Added: 0003-Fix-QtJson-parse-class-reference-in-freedoominfopars.patch
2020-06-05 08:35 WubTheCaptain Assigned To WubTheCaptain =>
2020-06-05 08:35 WubTheCaptain Status assigned => needs review
2020-06-07 02:29 WubTheCaptain Relationship added related to 0003803
2020-06-08 01:50 Blzut3 Note Added: 0021408
2020-06-08 02:31 WubTheCaptain Note Added: 0021415
2020-06-08 02:31 WubTheCaptain Status needs review => resolved
2020-06-08 02:31 WubTheCaptain Resolution open => won't fix
2020-06-08 02:31 WubTheCaptain Assigned To => WubTheCaptain
2020-06-08 02:31 WubTheCaptain Relationship added related to 0003821






Questions or other issues? Contact Us.

Links


Copyright © 2000 - 2020 MantisBT Team
Powered by Mantis Bugtracker