removed unused docs

signedav · nyalldawson · commit 04d770d61324 · 2018-09-14T15:33:57.000+10:00
and unused db entry
diff --git a/src/core/qgsfield.cpp b/src/core/qgsfield.cpp
@@ -24,7 +24,6 @@
 #include <QIcon>
 #include <QLocale>
 #include <QJsonDocument>
-#include <QJsonObject>
 
 /***************************************************************************
  * This class is considered CRITICAL and any change MUST be accompanied with
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -4221,11 +4221,8 @@ static QVariant parseJson( const QString &txt )
 {
   QVariant result;
   QJsonDocument jsonResponse = QJsonDocument::fromJson( txt.toUtf8() );
-  //it's null when no json format
+  //it's null if no json format
   result = jsonResponse.toVariant();
-
-  //TODO json/jsonb convert toVariantMap from QJsonObject in case it's a map etc.
-  //we can check there with jsonResponse.isArray if it's an array etc.
   return result;
 }
 
diff --git a/tests/testdata/provider/testdata_pg_json.sql b/tests/testdata/provider/testdata_pg_json.sql
@@ -11,5 +11,4 @@ CREATE TABLE qgis_test.json
 INSERT INTO qgis_test.json(jvalue, jbvalue)
   VALUES
     ('[1,2,3]', '[4,5,6]'),
-    ('{"a":1,"b":2}', '{"c":4,"d":5}'),
-    ('123', '456');
+    ('{"a":1,"b":2}', '{"c":4,"d":5}');

Original file line number	Diff line number	Diff line change
`@@ -4221,11 +4221,8 @@ static QVariant parseJson( const QString &txt )`
`4221`	`4221`	`{`
`4222`	`4222`	`QVariant result;`
`4223`	`4223`	`QJsonDocument jsonResponse = QJsonDocument::fromJson( txt.toUtf8() );`
`4224`		`- //it's null when no json format`
	`4224`	`+ //it's null if no json format`
`4225`	`4225`	`result = jsonResponse.toVariant();`
`4226`		`-`
`4227`		`- //TODO json/jsonb convert toVariantMap from QJsonObject in case it's a map etc.`
`4228`		`- //we can check there with jsonResponse.isArray if it's an array etc.`
`4229`	`4226`	`return result;`
`4230`	`4227`	`}`
`4231`	`4228`