From c1a0895a3feae3e80a3d4b7ac4d82162cd9ed267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Wed, 25 Feb 2015 16:47:46 +0100
Subject: [PATCH] added Uint and Color to base types

---
 server/jsonrpc/jsonrpcserver.cpp | 2 +-
 server/jsonrpc/jsontypes.cpp     | 6 ++++++
 server/jsonrpc/jsontypes.h       | 2 ++
 tests/auto/api.json              | 4 +++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/server/jsonrpc/jsonrpcserver.cpp b/server/jsonrpc/jsonrpcserver.cpp
index b6d5fe76..94ac03c9 100644
--- a/server/jsonrpc/jsonrpcserver.cpp
+++ b/server/jsonrpc/jsonrpcserver.cpp
@@ -44,7 +44,7 @@
 #include <QJsonDocument>
 #include <QStringList>
 
-#define JSON_PROTOCOL_VERSION 12
+#define JSON_PROTOCOL_VERSION 13
 
 JsonRPCServer::JsonRPCServer(QObject *parent):
     JsonHandler(parent),
diff --git a/server/jsonrpc/jsontypes.cpp b/server/jsonrpc/jsontypes.cpp
index a1b939fb..f1c3a998 100644
--- a/server/jsonrpc/jsontypes.cpp
+++ b/server/jsonrpc/jsontypes.cpp
@@ -950,12 +950,18 @@ QPair<bool, QString> JsonTypes::validateBasicType(const QVariant &variant)
     if (variant.canConvert(QVariant::Int)) {
         return report(true, "");
     }
+    if (variant.canConvert(QVariant::UInt)){
+        return report(true, "");
+    }
     if (variant.canConvert(QVariant::Double)) {
         return report(true, "");
     }
     if (variant.canConvert(QVariant::Bool)) {
         return report(true, "");
     }
+    if (variant.canConvert(QVariant::Color)) {
+        return report(true, "");
+    }
     return report(false, QString("Error validating basic type %1.").arg(variant.toString()));
 }
 
diff --git a/server/jsonrpc/jsontypes.h b/server/jsonrpc/jsontypes.h
index 47112e02..77e8b14d 100644
--- a/server/jsonrpc/jsontypes.h
+++ b/server/jsonrpc/jsontypes.h
@@ -81,9 +81,11 @@ public:
         Uuid,
         String,
         Int,
+        Uint,
         Double,
         Bool,
         Variant,
+        Color,
         Object
     };
 
diff --git a/tests/auto/api.json b/tests/auto/api.json
index 44c2ac46..5ffa60af 100644
--- a/tests/auto/api.json
+++ b/tests/auto/api.json
@@ -1,4 +1,4 @@
-12
+13
 {
     "methods": {
         "Actions.ExecuteAction": {
@@ -401,9 +401,11 @@
             "Uuid",
             "String",
             "Int",
+            "Uint",
             "Double",
             "Bool",
             "Variant",
+            "Color",
             "Object"
         ],
         "CreateMethod": [