summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-08-17 23:50:23 +0200
committerJędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>2016-08-22 07:43:20 +0000
commit519b8d1a285da674a34ec50044779c63c0bbec11 (patch)
tree1b6e9c7bb911a77237cee1d6bb194acb2640f2d4 /src
parentb2799062f365fb1d4c9820d33fd38cf5510d2ade (diff)
QtJson: mark String/Latin1String ctors explicit
An implicit conversion from const char* would be quite unfortunate. Luckily, the code compiles as-is. Change-Id: I445f983a27cc25bfaf4285c1a6c5811bd5d201b3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/json/qjson_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/json/qjson_p.h b/src/corelib/json/qjson_p.h
index b0a634cb4a..8051fa0e93 100644
--- a/src/corelib/json/qjson_p.h
+++ b/src/corelib/json/qjson_p.h
@@ -307,7 +307,7 @@ class Latin1String;
class String
{
public:
- String(const char *data) { d = (Data *)data; }
+ explicit String(const char *data) { d = (Data *)data; }
struct Data {
qle_int length;
@@ -381,7 +381,7 @@ public:
class Latin1String
{
public:
- Latin1String(const char *data) { d = (Data *)data; }
+ explicit Latin1String(const char *data) { d = (Data *)data; }
struct Data {
qle_short length;