Merge lp:~saiarcot895/libopenshot/qt-json into lp:libopenshot/0.0

[Saikrishna Arcot]

Switch from using JsonCPP to Qt Json.

Some things to note:
1. Qt 5.2 is required for this patch. If Qt 5.1 compatibility is needed, I can provide it.
2. The final JSON output with this patch is likely not compatible with the JSON output in the current version. This is in part because integers are being stored as literal integers instead of being converted to strings.
3. While none of the tests (I only found one) involving reading/writing JSON seem to have failed, there may be errors in the patch.

On another note, I found that the video length was being stored in "long int", which is 32 bits on Windows and 64 bits on Linux/Mac. Because of this, the lines that read/write the video length might not compile or work correctly on Windows.

Unmerged revisions

478. By Saikrishna Arcot on 2015-10-04

Switch from JsonCPP to Qt JSON.

=== modified file 'include/ChunkReader.h'
--- include/ChunkReader.h	2015-08-24 06:05:48 +0000
+++ include/ChunkReader.h	2015-10-04 15:21:00 +0000
@@ -158,8 +158,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root) throw(InvalidFile); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(const QJsonObject root) throw(InvalidFile); ///< Load QJsonObject into this object
 
 		/// Open the reader. This is required before you can access frames or data from the reader.
 		void Open() throw(InvalidFile);

=== modified file 'include/ChunkWriter.h'
--- include/ChunkWriter.h	2015-02-05 06:11:55 +0000
+++ include/ChunkWriter.h	2015-10-04 15:21:00 +0000
@@ -44,7 +44,6 @@
 #include "Magick++.h"
 #include "Cache.h"
 #include "Exceptions.h"
-#include "Json.h"
 #include "Sleep.h"
 
 

=== modified file 'include/Clip.h'
--- include/Clip.h	2015-08-24 06:05:48 +0000
+++ include/Clip.h	2015-10-04 15:21:00 +0000
@@ -193,8 +193,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(QJsonObject root); ///< Load QJsonObject into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)

=== modified file 'include/ClipBase.h'
--- include/ClipBase.h	2015-10-02 23:22:10 +0000
+++ include/ClipBase.h	2015-10-04 15:21:00 +0000
@@ -59,10 +59,10 @@
 		string previous_properties; ///< This string contains the previous JSON properties
 
 		/// Generate JSON for a property
-		Json::Value add_property_json(string name, float value, string type, string memo, bool contains_point, int number_of_points, float min_value, float max_value, InterpolationType intepolation, int closest_point_x, bool readonly);
+		QJsonObject add_property_json(string name, float value, string type, string memo, bool contains_point, int number_of_points, float min_value, float max_value, InterpolationType intepolation, int closest_point_x, bool readonly);
 
 		/// Generate JSON choice for a property (dropdown properties)
-		Json::Value add_property_choice_json(string name, int value, int selected_value);
+        QJsonObject add_property_choice_json(string name, int value, int selected_value);
 
 	public:
 
@@ -90,8 +90,8 @@
 		/// Get and Set JSON methods
 		virtual string Json() = 0; ///< Generate JSON string of this object
 		virtual void SetJson(string value) throw(InvalidJSON) = 0; ///< Load JSON string into this object
-		virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object
-		virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object
+		virtual QJsonObject JsonValue() = 0; ///< Generate QJsonObject for this object
+		virtual void SetJsonValue(const QJsonObject root) = 0; ///< Load QJsonObject into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)

=== modified file 'include/Color.h'
--- include/Color.h	2015-08-24 06:05:48 +0000
+++ include/Color.h	2015-10-04 15:21:00 +0000
@@ -67,9 +67,9 @@
 
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+		void SetJsonValue(QJsonObject root); ///< Load QJsonObject into this object
 	};
 
 

=== modified file 'include/Coordinate.h'
--- include/Coordinate.h	2015-02-05 06:11:55 +0000
+++ include/Coordinate.h	2015-10-04 15:21:00 +0000
@@ -92,9 +92,9 @@
 
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+		void SetJsonValue(QJsonObject root); ///< Load QJsonObject into this object
 	};
 
 }

=== modified file 'include/DecklinkReader.h'
--- include/DecklinkReader.h	2015-08-24 06:05:48 +0000
+++ include/DecklinkReader.h	2015-10-04 15:21:00 +0000
@@ -117,8 +117,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root) throw(InvalidFile); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(QJsonObject root) throw(InvalidFile); ///< Load QJsonObject into this object
 
 		/// Open device and video stream - which is called by the constructor automatically
 		void Open() throw(DecklinkError);

=== modified file 'include/DummyReader.h'
--- include/DummyReader.h	2015-08-24 06:05:48 +0000
+++ include/DummyReader.h	2015-10-04 15:21:00 +0000
@@ -84,8 +84,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root) throw(InvalidFile); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(QJsonObject root) throw(InvalidFile); ///< Load QJsonObject into this object
 
 		/// Open File - which is called by the constructor automatically
 		void Open() throw(InvalidFile);

=== modified file 'include/EffectBase.h'
--- include/EffectBase.h	2015-08-24 06:05:48 +0000
+++ include/EffectBase.h	2015-10-04 15:21:00 +0000
@@ -93,9 +93,9 @@
 		/// Get and Set JSON methods
 		virtual string Json() = 0; ///< Generate JSON string of this object
 		virtual void SetJson(string value) throw(InvalidJSON) = 0; ///< Load JSON string into this object
-		virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object
-		virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object
-		Json::Value JsonInfo(); ///< Generate JSON object of meta data / info
+        virtual QJsonObject JsonValue() = 0; ///< Generate QJsonObject for this object
+		virtual void SetJsonValue(const QJsonObject root) = 0; ///< Load QJsonObject into this object
+        QJsonObject JsonInfo(); ///< Generate JSON object of meta data / info
 
 		/// Get the order that this effect should be executed.
 		int Order() { return order; }

=== modified file 'include/EffectInfo.h'
--- include/EffectInfo.h	2015-08-07 01:01:34 +0000
+++ include/EffectInfo.h	2015-10-04 15:21:00 +0000
@@ -48,7 +48,7 @@
 
 		/// JSON methods
 		static string Json(); ///< Generate JSON string of this object
-		static Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
+        static QJsonArray JsonValue(); ///< Generate QJsonArray for this object
 
 	};
 

=== modified file 'include/FFmpegReader.h'
--- include/FFmpegReader.h	2015-08-24 06:05:48 +0000
+++ include/FFmpegReader.h	2015-10-04 15:21:00 +0000
@@ -255,8 +255,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root) throw(InvalidFile); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(QJsonObject root) throw(InvalidFile); ///< Load QJsonObject into this object
 
 		/// Open File - which is called by the constructor automatically
 		void Open() throw(InvalidFile, NoStreamsFound, InvalidCodec);

=== modified file 'include/FrameMapper.h'
--- include/FrameMapper.h	2015-08-24 06:05:48 +0000
+++ include/FrameMapper.h	2015-10-04 15:21:00 +0000
@@ -192,8 +192,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root) throw(InvalidFile); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(QJsonObject root) throw(InvalidFile); ///< Load QJsonObject into this object
 
 		/// Open the internal reader
 		void Open() throw(InvalidFile);

=== modified file 'include/ImageReader.h'
--- include/ImageReader.h	2015-08-24 06:05:48 +0000
+++ include/ImageReader.h	2015-10-04 15:21:00 +0000
@@ -96,8 +96,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root) throw(InvalidFile); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(QJsonObject root) throw(InvalidFile); ///< Load QJsonObject into this object
 
 		/// Open File - which is called by the constructor automatically
 		void Open() throw(InvalidFile);

=== modified file 'include/Json.h'
--- include/Json.h	2014-07-11 21:52:14 +0000
+++ include/Json.h	2015-10-04 15:21:00 +0000
@@ -28,6 +28,10 @@
 #ifndef OPENSHOT_JSON_H
 #define OPENSHOT_JSON_H
 
-#include "../thirdparty/jsoncpp/include/json/json.h"
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonParseError>
+#include <QtCore/QVariant> // Needed for int conversion
 
 #endif

=== modified file 'include/KeyFrame.h'
--- include/KeyFrame.h	2015-08-24 06:05:48 +0000
+++ include/KeyFrame.h	2015-10-04 15:21:00 +0000
@@ -152,9 +152,9 @@
 
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+		void SetJsonValue(QJsonObject root); ///< Load QJsonObject into this object
 
 		/**
 		 * @brief Calculate all of the values for this keyframe.

=== modified file 'include/Point.h'
--- include/Point.h	2015-02-21 06:12:21 +0000
+++ include/Point.h	2015-10-04 15:21:00 +0000
@@ -116,9 +116,9 @@
 
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+		void SetJsonValue(const QJsonObject root); ///< Load QJsonObject into this object
 
 	};
 

=== modified file 'include/Profiles.h'
--- include/Profiles.h	2014-07-11 21:52:14 +0000
+++ include/Profiles.h	2015-10-04 15:21:00 +0000
@@ -88,9 +88,9 @@
 
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+		void SetJsonValue(const QJsonObject root); ///< Load QJsonObject into this object
 	};
 
 }

=== modified file 'include/QtImageReader.h'
--- include/QtImageReader.h	2015-08-24 06:05:48 +0000
+++ include/QtImageReader.h	2015-10-04 15:21:00 +0000
@@ -98,8 +98,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root) throw(InvalidFile); ///< Load Json::JsonValue into this object
+        QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+        void SetJsonValue(QJsonObject root) throw(InvalidFile); ///< Load QJsonObject into this object
 
 		/// Open File - which is called by the constructor automatically
 		void Open() throw(InvalidFile);

=== modified file 'include/ReaderBase.h'
--- include/ReaderBase.h	2015-09-29 03:05:50 +0000
+++ include/ReaderBase.h	2015-10-04 15:21:00 +0000
@@ -98,10 +98,10 @@
 	    CriticalSection processingCriticalSection;
 
 	    /// Debug JSON root
-	    Json::Value debug_root;
+		QJsonArray debug_root;
 
 		/// Append debug information as JSON
-		void AppendDebugItem(Json::Value debug_item);
+		void AppendDebugItem(QJsonValue debug_item);
 
 		/// Append debug information as JSON
 		void AppendDebugMethod(string method_name, string arg1_name, float arg1_value,
@@ -152,8 +152,8 @@
 		/// Get and Set JSON methods
 		virtual string Json() = 0; ///< Generate JSON string of this object
 		virtual void SetJson(string value) throw(InvalidJSON) = 0; ///< Load JSON string into this object
-		virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object
-		virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object
+		virtual QJsonObject JsonValue() = 0; ///< Generate QJsonObject for this object
+		virtual void SetJsonValue(const QJsonObject root) = 0; ///< Load QJsonObject into this object
 
 		/// Open the reader (and start consuming resources, such as images or video files)
 		virtual void Open() = 0;

=== modified file 'include/TextReader.h'
--- include/TextReader.h	2015-08-24 06:05:48 +0000
+++ include/TextReader.h	2015-10-04 15:21:00 +0000
@@ -132,8 +132,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root) throw(InvalidFile); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(const QJsonObject root) throw(InvalidFile); ///< Load QJsonObject into this object
 
 		/// Open Reader - which is called by the constructor automatically
 		void Open();

=== modified file 'include/Timeline.h'
--- include/Timeline.h	2015-08-24 06:05:48 +0000
+++ include/Timeline.h	2015-10-04 15:21:00 +0000
@@ -156,10 +156,10 @@
 		void apply_mapper_to_clip(Clip* clip);
 
 		/// Apply JSON Diffs to various objects contained in this timeline
-		void apply_json_to_clips(Json::Value change) throw(InvalidJSONKey); ///<Apply JSON diff to clips
-		void apply_json_to_effects(Json::Value change) throw(InvalidJSONKey); ///< Apply JSON diff to effects
-		void apply_json_to_effects(Json::Value change, EffectBase* existing_effect) throw(InvalidJSONKey); ///<Apply JSON diff to a specific effect
-		void apply_json_to_timeline(Json::Value change) throw(InvalidJSONKey); ///<Apply JSON diff to timeline properties
+		void apply_json_to_clips(QJsonObject change) throw(InvalidJSONKey); ///<Apply JSON diff to clips
+		void apply_json_to_effects(QJsonObject change) throw(InvalidJSONKey); ///<Apply JSON diff to effects
+		void apply_json_to_effects(QJsonObject change, EffectBase* existing_effect) throw(InvalidJSONKey); ///<Apply JSON diff to a specific effect
+		void apply_json_to_timeline(QJsonObject change) throw(InvalidJSONKey); ///<Apply JSON diff to timeline properties
 
 		/// Calculate time of a frame number, based on a framerate
 		float calculate_time(long int number, Fraction rate);
@@ -247,8 +247,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root) throw(InvalidFile, ReaderClosed); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(QJsonObject root) throw(InvalidFile, ReaderClosed); ///< Load QJsonObject into this object
 
 		/// @brief Apply a special formatted JSON object, which represents a change to the timeline (add, update, delete)
 		/// This is primarily designed to keep the timeline (and its child objects... such as clips and effects) in sync

=== modified file 'include/WriterBase.h'
--- include/WriterBase.h	2015-09-29 03:05:50 +0000
+++ include/WriterBase.h	2015-10-04 15:21:00 +0000
@@ -86,10 +86,10 @@
 	protected:
 
 	    /// Debug JSON root
-	    Json::Value debug_root;
+		QJsonArray debug_root;
 
 		/// Append debug information as JSON
-		void AppendDebugItem(Json::Value debug_item);
+		void AppendDebugItem(QJsonValue debug_item);
 
 		/// Append debug information as JSON
 		void AppendDebugMethod(string method_name, string arg1_name, float arg1_value,
@@ -125,9 +125,9 @@
 
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+		void SetJsonValue(const QJsonObject root); ///< Load QJsonObject into this object
 
 		/// Display file information in the standard output stream (stdout)
 		void DisplayInfo();

=== modified file 'include/effects/Brightness.h'
--- include/effects/Brightness.h	2015-08-24 06:05:48 +0000
+++ include/effects/Brightness.h	2015-10-04 15:21:00 +0000
@@ -95,8 +95,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+        QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+        void SetJsonValue(QJsonObject root); ///< Load QJsonObject into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)

=== modified file 'include/effects/ChromaKey.h'
--- include/effects/ChromaKey.h	2015-08-24 06:05:48 +0000
+++ include/effects/ChromaKey.h	2015-10-04 15:21:00 +0000
@@ -88,8 +88,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(QJsonObject root); ///< Load QJsonObject into this object
 
 		// Get all properties for a specific frame
 		string PropertiesJSON(long int requested_frame);

=== modified file 'include/effects/Deinterlace.h'
--- include/effects/Deinterlace.h	2015-08-24 06:05:48 +0000
+++ include/effects/Deinterlace.h	2015-10-04 15:21:00 +0000
@@ -84,8 +84,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(QJsonObject root); ///< Load QJsonObject into this object
 
 		// Get all properties for a specific frame
 		string PropertiesJSON(long int requested_frame);

=== modified file 'include/effects/Mask.h'
--- include/effects/Mask.h	2015-08-24 06:05:48 +0000
+++ include/effects/Mask.h	2015-10-04 15:21:00 +0000
@@ -104,8 +104,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(QJsonObject root); ///< Load QJsonObject into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)

=== modified file 'include/effects/Negate.h'
--- include/effects/Negate.h	2015-08-24 06:05:48 +0000
+++ include/effects/Negate.h	2015-10-04 15:21:00 +0000
@@ -72,8 +72,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+		QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+		void SetJsonValue(QJsonObject root); ///< Load QJsonObject into this object
 
 		// Get all properties for a specific frame
 		string PropertiesJSON(long int requested_frame);

=== modified file 'include/effects/Saturation.h'
--- include/effects/Saturation.h	2015-08-24 06:05:48 +0000
+++ include/effects/Saturation.h	2015-10-04 15:21:00 +0000
@@ -92,8 +92,8 @@
 		/// Get and Set JSON methods
 		string Json(); ///< Generate JSON string of this object
 		void SetJson(string value) throw(InvalidJSON); ///< Load JSON string into this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
-		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+        QJsonObject JsonValue(); ///< Generate QJsonObject for this object
+        void SetJsonValue(QJsonObject root); ///< Load QJsonObject into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-08-07 01:01:34 +0000
+++ src/CMakeLists.txt	2015-10-04 15:21:00 +0000
@@ -145,10 +145,6 @@
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} ")
 endif(OPENMP_FOUND)
 
-################### JSONCPP #####################
-# Include jsoncpp headers (needed for JSON parsing)
-include_directories("../thirdparty/jsoncpp/include")
-
 ###############  PROFILING  #################
 #set(PROFILER "/usr/lib/libprofiler.so.0.3.2")
 #set(PROFILER "/usr/lib/libtcmalloc.so.4")
@@ -196,12 +192,7 @@
 		
 		# Qt Video Player
 		${QT_PLAYER_FILES}
-		${MOC_FILES}
-		
-		# Third Party JSON Parser
-		../thirdparty/jsoncpp/src/lib_json/json_reader.cpp
-		../thirdparty/jsoncpp/src/lib_json/json_value.cpp
-		../thirdparty/jsoncpp/src/lib_json/json_writer.cpp )
+		${MOC_FILES} )
 		
 		IF (BLACKMAGIC_FOUND)
 			SET ( OPENSHOT_SOURCE_FILES ${OPENSHOT_SOURCE_FILES} 

=== modified file 'src/ChunkReader.cpp'
--- src/ChunkReader.cpp	2015-08-24 06:05:48 +0000
+++ src/ChunkReader.cpp	2015-10-04 15:21:00 +0000
@@ -74,45 +74,51 @@
 	}
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( json_string.str(), root );
-	if (!success)
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(json_string.str().c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("Chunk folder could not be opened.", path);
-
+	}
+	const QJsonObject root = document.object();
 
 	// Set info from the JSON objects
 	try
 	{
-		info.has_video = root["has_video"].asBool();
-		info.has_audio = root["has_audio"].asBool();
-		info.duration = root["duration"].asDouble();
-		info.file_size = atoll(root["file_size"].asString().c_str());
-		info.height = root["height"].asInt();
-		info.width = root["width"].asInt();
-		info.pixel_format = root["pixel_format"].asInt();
-		info.fps.num = root["fps"]["num"].asInt();
-		info.fps.den = root["fps"]["den"].asInt();
-		info.video_bit_rate = root["video_bit_rate"].asUInt();
-		info.pixel_ratio.num = root["pixel_ratio"]["num"].asInt();
-		info.pixel_ratio.den = root["pixel_ratio"]["den"].asInt();
-		info.display_ratio.num = root["display_ratio"]["num"].asInt();
-		info.display_ratio.den = root["display_ratio"]["den"].asInt();
-		info.vcodec = root["vcodec"].asString();
-		info.video_length = atoll(root["video_length"].asString().c_str());
-		info.video_stream_index = root["video_stream_index"].asInt();
-		info.video_timebase.num = root["video_timebase"]["num"].asInt();
-		info.video_timebase.den = root["video_timebase"]["den"].asInt();
-		info.interlaced_frame = root["interlaced_frame"].asBool();
-		info.top_field_first = root["top_field_first"].asBool();
-		info.acodec = root["acodec"].asString();
-		info.audio_bit_rate = root["audio_bit_rate"].asUInt();
-		info.sample_rate = root["sample_rate"].asUInt();
-		info.channels = root["channels"].asInt();
-		info.audio_stream_index = root["audio_stream_index"].asInt();
-		info.audio_timebase.num = root["audio_timebase"]["num"].asInt();
-		info.audio_timebase.den = root["audio_timebase"]["den"].asInt();
+		info.has_video = root["has_video"].toBool();
+		info.has_audio = root["has_audio"].toBool();
+		info.duration = root["duration"].toDouble();
+		info.file_size = root["file_size"].toVariant().toLongLong();
+		info.height = root["height"].toVariant().toInt();
+		info.width = root["width"].toVariant().toInt();
+		info.pixel_format = root["pixel_format"].toVariant().toInt();
+		const QJsonObject fpsObject = root["fps"].toObject();
+		info.fps.num = fpsObject["num"].toVariant().toInt();
+		info.fps.den = fpsObject["den"].toVariant().toInt();
+		info.video_bit_rate = root["video_bit_rate"].toVariant().toUInt();
+		const QJsonObject pixelRatioObject = root["pixel_ratio"].toObject();
+		info.pixel_ratio.num = pixelRatioObject["num"].toVariant().toInt();
+		info.pixel_ratio.den = pixelRatioObject["den"].toVariant().toInt();
+		const QJsonObject displayRatioObject = root["display_ratio"].toObject();
+		info.display_ratio.num = displayRatioObject["num"].toVariant().toInt();
+		info.display_ratio.den = displayRatioObject["den"].toVariant().toInt();
+		info.vcodec = root["vcodec"].toString().toLocal8Bit().constData();
+		info.video_length = root["video_length"].toVariant().toLongLong();
+		info.video_stream_index = root["video_stream_index"].toVariant().toInt();
+		const QJsonObject videoTimebaseObject = root["video_timebase"].toObject();
+		info.video_timebase.num = videoTimebaseObject["num"].toVariant().toInt();
+		info.video_timebase.den = videoTimebaseObject["den"].toVariant().toInt();
+		info.interlaced_frame = root["interlaced_frame"].toBool();
+		info.top_field_first = root["top_field_first"].toBool();
+		info.acodec = root["acodec"].toString().toLocal8Bit().constData();
+		info.audio_bit_rate = root["audio_bit_rate"].toVariant().toUInt();
+		info.sample_rate = root["sample_rate"].toVariant().toUInt();
+		info.channels = root["channels"].toVariant().toInt();
+		info.audio_stream_index = root["audio_stream_index"].toVariant().toInt();
+		const QJsonObject audioTimebaseObject = root["audio_timebase"].toObject();
+		info.audio_timebase.num = audioTimebaseObject["num"].toVariant().toInt();
+		info.audio_timebase.den = audioTimebaseObject["den"].toVariant().toInt();
 
 	}
 	catch (exception e)
@@ -253,17 +259,18 @@
 // Generate JSON string of this object
 string ChunkReader::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+		QJsonDocument document;
+		document.setObject(JsonValue());
+		return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value ChunkReader::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject ChunkReader::JsonValue() {
 
 	// Create root json object
-	Json::Value root = ReaderBase::JsonValue(); // get parent properties
+	QJsonObject root = ReaderBase::JsonValue(); // get parent properties
 	root["type"] = "ChunkReader";
-	root["path"] = path;
+	root["path"] = path.c_str();
 	root["chunk_size"] = chunk_size;
 	root["chunk_version"] = version;
 
@@ -275,12 +282,16 @@
 void ChunkReader::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+    QJsonParseError errors;
+
+    QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+    if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+    }
+
+    root = document.object();
 
 	try
 	{
@@ -294,19 +305,19 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void ChunkReader::SetJsonValue(Json::Value root) throw(InvalidFile) {
+// Load QJsonObject into this object
+void ChunkReader::SetJsonValue(const QJsonObject root) throw(InvalidFile) {
 
 	// Set parent data
 	ReaderBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["path"].isNull())
-		path = root["path"].asString();
+		path = root["path"].toString().toLocal8Bit().constData();
 	if (!root["chunk_size"].isNull())
-		chunk_size = root["chunk_size"].asInt();
+		chunk_size = root["chunk_size"].toVariant().toInt();
 	if (!root["chunk_version"].isNull())
-		version = (ChunkVersion) root["chunk_version"].asInt();
+		version = (ChunkVersion) root["chunk_version"].toVariant().toInt();
 
 	// Re-Open path, and re-init everything (if needed)
 	if (is_open)

=== modified file 'src/Clip.cpp'
--- src/Clip.cpp	2015-10-02 23:22:10 +0000
+++ src/Clip.cpp	2015-10-04 15:21:00 +0000
@@ -145,8 +145,8 @@
 		} catch(...) {
 			try
 			{
-				// Try a video reader
-				reader = new FFmpegReader(path);
+	// Try a video reader
+	reader = new FFmpegReader(path);
 
 			} catch(...) { }
 		}
@@ -531,7 +531,9 @@
 string Clip::Json() {
 
 	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
 // Get all properties for a specific frame
@@ -541,7 +543,7 @@
 	Point requested_point(requested_frame, requested_frame);
 
 	// Generate JSON properties list
-	Json::Value root;
+	QJsonObject root;
 	root["id"] = add_property_json("ID", 0.0, "string", Id(), false, 0, -1, -1, CONSTANT, -1, true);
 	root["position"] = add_property_json("Position", Position(), "float", "", false, 0, 0, 1000 * 60 * 30, CONSTANT, -1, false);
 	root["layer"] = add_property_json("Layer", Layer(), "int", "", false, 0, 0, 1000, CONSTANT, -1, false);
@@ -554,29 +556,29 @@
 	root["waveform"] = add_property_json("Waveform", waveform, "bool", "", false, 0, -1, -1, CONSTANT, -1, false);
 
 	// Add gravity choices (dropdown style)
-	root["gravity"]["choices"].append(add_property_choice_json("Top Left", GRAVITY_TOP_LEFT, gravity));
-	root["gravity"]["choices"].append(add_property_choice_json("Top Center", GRAVITY_TOP, gravity));
-	root["gravity"]["choices"].append(add_property_choice_json("Top Right", GRAVITY_TOP_RIGHT, gravity));
-	root["gravity"]["choices"].append(add_property_choice_json("Left", GRAVITY_LEFT, gravity));
-	root["gravity"]["choices"].append(add_property_choice_json("Center", GRAVITY_CENTER, gravity));
-	root["gravity"]["choices"].append(add_property_choice_json("Right", GRAVITY_RIGHT, gravity));
-	root["gravity"]["choices"].append(add_property_choice_json("Bottom Left", GRAVITY_BOTTOM_LEFT, gravity));
-	root["gravity"]["choices"].append(add_property_choice_json("Bottom Center", GRAVITY_BOTTOM, gravity));
-	root["gravity"]["choices"].append(add_property_choice_json("Bottom Right", GRAVITY_BOTTOM_RIGHT, gravity));
+    root["gravity"].toObject()["choices"].toArray().append(add_property_choice_json("Top Left", GRAVITY_TOP_LEFT, gravity));
+    root["gravity"].toObject()["choices"].toArray().append(add_property_choice_json("Top Center", GRAVITY_TOP, gravity));
+    root["gravity"].toObject()["choices"].toArray().append(add_property_choice_json("Top Right", GRAVITY_TOP_RIGHT, gravity));
+    root["gravity"].toObject()["choices"].toArray().append(add_property_choice_json("Left", GRAVITY_LEFT, gravity));
+    root["gravity"].toObject()["choices"].toArray().append(add_property_choice_json("Center", GRAVITY_CENTER, gravity));
+    root["gravity"].toObject()["choices"].toArray().append(add_property_choice_json("Right", GRAVITY_RIGHT, gravity));
+    root["gravity"].toObject()["choices"].toArray().append(add_property_choice_json("Bottom Left", GRAVITY_BOTTOM_LEFT, gravity));
+    root["gravity"].toObject()["choices"].toArray().append(add_property_choice_json("Bottom Center", GRAVITY_BOTTOM, gravity));
+    root["gravity"].toObject()["choices"].toArray().append(add_property_choice_json("Bottom Right", GRAVITY_BOTTOM_RIGHT, gravity));
 
 	// Add scale choices (dropdown style)
-	root["scale"]["choices"].append(add_property_choice_json("Crop", SCALE_CROP, scale));
-	root["scale"]["choices"].append(add_property_choice_json("Best Fit", SCALE_FIT, scale));
-	root["scale"]["choices"].append(add_property_choice_json("Stretch", SCALE_STRETCH, scale));
-	root["scale"]["choices"].append(add_property_choice_json("None", SCALE_NONE, scale));
+    root["scale"].toObject()["choices"].toArray().append(add_property_choice_json("Crop", SCALE_CROP, scale));
+    root["scale"].toObject()["choices"].toArray().append(add_property_choice_json("Best Fit", SCALE_FIT, scale));
+    root["scale"].toObject()["choices"].toArray().append(add_property_choice_json("Stretch", SCALE_STRETCH, scale));
+    root["scale"].toObject()["choices"].toArray().append(add_property_choice_json("None", SCALE_NONE, scale));
 
 	// Add anchor choices (dropdown style)
-	root["anchor"]["choices"].append(add_property_choice_json("Canvas", ANCHOR_CANVAS, anchor));
-	root["anchor"]["choices"].append(add_property_choice_json("Viewport", ANCHOR_VIEWPORT, anchor));
+    root["anchor"].toObject()["choices"].toArray().append(add_property_choice_json("Canvas", ANCHOR_CANVAS, anchor));
+    root["anchor"].toObject()["choices"].toArray().append(add_property_choice_json("Viewport", ANCHOR_VIEWPORT, anchor));
 
 	// Add waveform choices (dropdown style)
-	root["waveform"]["choices"].append(add_property_choice_json("Yes", true, waveform));
-	root["waveform"]["choices"].append(add_property_choice_json("No", false, waveform));
+    root["waveform"].toObject()["choices"].toArray().append(add_property_choice_json("Yes", true, waveform));
+    root["waveform"].toObject()["choices"].toArray().append(add_property_choice_json("No", false, waveform));
 
 	// Keyframes
 	root["location_x"] = add_property_json("Location X", location_x.GetValue(requested_frame), "float", "", location_x.Contains(requested_point), location_x.GetCount(), -10000, 10000, location_x.GetClosestPoint(requested_point).interpolation, location_x.GetClosestPoint(requested_point).co.X, false);
@@ -589,14 +591,16 @@
 	root["time"] = add_property_json("Time", time.GetValue(requested_frame), "float", "", time.Contains(requested_point), time.GetCount(), 0.0, 1000 * 60 * 30, time.GetClosestPoint(requested_point).interpolation, time.GetClosestPoint(requested_point).co.X, false);
 
 	// Return formatted string
-	return root.toStyledString();
+	QJsonDocument document;
+	document.setObject(root);
+	return document.toJson().constData();
 }
 
 // Generate Json::JsonValue for this object
-Json::Value Clip::JsonValue() {
+QJsonObject Clip::JsonValue() {
 
 	// Create root json object
-	Json::Value root = ClipBase::JsonValue(); // get parent properties
+	QJsonObject root = ClipBase::JsonValue(); // get parent properties
 	root["gravity"] = gravity;
 	root["scale"] = scale;
 	root["anchor"] = anchor;
@@ -626,7 +630,7 @@
 	root["perspective_c4_y"] = perspective_c4_y.JsonValue();
 
 	// Add array of effects
-	root["effects"] = Json::Value(Json::arrayValue);
+	root["effects"] = QJsonArray();
 
 	// loop through effects
 	list<EffectBase*>::iterator effect_itr;
@@ -634,7 +638,7 @@
 	{
 		// Get clip object from the iterator
 		EffectBase *existing_effect = (*effect_itr);
-		root["effects"].append(existing_effect->JsonValue());
+		root["effects"].toArray().append(existing_effect->JsonValue());
 	}
 
 	if (reader)
@@ -648,12 +652,14 @@
 void Clip::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
 
 	try
 	{
@@ -668,97 +674,97 @@
 }
 
 // Load Json::JsonValue into this object
-void Clip::SetJsonValue(Json::Value root) {
+void Clip::SetJsonValue(QJsonObject root) {
 
 	// Set parent data
 	ClipBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["gravity"].isNull())
-		gravity = (GravityType) root["gravity"].asInt();
+        gravity = (GravityType) root["gravity"].toInt();
 	if (!root["scale"].isNull())
-		scale = (ScaleType) root["scale"].asInt();
+        scale = (ScaleType) root["scale"].toInt();
 	if (!root["anchor"].isNull())
-		anchor = (AnchorType) root["anchor"].asInt();
+        anchor = (AnchorType) root["anchor"].toInt();
 	if (!root["waveform"].isNull())
-		waveform = root["waveform"].asBool();
+        waveform = root["waveform"].toBool();
 	if (!root["scale_x"].isNull())
-		scale_x.SetJsonValue(root["scale_x"]);
+        scale_x.SetJsonValue(root["scale_x"].toObject());
 	if (!root["scale_y"].isNull())
-		scale_y.SetJsonValue(root["scale_y"]);
+        scale_y.SetJsonValue(root["scale_y"].toObject());
 	if (!root["location_x"].isNull())
-		location_x.SetJsonValue(root["location_x"]);
+        location_x.SetJsonValue(root["location_x"].toObject());
 	if (!root["location_y"].isNull())
-		location_y.SetJsonValue(root["location_y"]);
+        location_y.SetJsonValue(root["location_y"].toObject());
 	if (!root["alpha"].isNull())
-		alpha.SetJsonValue(root["alpha"]);
+        alpha.SetJsonValue(root["alpha"].toObject());
 	if (!root["rotation"].isNull())
-		rotation.SetJsonValue(root["rotation"]);
+        rotation.SetJsonValue(root["rotation"].toObject());
 	if (!root["time"].isNull())
-		time.SetJsonValue(root["time"]);
+        time.SetJsonValue(root["time"].toObject());
 	if (!root["volume"].isNull())
-		volume.SetJsonValue(root["volume"]);
+        volume.SetJsonValue(root["volume"].toObject());
 	if (!root["wave_color"].isNull())
-		wave_color.SetJsonValue(root["wave_color"]);
+        wave_color.SetJsonValue(root["wave_color"].toObject());
 	if (!root["crop_width"].isNull())
-		crop_width.SetJsonValue(root["crop_width"]);
+        crop_width.SetJsonValue(root["crop_width"].toObject());
 	if (!root["crop_height"].isNull())
-		crop_height.SetJsonValue(root["crop_height"]);
+        crop_height.SetJsonValue(root["crop_height"].toObject());
 	if (!root["crop_x"].isNull())
-		crop_x.SetJsonValue(root["crop_x"]);
+        crop_x.SetJsonValue(root["crop_x"].toObject());
 	if (!root["crop_y"].isNull())
-		crop_y.SetJsonValue(root["crop_y"]);
+        crop_y.SetJsonValue(root["crop_y"].toObject());
 	if (!root["shear_x"].isNull())
-		shear_x.SetJsonValue(root["shear_x"]);
+        shear_x.SetJsonValue(root["shear_x"].toObject());
 	if (!root["shear_y"].isNull())
-		shear_y.SetJsonValue(root["shear_y"]);
+        shear_y.SetJsonValue(root["shear_y"].toObject());
 	if (!root["perspective_c1_x"].isNull())
-		perspective_c1_x.SetJsonValue(root["perspective_c1_x"]);
+        perspective_c1_x.SetJsonValue(root["perspective_c1_x"].toObject());
 	if (!root["perspective_c1_y"].isNull())
-		perspective_c1_y.SetJsonValue(root["perspective_c1_y"]);
+        perspective_c1_y.SetJsonValue(root["perspective_c1_y"].toObject());
 	if (!root["perspective_c2_x"].isNull())
-		perspective_c2_x.SetJsonValue(root["perspective_c2_x"]);
+        perspective_c2_x.SetJsonValue(root["perspective_c2_x"].toObject());
 	if (!root["perspective_c2_y"].isNull())
-		perspective_c2_y.SetJsonValue(root["perspective_c2_y"]);
+        perspective_c2_y.SetJsonValue(root["perspective_c2_y"].toObject());
 	if (!root["perspective_c3_x"].isNull())
-		perspective_c3_x.SetJsonValue(root["perspective_c3_x"]);
+        perspective_c3_x.SetJsonValue(root["perspective_c3_x"].toObject());
 	if (!root["perspective_c3_y"].isNull())
-		perspective_c3_y.SetJsonValue(root["perspective_c3_y"]);
+        perspective_c3_y.SetJsonValue(root["perspective_c3_y"].toObject());
 	if (!root["perspective_c4_x"].isNull())
-		perspective_c4_x.SetJsonValue(root["perspective_c4_x"]);
+        perspective_c4_x.SetJsonValue(root["perspective_c4_x"].toObject());
 	if (!root["perspective_c4_y"].isNull())
-		perspective_c4_y.SetJsonValue(root["perspective_c4_y"]);
+        perspective_c4_y.SetJsonValue(root["perspective_c4_y"].toObject());
 	if (!root["effects"].isNull()) {
 
 		// Clear existing effects
 		effects.clear();
 
 		// loop through effects
-		for (int x = 0; x < root["effects"].size(); x++) {
+        for (int x = 0; x < root["effects"].toArray().size(); x++) {
 			// Get each effect
-			Json::Value existing_effect = root["effects"][x];
+            QJsonObject existing_effect = root["effects"].toArray()[x].toObject();
 
 			// Create Effect
 			EffectBase *e = NULL;
 
 			if (!existing_effect["type"].isNull())
 				// Init the matching effect object
-				if (existing_effect["type"].asString() == "Brightness")
+                if (existing_effect["type"].toString() == "Brightness")
 					e = new Brightness();
 
-				else if (existing_effect["type"].asString() == "ChromaKey")
+                else if (existing_effect["type"].toString() == "ChromaKey")
 					e = new ChromaKey();
 
-				else if (existing_effect["type"].asString() == "Deinterlace")
+                else if (existing_effect["type"].toString() == "Deinterlace")
 					e = new Deinterlace();
 
-				else if (existing_effect["type"].asString() == "Mask")
+                else if (existing_effect["type"].toString() == "Mask")
 					e = new Mask();
 
-				else if (existing_effect["type"].asString() == "Negate")
+                else if (existing_effect["type"].toString() == "Negate")
 					e = new Negate();
 
-				else if (existing_effect["type"].asString() == "Saturation")
+                else if (existing_effect["type"].toString() == "Saturation")
 					e = new Saturation();
 
 			// Load Json into Effect
@@ -770,7 +776,7 @@
 	}
 	if (!root["reader"].isNull()) // does Json contain a reader?
 	{
-		if (!root["reader"]["type"].isNull()) // does the reader Json contain a 'type'?
+		if (!root["reader"].toObject()["type"].isNull()) // does the reader Json contain a 'type'?
 		{
 			// Close previous reader (if any)
 			bool already_open = false;
@@ -786,43 +792,43 @@
 			}
 
 			// Create new reader (and load properties)
-			string type = root["reader"]["type"].asString();
+            string type = root["reader"].toObject()["type"].toString().toLocal8Bit().constData();
 
 			if (type == "FFmpegReader") {
 
 				// Create new reader
-				reader = new FFmpegReader(root["reader"]["path"].asString());
-				reader->SetJsonValue(root["reader"]);
+                reader = new FFmpegReader(root["reader"].toObject()["path"].toString().toLocal8Bit().constData());
+                reader->SetJsonValue(root["reader"].toObject());
 
 			} else if (type == "QtImageReader") {
 
 				// Create new reader
-				reader = new QtImageReader(root["reader"]["path"].asString());
-				reader->SetJsonValue(root["reader"]);
+                reader = new QtImageReader(root["reader"].toObject()["path"].toString().toLocal8Bit().constData());
+                reader->SetJsonValue(root["reader"].toObject());
 
 			} else if (type == "ImageReader") {
 
 				// Create new reader
-				reader = new ImageReader(root["reader"]["path"].asString());
-				reader->SetJsonValue(root["reader"]);
+                reader = new ImageReader(root["reader"].toObject()["path"].toString().toLocal8Bit().constData());
+                reader->SetJsonValue(root["reader"].toObject());
 
 			} else if (type == "TextReader") {
 
 				// Create new reader
 				reader = new TextReader();
-				reader->SetJsonValue(root["reader"]);
+                reader->SetJsonValue(root["reader"].toObject());
 
 			} else if (type == "ChunkReader") {
 
 				// Create new reader
-				reader = new ChunkReader(root["reader"]["path"].asString(), (ChunkVersion) root["reader"]["chunk_version"].asInt());
-				reader->SetJsonValue(root["reader"]);
+                reader = new ChunkReader(root["reader"].toObject()["path"].toString().toLocal8Bit().constData(), (ChunkVersion) root["reader"].toObject()["chunk_version"].toInt());
+                reader->SetJsonValue(root["reader"].toObject());
 
 			} else if (type == "DummyReader") {
 
 				// Create new reader
 				reader = new DummyReader();
-				reader->SetJsonValue(root["reader"]);
+                reader->SetJsonValue(root["reader"].toObject());
 			}
 
 			// mark as managed reader

=== modified file 'src/ClipBase.cpp'
--- src/ClipBase.cpp	2015-10-02 23:22:10 +0000
+++ src/ClipBase.cpp	2015-10-04 15:21:00 +0000
@@ -29,12 +29,12 @@
 
 using namespace openshot;
 
-// Generate Json::JsonValue for this object
-Json::Value ClipBase::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject ClipBase::JsonValue() {
 
 	// Create root json object
-	Json::Value root;
-	root["id"] = Id();
+	QJsonObject root;
+	root["id"] = Id().c_str();
 	root["position"] = Position();
 	root["layer"] = Layer();
 	root["start"] = Start();
@@ -45,31 +45,31 @@
 	return root;
 }
 
-// Load Json::JsonValue into this object
-void ClipBase::SetJsonValue(Json::Value root) {
+// Load QJsonObject into this object
+void ClipBase::SetJsonValue(const QJsonObject root) {
 
 	// Set data from Json (if key is found)
 	if (!root["id"].isNull())
-		Id(root["id"].asString());
+		Id(root["id"].toString().toLocal8Bit().constData());
 	if (!root["position"].isNull())
-		Position(root["position"].asDouble());
+		Position(root["position"].toDouble());
 	if (!root["layer"].isNull())
-		Layer(root["layer"].asInt());
+		Layer(root["layer"].toVariant().toInt());
 	if (!root["start"].isNull())
-		Start(root["start"].asDouble());
+		Start(root["start"].toDouble());
 	if (!root["end"].isNull())
-		End(root["end"].asDouble());
+		End(root["end"].toDouble());
 }
 
 // Generate JSON for a property
-Json::Value ClipBase::add_property_json(string name, float value, string type, string memo, bool contains_point, int number_of_points, float min_value, float max_value, InterpolationType intepolation, int closest_point_x, bool readonly) {
+QJsonObject ClipBase::add_property_json(string name, float value, string type, string memo, bool contains_point, int number_of_points, float min_value, float max_value, InterpolationType intepolation, int closest_point_x, bool readonly) {
 
 	// Create JSON Object
-	Json::Value prop = Json::Value(Json::objectValue);
-	prop["name"] = name;
+	QJsonObject prop;
+	prop["name"] = name.c_str();
 	prop["value"] = value;
-	prop["memo"] = memo;
-	prop["type"] = type;
+	prop["memo"] = memo.c_str();
+	prop["type"] = type.c_str();
 	prop["min"] = min_value;
 	prop["max"] = max_value;
 	prop["keyframe"] = contains_point;
@@ -77,20 +77,20 @@
 	prop["readonly"] = readonly;
 	prop["interpolation"] = intepolation;
 	prop["closest_point_x"] = closest_point_x;
-	prop["choices"] = Json::Value(Json::arrayValue);
+    prop["choices"] = QJsonArray();
 
 	// return JsonValue
 	return prop;
 }
 
-Json::Value ClipBase::add_property_choice_json(string name, int value, int selected_value) {
+QJsonObject ClipBase::add_property_choice_json(string name, int value, int selected_value) {
 
-	// Create choice
-	Json::Value new_choice = Json::Value(Json::objectValue);
-	new_choice["name"] = name;
+    // Create choice
+    QJsonObject new_choice;
+    new_choice["name"] = name.c_str();
 	new_choice["value"] = value;
 	new_choice["selected"] = (value == selected_value);
 
 	// return JsonValue
 	return new_choice;
-}
\ No newline at end of file
+}

=== modified file 'src/Color.cpp'
--- src/Color.cpp	2015-10-01 23:51:59 +0000
+++ src/Color.cpp	2015-10-04 15:21:00 +0000
@@ -84,15 +84,16 @@
 // Generate JSON string of this object
 string Color::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value Color::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject Color::JsonValue() {
 
 	// Create root json object
-	Json::Value root;
+	QJsonObject root;
 	root["red"] = red.JsonValue();
 	root["green"] = green.JsonValue();
 	root["blue"] = blue.JsonValue();
@@ -106,12 +107,16 @@
 void Color::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -126,15 +131,15 @@
 }
 
 // Load Json::JsonValue into this object
-void Color::SetJsonValue(Json::Value root) {
+void Color::SetJsonValue(QJsonObject root) {
 
 	// Set data from Json (if key is found)
-	if (!root["red"].isNull())
-		red.SetJsonValue(root["red"]);
+    if (!root["red"].isNull())
+        red.SetJsonValue(root["red"].toObject());
 	if (!root["green"].isNull())
-		green.SetJsonValue(root["green"]);
+        green.SetJsonValue(root["green"].toObject());
 	if (!root["blue"].isNull())
-		blue.SetJsonValue(root["blue"]);
+        blue.SetJsonValue(root["blue"].toObject());
 	if (!root["alpha"].isNull())
-		alpha.SetJsonValue(root["alpha"]);
+        alpha.SetJsonValue(root["alpha"].toObject());
 }

=== modified file 'src/Coordinate.cpp'
--- src/Coordinate.cpp	2014-07-11 21:52:14 +0000
+++ src/Coordinate.cpp	2015-10-04 15:21:00 +0000
@@ -44,15 +44,16 @@
 // Generate JSON string of this object
 string Coordinate::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value Coordinate::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject Coordinate::JsonValue() {
 
 	// Create root json object
-	Json::Value root;
+	QJsonObject root;
 	root["X"] = X;
 	root["Y"] = Y;
 	//root["increasing"] = increasing;
@@ -69,12 +70,16 @@
 void Coordinate::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -88,23 +93,24 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void Coordinate::SetJsonValue(Json::Value root) {
+// Load QJsonObject into this object
+void Coordinate::SetJsonValue(QJsonObject root) {
 
 	// Set data from Json (if key is found)
 	if (!root["X"].isNull())
-		X = root["X"].asDouble();
+		X = root["X"].toDouble();
 	if (!root["Y"].isNull())
-		Y = root["Y"].asDouble();
+		Y = root["Y"].toDouble();
 	if (!root["increasing"].isNull())
-		increasing = root["increasing"].asBool();
+		increasing = root["increasing"].toBool();
 	if (!root["repeated"].isNull() && root["repeated"].isObject())
 	{
-		if (!root["repeated"]["num"].isNull())
-			repeated.num = root["repeated"]["num"].asInt();
-		if (!root["repeated"]["den"].isNull())
-			repeated.den = root["repeated"]["den"].asInt();
+		const QJsonObject repeatedObject = root["repeated"].toObject();
+		if (!root["repeated"].toObject()["num"].isNull())
+		    repeated.num = repeatedObject["num"].toVariant().toInt();
+		if (!root["repeated"].toObject()["den"].isNull())
+		    repeated.den = repeatedObject["den"].toVariant().toInt();
 	}
 	if (!root["delta"].isNull())
-		delta = root["delta"].asDouble();
+		delta = root["delta"].toDouble();
 }

=== modified file 'src/DecklinkReader.cpp'
--- src/DecklinkReader.cpp	2015-08-24 06:05:48 +0000
+++ src/DecklinkReader.cpp	2015-10-04 15:21:00 +0000
@@ -249,12 +249,12 @@
 	return JsonValue().toStyledString();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value DecklinkReader::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject DecklinkReader::JsonValue() {
 
 	// Create root json object
-	Json::Value root = ReaderBase::JsonValue(); // get parent properties
-	root["type"] = "DecklinkReader";
+	QJsonObject root = ReaderBase::JsonValue(); // get parent properties
+	root.insert("type", QJsonValue("DecklinkReader"));
 
 	// return JsonValue
 	return root;
@@ -264,12 +264,16 @@
 void DecklinkReader::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -283,8 +287,8 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void DecklinkReader::SetJsonValue(Json::Value root) throw(InvalidFile) {
+// Load QJsonObject into this object
+void DecklinkReader::SetJsonValue(QJsonObject root) throw(InvalidFile) {
 
 	// Set parent data
 	ReaderBase::SetJsonValue(root);

=== modified file 'src/DummyReader.cpp'
--- src/DummyReader.cpp	2015-08-24 06:05:48 +0000
+++ src/DummyReader.cpp	2015-10-04 15:21:00 +0000
@@ -120,15 +120,16 @@
 // Generate JSON string of this object
 string DummyReader::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value DummyReader::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject DummyReader::JsonValue() {
 
 	// Create root json object
-	Json::Value root = ReaderBase::JsonValue(); // get parent properties
+	QJsonObject root = ReaderBase::JsonValue(); // get parent properties
 	root["type"] = "DummyReader";
 
 	// return JsonValue
@@ -139,12 +140,16 @@
 void DummyReader::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -158,8 +163,8 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void DummyReader::SetJsonValue(Json::Value root) throw(InvalidFile) {
+// Load QJsonObject into this object
+void DummyReader::SetJsonValue(QJsonObject root) throw(InvalidFile) {
 
 	// Set parent data
 	ReaderBase::SetJsonValue(root);

=== modified file 'src/EffectBase.cpp'
--- src/EffectBase.cpp	2015-08-07 01:01:34 +0000
+++ src/EffectBase.cpp	2015-10-04 15:21:00 +0000
@@ -61,15 +61,16 @@
 // Generate JSON string of this object
 string EffectBase::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value EffectBase::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject EffectBase::JsonValue() {
 
 	// Create root json object
-	Json::Value root = ClipBase::JsonValue(); // get parent properties
+	QJsonObject root = ClipBase::JsonValue(); // get parent properties
 	root["order"] = Order();
 
 	// return JsonValue
@@ -80,12 +81,16 @@
 void EffectBase::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -99,29 +104,29 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void EffectBase::SetJsonValue(Json::Value root) {
+// Load QJsonObject into this object
+void EffectBase::SetJsonValue(const QJsonObject root) {
 
 	// Set parent data
 	ClipBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["order"].isNull())
-		Order(root["order"].asInt());
+		Order(root["order"].toVariant().toInt());
 }
 
-// Generate Json::JsonValue for this object
-Json::Value EffectBase::JsonInfo() {
+// Generate QJsonObject for this object
+QJsonObject EffectBase::JsonInfo() {
 
 	// Create root json object
-	Json::Value root;
-	root["name"] = info.name;
-	root["class_name"] = info.class_name;
-	root["short_name"] = info.short_name;
-	root["description"] = info.description;
+    QJsonObject root;
+    root["name"] = info.name.c_str();
+    root["class_name"] = info.class_name.c_str();
+    root["short_name"] = info.short_name.c_str();
+    root["description"] = info.description.c_str();
 	root["has_video"] = info.has_video;
 	root["has_audio"] = info.has_audio;
 
 	// return JsonValue
 	return root;
-}
\ No newline at end of file
+}

=== modified file 'src/EffectInfo.cpp'
--- src/EffectInfo.cpp	2015-08-17 03:58:07 +0000
+++ src/EffectInfo.cpp	2015-10-04 15:21:00 +0000
@@ -35,14 +35,16 @@
 string EffectInfo::Json() {
 
 	// Return formatted string
-	return JsonValue().toStyledString();
+    QJsonDocument document;
+    document.setArray(JsonValue());
+    return document.toJson().constData();
 }
 
 // Generate Json::JsonValue for this object
-Json::Value EffectInfo::JsonValue() {
+QJsonArray EffectInfo::JsonValue() {
 
 	// Create root json object
-	Json::Value root;
+    QJsonArray root;
 
 	// Append info JSON from each supported effect
 	root.append(Brightness().JsonInfo());

=== modified file 'src/FFmpegReader.cpp'
--- src/FFmpegReader.cpp	2015-10-01 18:00:50 +0000
+++ src/FFmpegReader.cpp	2015-10-04 15:21:00 +0000
@@ -252,7 +252,9 @@
 		}
 
 		// Clear debug json
-		debug_root.clear();
+		while (!debug_root.isEmpty()) {
+		    debug_root.removeFirst();
+		}
 
 		// Close the video file
 		avformat_close_input(&pFormatCtx);
@@ -1838,17 +1840,18 @@
 // Generate JSON string of this object
 string FFmpegReader::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value FFmpegReader::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject FFmpegReader::JsonValue() {
 
 	// Create root json object
-	Json::Value root = ReaderBase::JsonValue(); // get parent properties
+	QJsonObject root = ReaderBase::JsonValue(); // get parent properties
 	root["type"] = "FFmpegReader";
-	root["path"] = path;
+	root["path"] = path.c_str();
 
 	// return JsonValue
 	return root;
@@ -1858,12 +1861,16 @@
 void FFmpegReader::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -1877,15 +1884,15 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void FFmpegReader::SetJsonValue(Json::Value root) throw(InvalidFile) {
+// Load QJsonObject into this object
+void FFmpegReader::SetJsonValue(QJsonObject root) throw(InvalidFile) {
 
 	// Set parent data
 	ReaderBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["path"].isNull())
-		path = root["path"].asString();
+		path = root["path"].toString().toLocal8Bit().constData();
 
 	// Re-Open path, and re-init everything (if needed)
 	if (is_open)

=== modified file 'src/FrameMapper.cpp'
--- src/FrameMapper.cpp	2015-10-01 18:00:50 +0000
+++ src/FrameMapper.cpp	2015-10-04 15:21:00 +0000
@@ -538,18 +538,19 @@
 // Generate JSON string of this object
 string FrameMapper::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value FrameMapper::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject FrameMapper::JsonValue() {
 
 	// Create root json object
-	Json::Value root = ReaderBase::JsonValue(); // get parent properties
+	QJsonObject root = ReaderBase::JsonValue(); // get parent properties
 	root["type"] = "FrameMapper";
 
-	// return JsonValue
+	// return QJsonObject
 	return root;
 }
 
@@ -557,12 +558,16 @@
 void FrameMapper::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -576,8 +581,8 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void FrameMapper::SetJsonValue(Json::Value root) throw(InvalidFile) {
+// Load QJsonObject into this object
+void FrameMapper::SetJsonValue(QJsonObject root) throw(InvalidFile) {
 
 	// Set parent data
 	ReaderBase::SetJsonValue(root);

=== modified file 'src/ImageReader.cpp'
--- src/ImageReader.cpp	2015-09-29 03:05:50 +0000
+++ src/ImageReader.cpp	2015-10-04 15:21:00 +0000
@@ -123,19 +123,20 @@
 // Generate JSON string of this object
 string ImageReader::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value ImageReader::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject ImageReader::JsonValue() {
 
 	// Create root json object
-	Json::Value root = ReaderBase::JsonValue(); // get parent properties
+	QJsonObject root = ReaderBase::JsonValue(); // get parent properties
 	root["type"] = "ImageReader";
-	root["path"] = path;
+	root["path"] = path.c_str();
 
-	// return JsonValue
+	// return QJsonObject
 	return root;
 }
 
@@ -143,12 +144,16 @@
 void ImageReader::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -162,15 +167,15 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void ImageReader::SetJsonValue(Json::Value root) throw(InvalidFile) {
+// Load QJsonObject into this object
+void ImageReader::SetJsonValue(QJsonObject root) throw(InvalidFile) {
 
 	// Set parent data
 	ReaderBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["path"].isNull())
-		path = root["path"].asString();
+		path = root["path"].toString().toLocal8Bit().constData();
 
 	// Re-Open path, and re-init everything (if needed)
 	if (is_open)

=== modified file 'src/KeyFrame.cpp'
--- src/KeyFrame.cpp	2015-10-02 23:22:10 +0000
+++ src/KeyFrame.cpp	2015-10-04 15:21:00 +0000
@@ -305,22 +305,23 @@
 // Generate JSON string of this object
 string Keyframe::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value Keyframe::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject Keyframe::JsonValue() {
 
 	// Create root json object
-	Json::Value root;
-	root["Points"] = Json::Value(Json::arrayValue);
+	QJsonObject root;
+	root["Points"] = QJsonArray();
 
 	// loop through points, and find a matching coordinate
 	for (int x = 0; x < Points.size(); x++) {
 		// Get each point
 		Point existing_point = Points[x];
-		root["Points"].append(existing_point.JsonValue());
+		root["Points"].toArray().append(existing_point.JsonValue());
 	}
 
 	// return JsonValue
@@ -331,12 +332,16 @@
 void Keyframe::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -350,8 +355,8 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void Keyframe::SetJsonValue(Json::Value root) {
+// Load QJsonObject into this object
+void Keyframe::SetJsonValue(QJsonObject root) {
 
 	// mark as dirty
 	needs_update = true;
@@ -361,9 +366,9 @@
 
 	if (!root["Points"].isNull())
 		// loop through points
-		for (long int x = 0; x < root["Points"].size(); x++) {
+        for (long int x = 0; x < root["Points"].toArray().size(); x++) {
 			// Get each point
-			Json::Value existing_point = root["Points"][x];
+            QJsonObject existing_point = root["Points"].toArray()[x].toObject();
 
 			// Create Point
 			Point p;
@@ -376,7 +381,7 @@
 		}
 
 	if (!root["Auto_Handle_Percentage"].isNull())
-		Auto_Handle_Percentage = root["Auto_Handle_Percentage"].asBool();
+        Auto_Handle_Percentage = root["Auto_Handle_Percentage"].toBool();
 }
 
 // Get the fraction that represents how many times this value is repeated in the curve

=== modified file 'src/Point.cpp'
--- src/Point.cpp	2015-02-21 09:10:38 +0000
+++ src/Point.cpp	2015-10-04 15:21:00 +0000
@@ -96,15 +96,16 @@
 // Generate JSON string of this object
 string Point::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value Point::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject Point::JsonValue() {
 
 	// Create root json object
-	Json::Value root;
+	QJsonObject root;
 	root["co"] = co.JsonValue();
 	if (interpolation == BEZIER) {
 		root["handle_left"] = handle_left.JsonValue();
@@ -121,12 +122,16 @@
 void Point::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -140,18 +145,18 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void Point::SetJsonValue(Json::Value root) {
+// Load QJsonObject into this object
+void Point::SetJsonValue(const QJsonObject root) {
 
 	if (!root["co"].isNull())
-		co.SetJsonValue(root["co"]); // update coordinate
+		co.SetJsonValue(root["co"].toObject()); // update coordinate
 	if (!root["handle_left"].isNull())
-		handle_left.SetJsonValue(root["handle_left"]); // update coordinate
+		handle_left.SetJsonValue(root["handle_left"].toObject()); // update coordinate
 	if (!root["handle_right"].isNull())
-		handle_right.SetJsonValue(root["handle_right"]); // update coordinate
+		handle_right.SetJsonValue(root["handle_right"].toObject()); // update coordinate
 	if (!root["interpolation"].isNull())
-		interpolation = (InterpolationType) root["interpolation"].asInt();
+		interpolation = (InterpolationType) root["interpolation"].toVariant().toInt();
 	if (!root["handle_type"].isNull())
-		handle_type = (HandleType) root["handle_type"].asInt();
+		handle_type = (HandleType) root["handle_type"].toVariant().toInt();
 
 }

=== modified file 'src/Profiles.cpp'
--- src/Profiles.cpp	2014-07-11 21:52:14 +0000
+++ src/Profiles.cpp	2015-10-04 15:21:00 +0000
@@ -136,27 +136,28 @@
 // Generate JSON string of this object
 string Profile::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value Profile::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject Profile::JsonValue() {
 
 	// Create root json object
-	Json::Value root;
+	QJsonObject root;
 	root["height"] = info.height;
 	root["width"] = info.width;
 	root["pixel_format"] = info.pixel_format;
-	root["fps"] = Json::Value(Json::objectValue);
-	root["fps"]["num"] = info.fps.num;
-	root["fps"]["den"] = info.fps.den;
-	root["pixel_ratio"] = Json::Value(Json::objectValue);
-	root["pixel_ratio"]["num"] = info.pixel_ratio.num;
-	root["pixel_ratio"]["den"] = info.pixel_ratio.den;
-	root["display_ratio"] = Json::Value(Json::objectValue);
-	root["display_ratio"]["num"] = info.display_ratio.num;
-	root["display_ratio"]["den"] = info.display_ratio.den;
+	root["fps"] = QJsonObject();
+	root["fps"].toObject()["num"] = info.fps.num;
+	root["fps"].toObject()["den"] = info.fps.den;
+	root["pixel_ratio"] = QJsonObject();
+	root["pixel_ratio"].toObject()["num"] = info.pixel_ratio.num;
+	root["pixel_ratio"].toObject()["den"] = info.pixel_ratio.den;
+	root["display_ratio"] = QJsonObject();
+	root["display_ratio"].toObject()["num"] = info.display_ratio.num;
+	root["display_ratio"].toObject()["den"] = info.display_ratio.den;
 	root["interlaced_frame"] = info.interlaced_frame;
 
 	// return JsonValue
@@ -167,12 +168,16 @@
 void Profile::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -186,28 +191,31 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void Profile::SetJsonValue(Json::Value root) {
+// Load QJsonObject into this object
+void Profile::SetJsonValue(const QJsonObject root) {
 
 	if (!root["height"].isNull())
-		info.height = root["height"].asInt();
+		info.height = root["height"].toVariant().toInt();
 	if (!root["width"].isNull())
-		info.width = root["width"].asInt();
+		info.width = root["width"].toVariant().toInt();
 	if (!root["pixel_format"].isNull())
-		info.pixel_format = root["pixel_format"].asInt();
+		info.pixel_format = root["pixel_format"].toVariant().toInt();
 	if (!root["fps"].isNull()) {
-		info.fps.num = root["fps"]["num"].asInt();
-		info.fps.den = root["fps"]["den"].asInt();
+		const QJsonObject fpsObject = root["fps"].toObject();
+		info.fps.num = fpsObject["num"].toVariant().toInt();
+		info.fps.den = fpsObject["den"].toVariant().toInt();
 	}
 	if (!root["pixel_ratio"].isNull()) {
-		info.pixel_ratio.num = root["pixel_ratio"]["num"].asInt();
-		info.pixel_ratio.den = root["pixel_ratio"]["den"].asInt();
+		const QJsonObject pixelRatioObject = root["pixel_ratio"].toObject();
+		info.pixel_ratio.num = pixelRatioObject["num"].toVariant().toInt();
+		info.pixel_ratio.den = pixelRatioObject["den"].toVariant().toInt();
 	}
 	if (!root["display_ratio"].isNull()) {
-		info.display_ratio.num = root["display_ratio"]["num"].asInt();
-		info.display_ratio.den = root["display_ratio"]["den"].asInt();
+		const QJsonObject displayRatioObject = root["display_ratio"].toObject();
+		info.display_ratio.num = displayRatioObject["num"].toVariant().toInt();
+		info.display_ratio.den = displayRatioObject["den"].toVariant().toInt();
 	}
 	if (!root["interlaced_frame"].isNull())
-		info.interlaced_frame = root["interlaced_frame"].asBool();
+		info.interlaced_frame = root["interlaced_frame"].toBool();
 
 }

=== modified file 'src/QtImageReader.cpp'
--- src/QtImageReader.cpp	2015-09-29 03:05:50 +0000
+++ src/QtImageReader.cpp	2015-10-04 15:21:00 +0000
@@ -123,16 +123,18 @@
 string QtImageReader::Json() {
 
 	// Return formatted string
-	return JsonValue().toStyledString();
+    QJsonDocument document;
+    document.setObject(JsonValue());
+    return document.toJson().constData();
 }
 
 // Generate Json::JsonValue for this object
-Json::Value QtImageReader::JsonValue() {
+QJsonObject QtImageReader::JsonValue() {
 
 	// Create root json object
-	Json::Value root = ReaderBase::JsonValue(); // get parent properties
+    QJsonObject root = ReaderBase::JsonValue(); // get parent properties
 	root["type"] = "QtImageReader";
-	root["path"] = path;
+    root["path"] = path.c_str();
 
 	// return JsonValue
 	return root;
@@ -141,13 +143,17 @@
 // Load JSON string into this object
 void QtImageReader::SetJson(string value) throw(InvalidJSON) {
 
-	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
-		// Raise exception
-		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+    // Parse JSON string into JSON objects
+    QJsonObject root;
+    QJsonParseError errors;
+
+    QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+    if (errors.error != QJsonParseError::NoError) {
+        // Raise exception
+        throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+    }
+
+    root = document.object();
 
 	try
 	{
@@ -162,14 +168,14 @@
 }
 
 // Load Json::JsonValue into this object
-void QtImageReader::SetJsonValue(Json::Value root) throw(InvalidFile) {
+void QtImageReader::SetJsonValue(QJsonObject root) throw(InvalidFile) {
 
 	// Set parent data
 	ReaderBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["path"].isNull())
-		path = root["path"].asString();
+        path = root["path"].toString().toLocal8Bit().constData();
 
 	// Re-Open path, and re-init everything (if needed)
 	if (is_open)

=== modified file 'src/ReaderBase.cpp'
--- src/ReaderBase.cpp	2015-09-29 03:05:50 +0000
+++ src/ReaderBase.cpp	2015-10-04 15:21:00 +0000
@@ -67,12 +67,14 @@
 string ReaderBase::OutputDebugJSON()
 {
 	// Return formatted string
-	return debug_root.toStyledString();
+	QJsonDocument document;
+	document.setArray(debug_root);
+	return document.toJson().constData();
 }
 
 
 // Append debug information as JSON
-void ReaderBase::AppendDebugItem(Json::Value debug_item)
+void ReaderBase::AppendDebugItem(QJsonValue debug_item)
 {
 	// Append item to root array
 	debug_root.append(debug_item);
@@ -90,8 +92,8 @@
 		// Don't do anything
 		return;
 
-	Json::Value debug_item;
-	debug_item["method"] = method_name;
+	QJsonObject debug_item;
+	debug_item["method"] = method_name.c_str();
 
 	// Output to standard output
 	#pragma omp critical (debug_output)
@@ -101,27 +103,27 @@
 
 		// Add attributes to method JSON
 		if (arg1_name.length() > 0) {
-			debug_item[arg1_name] = arg1_value;
+		    debug_item[arg1_name.c_str()] = arg1_value;
 			cout << arg1_name << "=" << arg1_value;
 		}
 		if (arg2_name.length() > 0) {
-			debug_item[arg2_name] = arg2_value;
+		    debug_item[arg2_name.c_str()] = arg2_value;
 			cout << ", " << arg2_name << "=" << arg2_value;
 		}
 		if (arg3_name.length() > 0) {
-			debug_item[arg3_name] = arg3_value;
+		    debug_item[arg3_name.c_str()] = arg3_value;
 			cout << ", " << arg3_name << "=" << arg3_value;
 		}
 		if (arg4_name.length() > 0) {
-			debug_item[arg4_name] = arg4_value;
+		    debug_item[arg4_name.c_str()] = arg4_value;
 			cout << ", " << arg4_name << "=" << arg4_value;
 		}
 		if (arg5_name.length() > 0) {
-			debug_item[arg5_name] = arg5_value;
+		    debug_item[arg5_name.c_str()] = arg5_value;
 			cout << ", " << arg5_name << "=" << arg5_value;
 		}
 		if (arg6_name.length() > 0) {
-			debug_item[arg6_name] = arg6_value;
+		    debug_item[arg6_name.c_str()] = arg6_value;
 			cout << ", " << arg6_name << "=" << arg6_value;
 		}
 
@@ -129,7 +131,7 @@
 		cout << ")" << endl;
 
 		// Append method to root array
-		debug_root.append(debug_item);
+		debug_root.append(QJsonValue(debug_item));
 	}
 }
 
@@ -174,128 +176,124 @@
 }
 
 // Generate Json::JsonValue for this object
-Json::Value ReaderBase::JsonValue() {
+QJsonObject ReaderBase::JsonValue() {
 
 	// Create root json object
-	Json::Value root;
+    QJsonObject root;
 	root["has_video"] = info.has_video;
 	root["has_audio"] = info.has_audio;
 	root["has_single_image"] = info.has_single_image;
-	root["duration"] = info.duration;
-	stringstream filesize_stream;
-	filesize_stream << info.file_size;
-	root["file_size"] = filesize_stream.str();
+    root["duration"] = info.duration;
+    root["file_size"] = info.file_size;
 	root["height"] = info.height;
 	root["width"] = info.width;
 	root["pixel_format"] = info.pixel_format;
-	root["fps"] = Json::Value(Json::objectValue);
-	root["fps"]["num"] = info.fps.num;
-	root["fps"]["den"] = info.fps.den;
+    root["fps"] = QJsonObject();
+    root["fps"].toObject()["num"] = info.fps.num;
+    root["fps"].toObject()["den"] = info.fps.den;
 	root["video_bit_rate"] = info.video_bit_rate;
-	root["pixel_ratio"] = Json::Value(Json::objectValue);
-	root["pixel_ratio"]["num"] = info.pixel_ratio.num;
-	root["pixel_ratio"]["den"] = info.pixel_ratio.den;
-	root["display_ratio"] = Json::Value(Json::objectValue);
-	root["display_ratio"]["num"] = info.display_ratio.num;
-	root["display_ratio"]["den"] = info.display_ratio.den;
-	root["vcodec"] = info.vcodec;
-	stringstream video_length_stream;
-	video_length_stream << info.video_length;
-	root["video_length"] = video_length_stream.str();
+    root["pixel_ratio"] = QJsonObject();
+    root["pixel_ratio"].toObject()["num"] = info.pixel_ratio.num;
+    root["pixel_ratio"].toObject()["den"] = info.pixel_ratio.den;
+    root["display_ratio"] = QJsonObject();
+    root["display_ratio"].toObject()["num"] = info.display_ratio.num;
+    root["display_ratio"].toObject()["den"] = info.display_ratio.den;
+    root["vcodec"] = info.vcodec.c_str();
+    root["video_length"] = (long long) info.video_length;
 	root["video_stream_index"] = info.video_stream_index;
-	root["video_timebase"] = Json::Value(Json::objectValue);
-	root["video_timebase"]["num"] = info.video_timebase.num;
-	root["video_timebase"]["den"] = info.video_timebase.den;
+    root["video_timebase"] = QJsonObject();
+    root["video_timebase"].toObject()["num"] = info.video_timebase.num;
+    root["video_timebase"].toObject()["den"] = info.video_timebase.den;
 	root["interlaced_frame"] = info.interlaced_frame;
 	root["top_field_first"] = info.top_field_first;
-	root["acodec"] = info.acodec;
+    root["acodec"] = info.acodec.c_str();
 	root["audio_bit_rate"] = info.audio_bit_rate;
 	root["sample_rate"] = info.sample_rate;
 	root["channels"] = info.channels;
 	root["channel_layout"] = info.channel_layout;
 	root["audio_stream_index"] = info.audio_stream_index;
-	root["audio_timebase"] = Json::Value(Json::objectValue);
-	root["audio_timebase"]["num"] = info.audio_timebase.num;
-	root["audio_timebase"]["den"] = info.audio_timebase.den;
+    root["audio_timebase"] = QJsonObject();
+    root["audio_timebase"].toObject()["num"] = info.audio_timebase.num;
+    root["audio_timebase"].toObject()["den"] = info.audio_timebase.den;
 
 	// return JsonValue
 	return root;
 }
 
 // Load Json::JsonValue into this object
-void ReaderBase::SetJsonValue(Json::Value root) {
+void ReaderBase::SetJsonValue(QJsonObject root) {
 
 	// Set data from Json (if key is found)
 	if (!root["has_video"].isNull())
-		info.has_video = root["has_video"].asBool();
+        info.has_video = root["has_video"].toBool();
 	if (!root["has_audio"].isNull())
-		info.has_audio = root["has_audio"].asBool();
+        info.has_audio = root["has_audio"].toBool();
 	if (!root["has_single_image"].isNull())
-		info.has_single_image = root["has_single_image"].asBool();
+        info.has_single_image = root["has_single_image"].toBool();
 	if (!root["duration"].isNull())
-		info.duration = root["duration"].asDouble();
+        info.duration = root["duration"].toDouble();
 	if (!root["file_size"].isNull())
-		info.file_size = atoll(root["file_size"].asString().c_str());
+        info.file_size = root.value("file_size").toVariant().toLongLong();
 	if (!root["height"].isNull())
-		info.height = root["height"].asInt();
+        info.height = root["height"].toInt();
 	if (!root["width"].isNull())
-		info.width = root["width"].asInt();
+        info.width = root["width"].toInt();
 	if (!root["pixel_format"].isNull())
-		info.pixel_format = root["pixel_format"].asInt();
+        info.pixel_format = root["pixel_format"].toInt();
 	if (!root["fps"].isNull() && root["fps"].isObject()) {
-		if (!root["fps"]["num"].isNull())
-			info.fps.num = root["fps"]["num"].asInt();
-		if (!root["fps"]["den"].isNull())
-		info.fps.den = root["fps"]["den"].asInt();
+        if (!root["fps"].toObject()["num"].isNull())
+            info.fps.num = root["fps"].toObject()["num"].toInt();
+        if (!root["fps"].toObject()["den"].isNull())
+        info.fps.den = root["fps"].toObject()["den"].toInt();
 	}
 	if (!root["video_bit_rate"].isNull())
-		info.video_bit_rate = root["video_bit_rate"].asInt();
+        info.video_bit_rate = root["video_bit_rate"].toInt();
 	if (!root["pixel_ratio"].isNull() && root["pixel_ratio"].isObject()) {
-		if (!root["pixel_ratio"]["num"].isNull())
-			info.pixel_ratio.num = root["pixel_ratio"]["num"].asInt();
-		if (!root["pixel_ratio"]["den"].isNull())
-			info.pixel_ratio.den = root["pixel_ratio"]["den"].asInt();
+        if (!root["pixel_ratio"].toObject()["num"].isNull())
+            info.pixel_ratio.num = root["pixel_ratio"].toObject()["num"].toInt();
+        if (!root["pixel_ratio"].toObject()["den"].isNull())
+            info.pixel_ratio.den = root["pixel_ratio"].toObject()["den"].toInt();
 	}
 	if (!root["display_ratio"].isNull() && root["display_ratio"].isObject()) {
-		if (!root["display_ratio"]["num"].isNull())
-			info.display_ratio.num = root["display_ratio"]["num"].asInt();
-		if (!root["display_ratio"]["den"].isNull())
-			info.display_ratio.den = root["display_ratio"]["den"].asInt();
+        if (!root["display_ratio"].toObject()["num"].isNull())
+            info.display_ratio.num = root["display_ratio"].toObject()["num"].toInt();
+        if (!root["display_ratio"].toObject()["den"].isNull())
+            info.display_ratio.den = root["display_ratio"].toObject()["den"].toInt();
 	}
 	if (!root["vcodec"].isNull())
-		info.vcodec = root["vcodec"].asString();
+        info.vcodec = root["vcodec"].toString().toLocal8Bit().constData();
 	if (!root["video_length"].isNull())
-		info.video_length = atoll(root["video_length"].asString().c_str());
+        info.video_length = root.value("video_length").toVariant().toLongLong();
 	if (!root["video_stream_index"].isNull())
-		info.video_stream_index = root["video_stream_index"].asInt();
+        info.video_stream_index = root["video_stream_index"].toInt();
 	if (!root["video_timebase"].isNull() && root["video_timebase"].isObject()) {
-		if (!root["video_timebase"]["num"].isNull())
-			info.video_timebase.num = root["video_timebase"]["num"].asInt();
-		if (!root["video_timebase"]["den"].isNull())
-			info.video_timebase.den = root["video_timebase"]["den"].asInt();
+        if (!root["video_timebase"].toObject()["num"].isNull())
+            info.video_timebase.num = root["video_timebase"].toObject()["num"].toInt();
+        if (!root["video_timebase"].toObject()["den"].isNull())
+            info.video_timebase.den = root["video_timebase"].toObject()["den"].toInt();
 	}
 	if (!root["interlaced_frame"].isNull())
-		info.interlaced_frame = root["interlaced_frame"].asBool();
+        info.interlaced_frame = root["interlaced_frame"].toBool();
 	if (!root["top_field_first"].isNull())
-		info.top_field_first = root["top_field_first"].asBool();
+        info.top_field_first = root["top_field_first"].toBool();
 	if (!root["acodec"].isNull())
-		info.acodec = root["acodec"].asString();
+        info.acodec = root["acodec"].toString().toLocal8Bit().constData();
 
 	if (!root["audio_bit_rate"].isNull())
-		info.audio_bit_rate = root["audio_bit_rate"].asInt();
+        info.audio_bit_rate = root["audio_bit_rate"].toInt();
 	if (!root["sample_rate"].isNull())
-		info.sample_rate = root["sample_rate"].asInt();
+        info.sample_rate = root["sample_rate"].toInt();
 	if (!root["channels"].isNull())
-		info.channels = root["channels"].asInt();
+        info.channels = root["channels"].toInt();
 	if (!root["channel_layout"].isNull())
-		info.channel_layout = (ChannelLayout) root["channel_layout"].asInt();
+        info.channel_layout = (ChannelLayout) root["channel_layout"].toInt();
 	if (!root["audio_stream_index"].isNull())
-		info.audio_stream_index = root["audio_stream_index"].asInt();
+        info.audio_stream_index = root["audio_stream_index"].toInt();
 	if (!root["audio_timebase"].isNull() && root["audio_timebase"].isObject()) {
-		if (!root["audio_timebase"]["num"].isNull())
-			info.audio_timebase.num = root["audio_timebase"]["num"].asInt();
-		if (!root["audio_timebase"]["den"].isNull())
-			info.audio_timebase.den = root["audio_timebase"]["den"].asInt();
+        if (!root["audio_timebase"].toObject()["num"].isNull())
+            info.audio_timebase.num = root["audio_timebase"].toObject()["num"].toInt();
+        if (!root["audio_timebase"].toObject()["den"].isNull())
+            info.audio_timebase.den = root["audio_timebase"].toObject()["den"].toInt();
 	}
 }
 

=== modified file 'src/TextReader.cpp'
--- src/TextReader.cpp	2015-08-24 06:05:48 +0000
+++ src/TextReader.cpp	2015-10-04 15:21:00 +0000
@@ -171,28 +171,29 @@
 // Generate JSON string of this object
 string TextReader::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value TextReader::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject TextReader::JsonValue() {
 
 	// Create root json object
-	Json::Value root = ReaderBase::JsonValue(); // get parent properties
+	QJsonObject root = ReaderBase::JsonValue(); // get parent properties
 	root["type"] = "TextReader";
 	root["width"] = width;
 	root["height"] = height;
 	root["x_offset"] = x_offset;
 	root["y_offset"] = y_offset;
-	root["text"] = text;
-	root["font"] = font;
+	root["text"] = text.c_str();
+	root["font"] = font.c_str();
 	root["size"] = size;
-	root["text_color"] = text_color;
-	root["background_color"] = background_color;
+	root["text_color"] = text_color.c_str();
+	root["background_color"] = background_color.c_str();
 	root["gravity"] = gravity;
 
-	// return JsonValue
+	// return QJsonObject
 	return root;
 }
 
@@ -200,12 +201,16 @@
 void TextReader::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -219,33 +224,33 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void TextReader::SetJsonValue(Json::Value root) throw(InvalidFile) {
+// Load QJsonObject into this object
+void TextReader::SetJsonValue(const QJsonObject root) throw(InvalidFile) {
 
 	// Set parent data
 	ReaderBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["width"].isNull())
-		width = root["width"].asInt();
+		width = root["width"].toVariant().toInt();
 	if (!root["height"].isNull())
-		height = root["height"].asInt();
+		height = root["height"].toVariant().toInt();
 	if (!root["x_offset"].isNull())
-		x_offset = root["x_offset"].asInt();
+		x_offset = root["x_offset"].toVariant().toInt();
 	if (!root["y_offset"].isNull())
-		y_offset = root["y_offset"].asInt();
+		y_offset = root["y_offset"].toVariant().toInt();
 	if (!root["text"].isNull())
-		text = root["text"].asString();
+		text = root["text"].toString().toLocal8Bit().constData();
 	if (!root["font"].isNull())
-		font = root["font"].asString();
+		font = root["font"].toString().toLocal8Bit().constData();
 	if (!root["size"].isNull())
-		size = root["size"].asDouble();
+		size = root["size"].toDouble();
 	if (!root["text_color"].isNull())
-		text_color = root["text_color"].asString();
+		text_color = root["text_color"].toString().toLocal8Bit().constData();
 	if (!root["background_color"].isNull())
-		background_color = root["background_color"].asString();
+		background_color = root["background_color"].toString().toLocal8Bit().constData();
 	if (!root["gravity"].isNull())
-		gravity = (GravityType) root["gravity"].asInt();
+		gravity = (GravityType) root["gravity"].toVariant().toInt();
 
 	// Re-Open path, and re-init everything (if needed)
 	if (is_open)

=== modified file 'src/Timeline.cpp'
--- src/Timeline.cpp	2015-08-25 04:49:45 +0000
+++ src/Timeline.cpp	2015-10-04 15:21:00 +0000
@@ -750,15 +750,16 @@
 // Generate JSON string of this object
 string Timeline::Json() {
 
-	// Return formatted string
-	return JsonValue().toStyledString();
+	QJsonDocument document;
+	document.setObject(JsonValue());
+	return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value Timeline::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject Timeline::JsonValue() {
 
 	// Create root json object
-	Json::Value root = ReaderBase::JsonValue(); // get parent properties
+	QJsonObject root = ReaderBase::JsonValue(); // get parent properties
 	root["type"] = "Timeline";
 	root["viewport_scale"] = viewport_scale.JsonValue();
 	root["viewport_x"] = viewport_x.JsonValue();
@@ -766,7 +767,7 @@
 	root["color"] = color.JsonValue();
 
 	// Add array of clips
-	root["clips"] = Json::Value(Json::arrayValue);
+	root["clips"] = QJsonArray();
 
 	// Find Clips at this time
 	list<Clip*>::iterator clip_itr;
@@ -774,11 +775,11 @@
 	{
 		// Get clip object from the iterator
 		Clip *existing_clip = (*clip_itr);
-		root["clips"].append(existing_clip->JsonValue());
+		root["clips"].toArray().append(existing_clip->JsonValue());
 	}
 
 	// Add array of effects
-	root["effects"] = Json::Value(Json::arrayValue);
+	root["effects"] = QJsonArray();
 
 	// loop through effects
 	list<EffectBase*>::iterator effect_itr;
@@ -786,7 +787,7 @@
 	{
 		// Get clip object from the iterator
 		EffectBase *existing_effect = (*effect_itr);
-		root["effects"].append(existing_effect->JsonValue());
+		root["effects"].toArray().append(existing_effect->JsonValue());
 	}
 
 	// return JsonValue
@@ -797,12 +798,16 @@
 void Timeline::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -816,8 +821,8 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void Timeline::SetJsonValue(Json::Value root) throw(InvalidFile, ReaderClosed) {
+// Load QJsonObject into this object
+void Timeline::SetJsonValue(QJsonObject root) throw(InvalidFile, ReaderClosed) {
 
 	// Close timeline before we do anything (this also removes all open and closing clips)
 	Close();
@@ -830,9 +835,9 @@
 		clips.clear();
 
 		// loop through clips
-		for (int x = 0; x < root["clips"].size(); x++) {
+		for (int x = 0; x < root["clips"].toArray().size(); x++) {
 			// Get each clip
-			Json::Value existing_clip = root["clips"][x];
+		    QJsonObject existing_clip = root["clips"].toArray()[x].toObject();
 
 			// Create Clip
 			Clip *c = new Clip();
@@ -850,25 +855,25 @@
 		effects.clear();
 
 		// loop through effects
-		for (int x = 0; x < root["effects"].size(); x++) {
+		for (int x = 0; x < root["effects"].toArray().size(); x++) {
 			// Get each effect
-			Json::Value existing_effect = root["effects"][x];
+		    QJsonObject existing_effect = root["effects"].toArray()[x].toObject();
 
 			// Create Effect
 			EffectBase *e = NULL;
 
 			if (!existing_effect["type"].isNull())
 				// Init the matching effect object
-				if (existing_effect["type"].asString() == "ChromaKey")
+		        if (existing_effect["type"].toString() == "ChromaKey")
 					e = new ChromaKey();
 
-				else if (existing_effect["type"].asString() == "Deinterlace")
+		        else if (existing_effect["type"].toString() == "Deinterlace")
 					e = new Deinterlace();
 
-				else if (existing_effect["type"].asString() == "Mask")
+		        else if (existing_effect["type"].toString() == "Mask")
 					e = new Mask();
 
-				else if (existing_effect["type"].asString() == "Negate")
+		        else if (existing_effect["type"].toString() == "Negate")
 					e = new Negate();
 
 			// Load Json into Effect
@@ -887,20 +892,24 @@
 	final_cache.Clear();
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success || !root.isArray())
+	QJsonArray root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
-		throw InvalidJSON("JSON could not be parsed (or is invalid).", "");
+		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.array();
 
 	try
 	{
 		// Process the JSON change array, loop through each item
 		for (int x = 0; x < root.size(); x++) {
 			// Get each change
-			Json::Value change = root[x];
-			string root_key = change["key"][(uint)0].asString();
+		    QJsonObject change = root[x].toObject();
+		    QString root_key = change["key"].toArray()[0].toString();
 
 			// Process each type of change
 			if (root_key == "clips")
@@ -928,23 +937,23 @@
 }
 
 // Apply JSON diff to clips
-void Timeline::apply_json_to_clips(Json::Value change) throw(InvalidJSONKey) {
+void Timeline::apply_json_to_clips(QJsonObject change) throw(InvalidJSONKey) {
 
 	// Get key and type of change
-	string change_type = change["type"].asString();
-	string clip_id = "";
+	QString change_type = change["type"].toString();
+	QString clip_id;
 	Clip *existing_clip = NULL;
 
 	// Find id of clip (if any)
-	for (int x = 0; x < change["key"].size(); x++) {
+	for (int x = 0; x < change["key"].toArray().size(); x++) {
 		// Get each change
-		Json::Value key_part = change["key"][x];
+		QJsonValue key_part = change["key"].toArray()[x];
 
 		if (key_part.isObject()) {
 			// Check for id
-			if (!key_part["id"].isNull()) {
+		    if (!key_part.toObject()["id"].isNull()) {
 				// Set the id
-				clip_id = key_part["id"].asString();
+		        clip_id = key_part.toObject()["id"].toString();
 
 				// Find matching clip in timeline (if any)
 				list<Clip*>::iterator clip_itr;
@@ -952,7 +961,7 @@
 				{
 					// Get clip object from the iterator
 					Clip *c = (*clip_itr);
-					if (c->Id() == clip_id) {
+		            if (c->Id().c_str() == clip_id) {
 						existing_clip = c;
 						break; // clip found, exit loop
 					}
@@ -964,18 +973,18 @@
 
 	// Check for a more specific key (targetting this clip's effects)
 	// For example: ["clips", {"id:123}, "effects", {"id":432}]
-	if (existing_clip && change["key"].size() == 4 && change["key"][2] == "effects")
+    if (existing_clip && change["key"].toArray().size() == 4 && change["key"].toArray()[2].toString() == "effects")
 	{
 		// This change is actually targetting a specific effect under a clip (and not the clip)
 		EffectBase *existing_effect = NULL;
-		Json::Value key_part = change["key"][3];
 
-		if (key_part.isObject()) {
+        if (change["key"].toArray()[3].isObject()) {
+            QJsonObject key_part = change["key"].toArray()[3].toObject();
 			// Check for id
 			if (!key_part["id"].isNull())
 			{
 				// Set the id
-				string effect_id = key_part["id"].asString();
+                string effect_id = key_part["id"].toString().toLocal8Bit().constData();
 
 				// Find matching effect in timeline (if any)
 				list<EffectBase*>::iterator effect_itr;
@@ -1000,14 +1009,14 @@
 
 		// Create new clip
 		Clip *clip = new Clip();
-		clip->SetJsonValue(change["value"]); // Set properties of new clip from JSON
+		clip->SetJsonValue(change["value"].toObject()); // Set properties of new clip from JSON
 		AddClip(clip); // Add clip to timeline
 
 	} else if (change_type == "update") {
 
 		// Update existing clip
 		if (existing_clip)
-			existing_clip->SetJsonValue(change["value"]); // Update clip properties from JSON
+		    existing_clip->SetJsonValue(change["value"].toObject()); // Update clip properties from JSON
 
 	} else if (change_type == "delete") {
 
@@ -1020,23 +1029,21 @@
 }
 
 // Apply JSON diff to effects
-void Timeline::apply_json_to_effects(Json::Value change) throw(InvalidJSONKey) {
+void Timeline::apply_json_to_effects(QJsonObject change) throw(InvalidJSONKey) {
 
 	// Get key and type of change
-	string change_type = change["type"].asString();
+    string change_type = change["type"].toString().toLocal8Bit().constData();
 	EffectBase *existing_effect = NULL;
 
 	// Find id of an effect (if any)
-	for (int x = 0; x < change["key"].size(); x++) {
-		// Get each change
-		Json::Value key_part = change["key"][x];
-
-		if (key_part.isObject()) {
+    for (int x = 0; x < change["key"].toArray().size(); x++) {
+        if (change["key"].toArray()[x].isObject()) {
+            QJsonObject key_part = change["key"].toArray()[x].toObject();
 			// Check for id
 			if (!key_part["id"].isNull())
 			{
 				// Set the id
-				string effect_id = key_part["id"].asString();
+                string effect_id = key_part["id"].toString().toLocal8Bit().constData();
 
 				// Find matching effect in timeline (if any)
 				list<EffectBase*>::iterator effect_itr;
@@ -1044,7 +1051,7 @@
 				{
 					// Get effect object from the iterator
 					EffectBase *e = (*effect_itr);
-					if (e->Id() == effect_id) {
+		            if (e->Id().c_str() == effect_id) {
 						existing_effect = e;
 						break; // effect found, exit loop
 					}
@@ -1061,16 +1068,16 @@
 }
 
 // Apply JSON diff to effects (if you already know which effect needs to be updated)
-void Timeline::apply_json_to_effects(Json::Value change, EffectBase* existing_effect) throw(InvalidJSONKey) {
+void Timeline::apply_json_to_effects(QJsonObject change, EffectBase* existing_effect) throw(InvalidJSONKey) {
 
 	// Get key and type of change
-	string change_type = change["type"].asString();
+    string change_type = change["type"].toString().toLocal8Bit().constData();
 
 	// Determine type of change operation
 	if (change_type == "insert") {
 
 		// Determine type of effect
-		string effect_type = change["value"]["type"].asString();
+		QString effect_type = change["value"].toObject()["type"].toString();
 
 		// Create Effect
 		EffectBase *e = NULL;
@@ -1089,7 +1096,7 @@
 			e = new Negate();
 
 		// Load Json into Effect
-		e->SetJsonValue(change["value"]);
+		e->SetJsonValue(change["value"].toObject());
 
 		// Add Effect to Timeline
 		AddEffect(e);
@@ -1098,7 +1105,7 @@
 
 		// Update existing effect
 		if (existing_effect)
-			existing_effect->SetJsonValue(change["value"]); // Update effect properties from JSON
+		    existing_effect->SetJsonValue(change["value"].toObject()); // Update effect properties from JSON
 
 	} else if (change_type == "delete") {
 
@@ -1110,11 +1117,11 @@
 }
 
 // Apply JSON diff to timeline properties
-void Timeline::apply_json_to_timeline(Json::Value change) throw(InvalidJSONKey) {
+void Timeline::apply_json_to_timeline(QJsonObject change) throw(InvalidJSONKey) {
 
 	// Get key and type of change
-	string change_type = change["type"].asString();
-	string root_key = change["key"][(uint)0].asString();
+	QString change_type = change["type"].toString();
+	QString root_key = change["key"].toArray()[0].toString();
 
 	// Determine type of change operation
 	if (change_type == "insert" || change_type == "update") {
@@ -1123,36 +1130,38 @@
 		// Check for valid property
 		if (root_key == "color")
 			// Set color
-			color.SetJsonValue(change["value"]);
+            color.SetJsonValue(change["value"].toObject());
 		else if (root_key == "viewport_scale")
 			// Set viewport scale
-			viewport_scale.SetJsonValue(change["value"]);
+            viewport_scale.SetJsonValue(change["value"].toObject());
 		else if (root_key == "viewport_x")
 			// Set viewport x offset
-			viewport_x.SetJsonValue(change["value"]);
+            viewport_x.SetJsonValue(change["value"].toObject());
 		else if (root_key == "viewport_y")
 			// Set viewport y offset
-			viewport_y.SetJsonValue(change["value"]);
+            viewport_y.SetJsonValue(change["value"].toObject());
 		else if (root_key == "width")
 			// Set width
-			info.width = change["value"].asInt();
+            info.width = change["value"].toInt();
 		else if (root_key == "height")
 			// Set height
-			info.height = change["value"].asInt();
-		else if (root_key == "fps" && change["key"][(uint)1].asString() == "num")
+            info.height = change["value"].toInt();
+        else if (root_key == "fps" && change["key"].toArray()[1].toString() == "num")
 			// Set fps.num
-			info.fps.num = change["value"].asInt();
-		else if (root_key == "fps" && change["key"][(uint)1].asString() == "den")
+            info.fps.num = change["value"].toInt();
+        else if (root_key == "fps" && change["key"].toArray()[1].toString() == "den")
 			// Set fps.den
-			info.fps.den = change["value"].asInt();
-
-		else
-
+            info.fps.den = change["value"].toInt();
+
+        else {
 			// Error parsing JSON (or missing keys)
-			throw InvalidJSONKey("JSON change key is invalid", change.toStyledString());
-
-
-	} else if (change["type"].asString() == "delete") {
+            QJsonDocument document;
+            document.setObject(change);
+            throw InvalidJSONKey("JSON change key is invalid", document.toJson().constData());
+        }
+
+
+    } else if (change["type"].toString() == "delete") {
 
 		// DELETE / RESET
 		// Reset the following properties (since we can't delete them)
@@ -1168,9 +1177,12 @@
 			viewport_x = Keyframe(0.0);
 		else if (root_key == "viewport_y")
 			viewport_y = Keyframe(0.0);
-		else
-			// Error parsing JSON (or missing keys)
-			throw InvalidJSONKey("JSON change key is invalid", change.toStyledString());
+		else {
+		    // Error parsing JSON (or missing keys)
+		    QJsonDocument document;
+		    document.setObject(change);
+		    throw InvalidJSONKey("JSON change key is invalid", document.toJson().constData());
+		}
 
 	}
 

=== modified file 'src/WriterBase.cpp'
--- src/WriterBase.cpp	2015-09-29 03:05:50 +0000
+++ src/WriterBase.cpp	2015-10-04 15:21:00 +0000
@@ -67,11 +67,13 @@
 string WriterBase::OutputDebugJSON()
 {
 	// Return formatted string
-	return debug_root.toStyledString();
+	QJsonDocument document;
+	document.setArray(debug_root);
+	return document.toJson().constData();
 }
 
 // Append debug information as JSON
-void WriterBase::AppendDebugItem(Json::Value debug_item)
+void WriterBase::AppendDebugItem(QJsonValue debug_item)
 {
 	// Append item to root array
 	debug_root.append(debug_item);
@@ -89,8 +91,8 @@
 		// Don't do anything
 		return;
 
-	Json::Value debug_item;
-	debug_item["method"] = method_name;
+	QJsonObject debug_item;
+	debug_item["method"] = method_name.c_str();
 
 	// Output to standard output
 	cout << fixed << setprecision(4);
@@ -98,27 +100,27 @@
 
 	// Add attributes to method JSON
 	if (arg1_name.length() > 0) {
-		debug_item[arg1_name] = arg1_value;
+		debug_item[arg1_name.c_str()] = arg1_value;
 		cout << arg1_name << "=" << arg1_value;
 	}
 	if (arg2_name.length() > 0) {
-		debug_item[arg2_name] = arg2_value;
+		debug_item[arg2_name.c_str()] = arg2_value;
 		cout << ", " << arg2_name << "=" << arg2_value;
 	}
 	if (arg3_name.length() > 0) {
-		debug_item[arg3_name] = arg3_value;
+		debug_item[arg3_name.c_str()] = arg3_value;
 		cout << ", " << arg3_name << "=" << arg3_value;
 	}
 	if (arg4_name.length() > 0) {
-		debug_item[arg4_name] = arg4_value;
+		debug_item[arg4_name.c_str()] = arg4_value;
 		cout << ", " << arg4_name << "=" << arg4_value;
 	}
 	if (arg5_name.length() > 0) {
-		debug_item[arg5_name] = arg5_value;
+		debug_item[arg5_name.c_str()] = arg5_value;
 		cout << ", " << arg5_name << "=" << arg5_value;
 	}
 	if (arg6_name.length() > 0) {
-		debug_item[arg6_name] = arg6_value;
+		debug_item[arg6_name.c_str()] = arg6_value;
 		cout << ", " << arg6_name << "=" << arg6_value;
 	}
 
@@ -126,7 +128,7 @@
 	cout << ")" << endl;
 
 	// Append method to root array
-	debug_root.append(debug_item);
+	debug_root.append(QJsonValue(debug_item));
 }
 
 // This method copy's the info struct of a reader, and sets the writer with the same info
@@ -208,53 +210,51 @@
 string WriterBase::Json() {
 
 	// Return formatted string
-	return JsonValue().toStyledString();
+    QJsonDocument document;
+    document.setObject(JsonValue());
+    return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value WriterBase::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject WriterBase::JsonValue() {
 
 	// Create root json object
-	Json::Value root;
+    QJsonObject root;
 	root["has_video"] = info.has_video;
 	root["has_audio"] = info.has_audio;
 	root["has_single_image"] = info.has_single_image;
-	root["duration"] = info.duration;
-	stringstream filesize_stream;
-	filesize_stream << info.file_size;
-	root["file_size"] = filesize_stream.str();
+    root["duration"] = info.duration;
+    root["file_size"] = info.file_size;
 	root["height"] = info.height;
 	root["width"] = info.width;
 	root["pixel_format"] = info.pixel_format;
-	root["fps"] = Json::Value(Json::objectValue);
-	root["fps"]["num"] = info.fps.num;
-	root["fps"]["den"] = info.fps.den;
+    root["fps"] = QJsonObject();
+    root["fps"].toObject()["num"] = info.fps.num;
+    root["fps"].toObject()["den"] = info.fps.den;
 	root["video_bit_rate"] = info.video_bit_rate;
-	root["pixel_ratio"] = Json::Value(Json::objectValue);
-	root["pixel_ratio"]["num"] = info.pixel_ratio.num;
-	root["pixel_ratio"]["den"] = info.pixel_ratio.den;
-	root["display_ratio"] = Json::Value(Json::objectValue);
-	root["display_ratio"]["num"] = info.display_ratio.num;
-	root["display_ratio"]["den"] = info.display_ratio.den;
-	root["vcodec"] = info.vcodec;
-	stringstream video_length_stream;
-	video_length_stream << info.video_length;
-	root["video_length"] = video_length_stream.str();
+    root["pixel_ratio"] = QJsonObject();
+    root["pixel_ratio"].toObject()["num"] = info.pixel_ratio.num;
+    root["pixel_ratio"].toObject()["den"] = info.pixel_ratio.den;
+    root["display_ratio"] = QJsonObject();
+    root["display_ratio"].toObject()["num"] = info.display_ratio.num;
+    root["display_ratio"].toObject()["den"] = info.display_ratio.den;
+    root["vcodec"] = info.vcodec.c_str();
+    root["video_length"] = (long long) info.video_length;
 	root["video_stream_index"] = info.video_stream_index;
-	root["video_timebase"] = Json::Value(Json::objectValue);
-	root["video_timebase"]["num"] = info.video_timebase.num;
-	root["video_timebase"]["den"] = info.video_timebase.den;
+    root["video_timebase"] = QJsonObject();
+    root["video_timebase"].toObject()["num"] = info.video_timebase.num;
+    root["video_timebase"].toObject()["den"] = info.video_timebase.den;
 	root["interlaced_frame"] = info.interlaced_frame;
 	root["top_field_first"] = info.top_field_first;
-	root["acodec"] = info.acodec;
+    root["acodec"] = info.acodec.c_str();
 	root["audio_bit_rate"] = info.audio_bit_rate;
 	root["sample_rate"] = info.sample_rate;
 	root["channels"] = info.channels;
 	root["channel_layout"] = info.channel_layout;
 	root["audio_stream_index"] = info.audio_stream_index;
-	root["audio_timebase"] = Json::Value(Json::objectValue);
-	root["audio_timebase"]["num"] = info.audio_timebase.num;
-	root["audio_timebase"]["den"] = info.audio_timebase.den;
+    root["audio_timebase"] = QJsonObject();
+    root["audio_timebase"].toObject()["num"] = info.audio_timebase.num;
+    root["audio_timebase"].toObject()["den"] = info.audio_timebase.den;
 
 	// return JsonValue
 	return root;
@@ -264,12 +264,16 @@
 void WriterBase::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -284,78 +288,78 @@
 }
 
 // Load Json::JsonValue into this object
-void WriterBase::SetJsonValue(Json::Value root) {
+void WriterBase::SetJsonValue(QJsonObject root) {
 
 	// Set data from Json (if key is found)
 	if (!root["has_video"].isNull())
-		info.has_video = root["has_video"].asBool();
+        info.has_video = root["has_video"].toBool();
 	if (!root["has_audio"].isNull())
-		info.has_audio = root["has_audio"].asBool();
+        info.has_audio = root["has_audio"].toBool();
 	if (!root["has_single_image"].isNull())
-		info.has_single_image = root["has_single_image"].asBool();
+        info.has_single_image = root["has_single_image"].toBool();
 	if (!root["duration"].isNull())
-		info.duration = root["duration"].asDouble();
+        info.duration = root["duration"].toDouble();
 	if (!root["file_size"].isNull())
-		info.file_size = (long long) root["file_size"].asUInt();
+        info.file_size = root.value("file_size").toVariant().toLongLong();
 	if (!root["height"].isNull())
-		info.height = root["height"].asInt();
+        info.height = root["height"].toInt();
 	if (!root["width"].isNull())
-		info.width = root["width"].asInt();
+        info.width = root["width"].toInt();
 	if (!root["pixel_format"].isNull())
-		info.pixel_format = root["pixel_format"].asInt();
+        info.pixel_format = root["pixel_format"].toInt();
 	if (!root["fps"].isNull() && root["fps"].isObject()) {
-		if (!root["fps"]["num"].isNull())
-			info.fps.num = root["fps"]["num"].asInt();
-		if (!root["fps"]["den"].isNull())
-		info.fps.den = root["fps"]["den"].asInt();
+        if (!root["fps"].toObject()["num"].isNull())
+            info.fps.num = root["fps"].toObject()["num"].toInt();
+        if (!root["fps"].toObject()["den"].isNull())
+        info.fps.den = root["fps"].toObject()["den"].toInt();
 	}
 	if (!root["video_bit_rate"].isNull())
-		info.video_bit_rate = root["video_bit_rate"].asInt();
+        info.video_bit_rate = root["video_bit_rate"].toInt();
 	if (!root["pixel_ratio"].isNull() && root["pixel_ratio"].isObject()) {
-		if (!root["pixel_ratio"]["num"].isNull())
-			info.pixel_ratio.num = root["pixel_ratio"]["num"].asInt();
-		if (!root["pixel_ratio"]["den"].isNull())
-			info.pixel_ratio.den = root["pixel_ratio"]["den"].asInt();
+        if (!root["pixel_ratio"].toObject()["num"].isNull())
+            info.pixel_ratio.num = root["pixel_ratio"].toObject()["num"].toInt();
+        if (!root["pixel_ratio"].toObject()["den"].isNull())
+            info.pixel_ratio.den = root["pixel_ratio"].toObject()["den"].toInt();
 	}
 	if (!root["display_ratio"].isNull() && root["display_ratio"].isObject()) {
-		if (!root["display_ratio"]["num"].isNull())
-			info.display_ratio.num = root["display_ratio"]["num"].asInt();
-		if (!root["display_ratio"]["den"].isNull())
-			info.display_ratio.den = root["display_ratio"]["den"].asInt();
+        if (!root["display_ratio"].toObject()["num"].isNull())
+            info.display_ratio.num = root["display_ratio"].toObject()["num"].toInt();
+        if (!root["display_ratio"].toObject()["den"].isNull())
+            info.display_ratio.den = root["display_ratio"].toObject()["den"].toInt();
 	}
 	if (!root["vcodec"].isNull())
-		info.vcodec = root["vcodec"].asString();
+        info.vcodec = root["vcodec"].toString().toLocal8Bit().constData();
 	if (!root["video_length"].isNull())
-		info.video_length = (long int) root["video_length"].asUInt();
+        info.video_length = root.value("video_length").toVariant().toLongLong();
 	if (!root["video_stream_index"].isNull())
-		info.video_stream_index = root["video_stream_index"].asInt();
+        info.video_stream_index = root["video_stream_index"].toInt();
 	if (!root["video_timebase"].isNull() && root["video_timebase"].isObject()) {
-		if (!root["video_timebase"]["num"].isNull())
-			info.video_timebase.num = root["video_timebase"]["num"].asInt();
-		if (!root["video_timebase"]["den"].isNull())
-			info.video_timebase.den = root["video_timebase"]["den"].asInt();
+        if (!root["video_timebase"].toObject()["num"].isNull())
+            info.video_timebase.num = root["video_timebase"].toObject()["num"].toInt();
+        if (!root["video_timebase"].toObject()["den"].isNull())
+            info.video_timebase.den = root["video_timebase"].toObject()["den"].toInt();
 	}
 	if (!root["interlaced_frame"].isNull())
-		info.interlaced_frame = root["interlaced_frame"].asBool();
+        info.interlaced_frame = root["interlaced_frame"].toBool();
 	if (!root["top_field_first"].isNull())
-		info.top_field_first = root["top_field_first"].asBool();
+        info.top_field_first = root["top_field_first"].toBool();
 	if (!root["acodec"].isNull())
-		info.acodec = root["acodec"].asString();
+        info.acodec = root["acodec"].toString().toLocal8Bit().constData();
 
 	if (!root["audio_bit_rate"].isNull())
-		info.audio_bit_rate = root["audio_bit_rate"].asInt();
+        info.audio_bit_rate = root["audio_bit_rate"].toInt();
 	if (!root["sample_rate"].isNull())
-		info.sample_rate = root["sample_rate"].asInt();
+        info.sample_rate = root["sample_rate"].toInt();
 	if (!root["channels"].isNull())
-		info.channels = root["channels"].asInt();
+        info.channels = root["channels"].toInt();
 	if (!root["channel_layout"].isNull())
-		info.channel_layout = (ChannelLayout) root["channel_layout"].asInt();
+        info.channel_layout = (ChannelLayout) root["channel_layout"].toInt();
 	if (!root["audio_stream_index"].isNull())
-		info.audio_stream_index = root["audio_stream_index"].asInt();
+        info.audio_stream_index = root["audio_stream_index"].toInt();
 	if (!root["audio_timebase"].isNull() && root["audio_timebase"].isObject()) {
-		if (!root["audio_timebase"]["num"].isNull())
-			info.audio_timebase.num = root["audio_timebase"]["num"].asInt();
-		if (!root["audio_timebase"]["den"].isNull())
-			info.audio_timebase.den = root["audio_timebase"]["den"].asInt();
+        if (!root["audio_timebase"].toObject()["num"].isNull())
+            info.audio_timebase.num = root["audio_timebase"].toObject()["num"].toInt();
+        if (!root["audio_timebase"].toObject()["den"].isNull())
+            info.audio_timebase.den = root["audio_timebase"].toObject()["den"].toInt();
 	}
 }

=== modified file 'src/effects/Brightness.cpp'
--- src/effects/Brightness.cpp	2015-10-02 23:22:10 +0000
+++ src/effects/Brightness.cpp	2015-10-04 15:21:00 +0000
@@ -117,19 +117,21 @@
 string Brightness::Json() {
 
 	// Return formatted string
-	return JsonValue().toStyledString();
+    QJsonDocument document;
+    document.setObject(JsonValue());
+    return document.toJson().constData();
 }
 
-// Generate Json::JsonValue for this object
-Json::Value Brightness::JsonValue() {
+// Generate QJsonObject for this object
+QJsonObject Brightness::JsonValue() {
 
 	// Create root json object
-	Json::Value root = EffectBase::JsonValue(); // get parent properties
-	root["type"] = info.class_name;
+    QJsonObject root = EffectBase::JsonValue(); // get parent properties
+    root["type"] = info.class_name.c_str();
 	root["brightness"] = brightness.JsonValue();
 	root["contrast"] = contrast.JsonValue();
 
-	// return JsonValue
+    // return QJsonObject
 	return root;
 }
 
@@ -137,12 +139,16 @@
 void Brightness::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
-		// Raise exception
-		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+    QJsonObject root;
+    QJsonParseError errors;
+
+    QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+    if (errors.error != QJsonParseError::NoError) {
+        // Raise exception
+        throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+    }
+
+    root = document.object();
 
 	try
 	{
@@ -156,17 +162,17 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void Brightness::SetJsonValue(Json::Value root) {
+// Load QJsonObject into this object
+void Brightness::SetJsonValue(QJsonObject root) {
 
 	// Set parent data
 	EffectBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["brightness"].isNull())
-		brightness.SetJsonValue(root["brightness"]);
+        brightness.SetJsonValue(root["brightness"].toObject());
 	if (!root["contrast"].isNull())
-		contrast.SetJsonValue(root["contrast"]);
+        contrast.SetJsonValue(root["contrast"].toObject());
 }
 
 // Get all properties for a specific frame
@@ -176,7 +182,7 @@
 	Point requested_point(requested_frame, requested_frame);
 
 	// Generate JSON properties list
-	Json::Value root;
+    QJsonObject root;
 	root["id"] = add_property_json("ID", 0.0, "string", Id(), false, 0, -1, -1, CONSTANT, -1, true);
 	root["position"] = add_property_json("Position", Position(), "float", "", false, 0, 0, 1000 * 60 * 30, CONSTANT, -1, false);
 	root["layer"] = add_property_json("Layer", Layer(), "int", "", false, 0, 0, 1000, CONSTANT, -1, false);
@@ -189,6 +195,8 @@
 	root["contrast"] = add_property_json("Contrast", contrast.GetValue(requested_frame), "float", "", contrast.Contains(requested_point), contrast.GetCount(), -10000, 10000, contrast.GetClosestPoint(requested_point).interpolation, contrast.GetClosestPoint(requested_point).co.X, false);
 
 	// Return formatted string
-	return root.toStyledString();
+    QJsonDocument document;
+    document.setObject(root);
+    return document.toJson().constData();
 }
 

=== modified file 'src/effects/ChromaKey.cpp'
--- src/effects/ChromaKey.cpp	2015-10-02 23:22:10 +0000
+++ src/effects/ChromaKey.cpp	2015-10-04 15:21:00 +0000
@@ -101,15 +101,17 @@
 string ChromaKey::Json() {
 
 	// Return formatted string
-	return JsonValue().toStyledString();
+    QJsonDocument document;
+    document.setObject(JsonValue());
+    return document.toJson().constData();
 }
 
 // Generate Json::JsonValue for this object
-Json::Value ChromaKey::JsonValue() {
+QJsonObject ChromaKey::JsonValue() {
 
 	// Create root json object
-	Json::Value root = EffectBase::JsonValue(); // get parent properties
-	root["type"] = info.class_name;
+    QJsonObject root = EffectBase::JsonValue(); // get parent properties
+    root["type"] = info.class_name.c_str();
 	root["color"] = color.JsonValue();
 	root["fuzz"] = fuzz.JsonValue();
 
@@ -121,12 +123,16 @@
 void ChromaKey::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -140,17 +146,17 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void ChromaKey::SetJsonValue(Json::Value root) {
+// Load QJsonObject into this object
+void ChromaKey::SetJsonValue(QJsonObject root) {
 
 	// Set parent data
 	EffectBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["color"].isNull())
-		color.SetJsonValue(root["color"]);
+		color.SetJsonValue(root["color"].toObject());
 	if (!root["fuzz"].isNull())
-		fuzz.SetJsonValue(root["fuzz"]);
+		fuzz.SetJsonValue(root["fuzz"].toObject());
 }
 
 // Get all properties for a specific frame
@@ -160,7 +166,7 @@
 	Point requested_point(requested_frame, requested_frame);
 
 	// Generate JSON properties list
-	Json::Value root;
+	QJsonObject root;
 	root["id"] = add_property_json("ID", 0.0, "string", Id(), false, 0, -1, -1, CONSTANT, -1, true);
 	root["position"] = add_property_json("Position", Position(), "float", "", false, 0, 0, 1000 * 60 * 30, CONSTANT, -1, false);
 	root["layer"] = add_property_json("Layer", Layer(), "int", "", false, 0, 0, 1000, CONSTANT, -1, false);
@@ -170,11 +176,13 @@
 
 	// Keyframes
 	root["color"] = add_property_json("Key Color", 0.0, "color", "", color.red.Contains(requested_point), color.red.GetCount(), -10000, 10000, color.red.GetClosestPoint(requested_point).interpolation, color.red.GetClosestPoint(requested_point).co.X, false);
-	root["color"]["red"] = add_property_json("Red", color.red.GetValue(requested_frame), "float", "", color.red.Contains(requested_point), color.red.GetCount(), -10000, 10000, color.red.GetClosestPoint(requested_point).interpolation, color.red.GetClosestPoint(requested_point).co.X, false);
-	root["color"]["blue"] = add_property_json("Blue", color.blue.GetValue(requested_frame), "float", "", color.blue.Contains(requested_point), color.blue.GetCount(), -10000, 10000, color.blue.GetClosestPoint(requested_point).interpolation, color.blue.GetClosestPoint(requested_point).co.X, false);
-	root["color"]["green"] = add_property_json("Green", color.green.GetValue(requested_frame), "float", "", color.green.Contains(requested_point), color.green.GetCount(), -10000, 10000, color.green.GetClosestPoint(requested_point).interpolation, color.green.GetClosestPoint(requested_point).co.X, false);
+    root["color"].toObject()["red"] = add_property_json("Red", color.red.GetValue(requested_frame), "float", "", color.red.Contains(requested_point), color.red.GetCount(), -10000, 10000, color.red.GetClosestPoint(requested_point).interpolation, color.red.GetClosestPoint(requested_point).co.X, false);
+    root["color"].toObject()["blue"] = add_property_json("Blue", color.blue.GetValue(requested_frame), "float", "", color.blue.Contains(requested_point), color.blue.GetCount(), -10000, 10000, color.blue.GetClosestPoint(requested_point).interpolation, color.blue.GetClosestPoint(requested_point).co.X, false);
+    root["color"].toObject()["green"] = add_property_json("Green", color.green.GetValue(requested_frame), "float", "", color.green.Contains(requested_point), color.green.GetCount(), -10000, 10000, color.green.GetClosestPoint(requested_point).interpolation, color.green.GetClosestPoint(requested_point).co.X, false);
 	root["fuzz"] = add_property_json("Fuzz", fuzz.GetValue(requested_frame), "float", "", fuzz.Contains(requested_point), fuzz.GetCount(), -10000, 10000, fuzz.GetClosestPoint(requested_point).interpolation, fuzz.GetClosestPoint(requested_point).co.X, false);
 
 	// Return formatted string
-	return root.toStyledString();
+	QJsonDocument document;
+	document.setObject(root);
+	return document.toJson().constData();
 }

=== modified file 'src/effects/Deinterlace.cpp'
--- src/effects/Deinterlace.cpp	2015-10-02 23:22:10 +0000
+++ src/effects/Deinterlace.cpp	2015-10-04 15:21:00 +0000
@@ -96,15 +96,17 @@
 string Deinterlace::Json() {
 
 	// Return formatted string
-	return JsonValue().toStyledString();
+    QJsonDocument document;
+    document.setObject(JsonValue());
+    return document.toJson().constData();
 }
 
 // Generate Json::JsonValue for this object
-Json::Value Deinterlace::JsonValue() {
+QJsonObject Deinterlace::JsonValue() {
 
 	// Create root json object
-	Json::Value root = EffectBase::JsonValue(); // get parent properties
-	root["type"] = info.class_name;
+    QJsonObject root = EffectBase::JsonValue(); // get parent properties
+    root["type"] = info.class_name.c_str();
 	root["isOdd"] = isOdd;
 
 	// return JsonValue
@@ -115,12 +117,16 @@
 void Deinterlace::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -134,15 +140,15 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void Deinterlace::SetJsonValue(Json::Value root) {
+// Load QJsonObject into this object
+void Deinterlace::SetJsonValue(QJsonObject root) {
 
 	// Set parent data
 	EffectBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["isOdd"].isNull())
-		isOdd = root["isOdd"].asBool();
+		isOdd = root["isOdd"].toBool();
 }
 
 // Get all properties for a specific frame
@@ -152,7 +158,7 @@
 	Point requested_point(requested_frame, requested_frame);
 
 	// Generate JSON properties list
-	Json::Value root;
+	QJsonObject root;
 	root["id"] = add_property_json("ID", 0.0, "string", Id(), false, 0, -1, -1, CONSTANT, -1, true);
 	root["position"] = add_property_json("Position", Position(), "float", "", false, 0, 0, 1000 * 60 * 30, CONSTANT, -1, false);
 	root["layer"] = add_property_json("Layer", Layer(), "int", "", false, 0, 0, 1000, CONSTANT, -1, false);
@@ -162,9 +168,11 @@
 	root["isOdd"] = add_property_json("Is Odd Frame", isOdd, "bool", "", false, 0, 0, 1, CONSTANT, -1, true);
 
 	// Add Is Odd Frame choices (dropdown style)
-	root["isOdd"]["choices"].append(add_property_choice_json("Yes", true, isOdd));
-	root["isOdd"]["choices"].append(add_property_choice_json("No", false, isOdd));
+    root["isOdd"].toObject()["choices"].toArray().append(add_property_choice_json("Yes", true, isOdd));
+    root["isOdd"].toObject()["choices"].toArray().append(add_property_choice_json("No", false, isOdd));
 
 	// Return formatted string
-	return root.toStyledString();
+	QJsonDocument document;
+	document.setObject(root);
+	return document.toJson().constData();
 }

=== modified file 'src/effects/Mask.cpp'
--- src/effects/Mask.cpp	2015-10-02 23:22:10 +0000
+++ src/effects/Mask.cpp	2015-10-04 15:21:00 +0000
@@ -159,21 +159,23 @@
 string Mask::Json() {
 
 	// Return formatted string
-	return JsonValue().toStyledString();
+    QJsonDocument document;
+    document.setObject(JsonValue());
+    return document.toJson().constData();
 }
 
 // Generate Json::JsonValue for this object
-Json::Value Mask::JsonValue() {
+QJsonObject Mask::JsonValue() {
 
 	// Create root json object
-	Json::Value root = EffectBase::JsonValue(); // get parent properties
-	root["type"] = info.class_name;
+    QJsonObject root = EffectBase::JsonValue(); // get parent properties
+    root["type"] = info.class_name.c_str();
 	root["brightness"] = brightness.JsonValue();
 	root["contrast"] = contrast.JsonValue();
 	if (reader)
 		root["reader"] = reader->JsonValue();
 	else
-		root["reader"] = Json::objectValue;
+        root["reader"] = QJsonObject();
 	root["replace_image"] = replace_image;
 
 	// return JsonValue
@@ -184,12 +186,16 @@
 void Mask::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -204,22 +210,22 @@
 }
 
 // Load Json::JsonValue into this object
-void Mask::SetJsonValue(Json::Value root) {
+void Mask::SetJsonValue(QJsonObject root) {
 
 	// Set parent data
 	EffectBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["replace_image"].isNull())
-		replace_image = root["replace_image"].asBool();
+        replace_image = root["replace_image"].toBool();
 	if (!root["brightness"].isNull())
-		brightness.SetJsonValue(root["brightness"]);
+        brightness.SetJsonValue(root["brightness"].toObject());
 	if (!root["contrast"].isNull())
-		contrast.SetJsonValue(root["contrast"]);
+        contrast.SetJsonValue(root["contrast"].toObject());
 	if (!root["reader"].isNull()) // does Json contain a reader?
 	{
 
-		if (!root["reader"]["type"].isNull()) // does the reader Json contain a 'type'?
+        if (!root["reader"].toObject()["type"].isNull()) // does the reader Json contain a 'type'?
 		{
 			// Close previous reader (if any)
 			if (reader)
@@ -231,31 +237,31 @@
 			}
 
 			// Create new reader (and load properties)
-			string type = root["reader"]["type"].asString();
+            string type = root["reader"].toObject()["type"].toString().toLocal8Bit().constData();
 
 			if (type == "FFmpegReader") {
 
 				// Create new reader
-				reader = new FFmpegReader(root["reader"]["path"].asString());
-				reader->SetJsonValue(root["reader"]);
+                reader = new FFmpegReader(root["reader"].toObject()["path"].toString().toLocal8Bit().constData());
+                reader->SetJsonValue(root["reader"].toObject());
 
 			} else if (type == "ImageReader") {
 
 				// Create new reader
-				reader = new ImageReader(root["reader"]["path"].asString());
-				reader->SetJsonValue(root["reader"]);
+                reader = new ImageReader(root["reader"].toObject()["path"].toString().toLocal8Bit().constData());
+                reader->SetJsonValue(root["reader"].toObject());
 
 			} else if (type == "QtImageReader") {
 
 				// Create new reader
-				reader = new QtImageReader(root["reader"]["path"].asString());
-				reader->SetJsonValue(root["reader"]);
+                reader = new QtImageReader(root["reader"].toObject()["path"].toString().toLocal8Bit().constData());
+                reader->SetJsonValue(root["reader"].toObject());
 
 			} else if (type == "ChunkReader") {
 
 				// Create new reader
-				reader = new ChunkReader(root["reader"]["path"].asString(), (ChunkVersion) root["reader"]["chunk_version"].asInt());
-				reader->SetJsonValue(root["reader"]);
+                reader = new ChunkReader(root["reader"].toObject()["path"].toString().toLocal8Bit().constData(), (ChunkVersion) root["reader"].toObject()["chunk_version"].toInt());
+                reader->SetJsonValue(root["reader"].toObject());
 
 			}
 
@@ -271,7 +277,7 @@
 	Point requested_point(requested_frame, requested_frame);
 
 	// Generate JSON properties list
-	Json::Value root;
+	QJsonObject root;
 	root["id"] = add_property_json("ID", 0.0, "string", Id(), false, 0, -1, -1, CONSTANT, -1, true);
 	root["position"] = add_property_json("Position", Position(), "float", "", false, 0, 0, 1000 * 60 * 30, CONSTANT, -1, false);
 	root["layer"] = add_property_json("Layer", Layer(), "int", "", false, 0, 0, 1000, CONSTANT, -1, false);
@@ -281,14 +287,16 @@
 	root["replace_image"] = add_property_json("Replace Image", replace_image, "bool", "", false, 0, 0, 1, CONSTANT, -1, false);
 
 	// Add replace_image choices (dropdown style)
-	root["replace_image"]["choices"].append(add_property_choice_json("Yes", true, replace_image));
-	root["replace_image"]["choices"].append(add_property_choice_json("No", false, replace_image));
+    root["replace_image"].toObject()["choices"].toArray().append(add_property_choice_json("Yes", true, replace_image));
+    root["replace_image"].toObject()["choices"].toArray().append(add_property_choice_json("No", false, replace_image));
 
 	// Keyframes
 	root["brightness"] = add_property_json("Brightness", brightness.GetValue(requested_frame), "float", "", brightness.Contains(requested_point), brightness.GetCount(), -10000, 10000, brightness.GetClosestPoint(requested_point).interpolation, brightness.GetClosestPoint(requested_point).co.X, false);
 	root["contrast"] = add_property_json("Contrast", contrast.GetValue(requested_frame), "float", "", contrast.Contains(requested_point), contrast.GetCount(), -10000, 10000, contrast.GetClosestPoint(requested_point).interpolation, contrast.GetClosestPoint(requested_point).co.X, false);
 
 	// Return formatted string
-	return root.toStyledString();
+	QJsonDocument document;
+	document.setObject(root);
+	return document.toJson().constData();
 }
 

=== modified file 'src/effects/Negate.cpp'
--- src/effects/Negate.cpp	2015-08-24 06:05:48 +0000
+++ src/effects/Negate.cpp	2015-10-04 15:21:00 +0000
@@ -58,15 +58,17 @@
 string Negate::Json() {
 
 	// Return formatted string
-	return JsonValue().toStyledString();
+    QJsonDocument document;
+    document.setObject(JsonValue());
+    return document.toJson().constData();
 }
 
 // Generate Json::JsonValue for this object
-Json::Value Negate::JsonValue() {
+QJsonObject Negate::JsonValue() {
 
 	// Create root json object
-	Json::Value root = EffectBase::JsonValue(); // get parent properties
-	root["type"] = info.class_name;
+    QJsonObject root = EffectBase::JsonValue(); // get parent properties
+    root["type"] = info.class_name.c_str();
 
 	// return JsonValue
 	return root;
@@ -76,12 +78,16 @@
 void Negate::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
+	QJsonObject root;
+	QJsonParseError errors;
+
+	QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+	if (errors.error != QJsonParseError::NoError) {
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+	}
+
+	root = document.object();
 
 	try
 	{
@@ -95,8 +101,8 @@
 	}
 }
 
-// Load Json::JsonValue into this object
-void Negate::SetJsonValue(Json::Value root) {
+// Load QJsonObject into this object
+void Negate::SetJsonValue(QJsonObject root) {
 
 	// Set parent data
 	EffectBase::SetJsonValue(root);
@@ -110,7 +116,7 @@
 	Point requested_point(requested_frame, requested_frame);
 
 	// Generate JSON properties list
-	Json::Value root;
+	QJsonObject root;
 	root["id"] = add_property_json("ID", 0.0, "string", Id(), false, 0, -1, -1, CONSTANT, -1, true);
 	root["position"] = add_property_json("Position", Position(), "float", "", false, 0, 0, 1000 * 60 * 30, CONSTANT, -1, false);
 	root["layer"] = add_property_json("Layer", Layer(), "int", "", false, 0, 0, 1000, CONSTANT, -1, false);
@@ -119,5 +125,7 @@
 	root["duration"] = add_property_json("Duration", Duration(), "float", "", false, 0, 0, 1000 * 60 * 30, CONSTANT, -1, true);
 
 	// Return formatted string
-	return root.toStyledString();
+	QJsonDocument document;
+	document.setObject(root);
+	return document.toJson().constData();
 }

=== modified file 'src/effects/Saturation.cpp'
--- src/effects/Saturation.cpp	2015-10-02 23:22:10 +0000
+++ src/effects/Saturation.cpp	2015-10-04 15:21:00 +0000
@@ -120,15 +120,17 @@
 string Saturation::Json() {
 
 	// Return formatted string
-	return JsonValue().toStyledString();
+    QJsonDocument document;
+    document.setObject(JsonValue());
+    return document.toJson().constData();
 }
 
 // Generate Json::JsonValue for this object
-Json::Value Saturation::JsonValue() {
+QJsonObject Saturation::JsonValue() {
 
 	// Create root json object
-	Json::Value root = EffectBase::JsonValue(); // get parent properties
-	root["type"] = info.class_name;
+    QJsonObject root = EffectBase::JsonValue(); // get parent properties
+    root["type"] = info.class_name.c_str();
 	root["saturation"] = saturation.JsonValue();
 
 	// return JsonValue
@@ -139,12 +141,16 @@
 void Saturation::SetJson(string value) throw(InvalidJSON) {
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( value, root );
-	if (!success)
-		// Raise exception
-		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+    QJsonObject root;
+    QJsonParseError errors;
+
+    QJsonDocument document = QJsonDocument::fromJson(QByteArray(value.c_str()), &errors);
+    if (errors.error != QJsonParseError::NoError) {
+        // Raise exception
+        throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
+    }
+
+    root = document.object();
 
 	try
 	{
@@ -159,14 +165,14 @@
 }
 
 // Load Json::JsonValue into this object
-void Saturation::SetJsonValue(Json::Value root) {
+void Saturation::SetJsonValue(QJsonObject root) {
 
 	// Set parent data
 	EffectBase::SetJsonValue(root);
 
 	// Set data from Json (if key is found)
 	if (!root["saturation"].isNull())
-		saturation.SetJsonValue(root["saturation"]);
+        saturation.SetJsonValue(root["saturation"].toObject());
 }
 
 // Get all properties for a specific frame
@@ -176,7 +182,7 @@
 	Point requested_point(requested_frame, requested_frame);
 
 	// Generate JSON properties list
-	Json::Value root;
+    QJsonObject root;
 	root["id"] = add_property_json("ID", 0.0, "string", Id(), false, 0, -1, -1, CONSTANT, -1, true);
 	root["position"] = add_property_json("Position", Position(), "float", "", false, 0, 0, 1000 * 60 * 30, CONSTANT, -1, false);
 	root["layer"] = add_property_json("Layer", Layer(), "int", "", false, 0, 0, 1000, CONSTANT, -1, false);
@@ -188,6 +194,8 @@
 	root["saturation"] = add_property_json("Saturation", saturation.GetValue(requested_frame), "float", "", saturation.Contains(requested_point), saturation.GetCount(), -10000, 10000, saturation.GetClosestPoint(requested_point).interpolation, saturation.GetClosestPoint(requested_point).co.X, false);
 
 	// Return formatted string
-	return root.toStyledString();
+    QJsonDocument document;
+    document.setObject(root);
+    return document.toJson().constData();
 }
 

=== modified file 'tests/Clip_Tests.cpp'
--- tests/Clip_Tests.cpp	2015-09-29 03:17:29 +0000
+++ tests/Clip_Tests.cpp	2015-10-04 15:21:00 +0000
@@ -109,18 +109,19 @@
 	string properties = c1.PropertiesJSON(1);
 
 	// Parse JSON string into JSON objects
-	Json::Value root;
-	Json::Reader reader;
-	bool success = reader.parse( properties, root );
-	if (!success)
+	QJsonParseError error;
+	QJsonDocument rootDocument = QJsonDocument::fromJson(properties.c_str(), &error);
+	if (error.error != QJsonParseError::NoError)
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
 
+	QJsonObject root = rootDocument.object();
+
 	try
 	{
 		// Check for specific things
-		CHECK_CLOSE(1.0f, root["alpha"]["value"].asDouble(), 0.01);
-		CHECK_EQUAL(true, root["alpha"]["keyframe"].asBool());
+		CHECK_CLOSE(1.0f, root["alpha"].toObject()["value"].toDouble(), 0.01);
+		CHECK_EQUAL(true, root["alpha"].toObject()["keyframe"].toBool());
 
 	}
 	catch (exception e)
@@ -134,17 +135,18 @@
 	properties = c1.PropertiesJSON(250);
 
 	// Parse JSON string into JSON objects
-	root.clear();
-	success = reader.parse( properties, root );
-	if (!success)
+	rootDocument = QJsonDocument::fromJson(properties.c_str(), &error);
+	if (error.error != QJsonParseError::NoError)
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
 
+	root = rootDocument.object();
+
 	try
 	{
 		// Check for specific things
-		CHECK_CLOSE(0.5f, root["alpha"]["value"].asDouble(), 0.01);
-		CHECK_EQUAL(false, root["alpha"]["keyframe"].asBool());
+		CHECK_CLOSE(0.5f, root["alpha"].toObject()["value"].toDouble(), 0.01);
+		CHECK_EQUAL(false, root["alpha"].toObject()["keyframe"].toBool());
 
 	}
 	catch (exception e)
@@ -158,16 +160,17 @@
 	properties = c1.PropertiesJSON(250); // again
 
 	// Parse JSON string into JSON objects
-	root.clear();
-	success = reader.parse( properties, root );
-	if (!success)
+	rootDocument = QJsonDocument::fromJson(properties.c_str(), &error);
+	if (error.error != QJsonParseError::NoError)
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
 
+	root = rootDocument.object();
+
 	try
 	{
 		// Check for specific things
-		CHECK_EQUAL(false, root["alpha"]["keyframe"].asBool());
+		CHECK_EQUAL(false, root["alpha"].toObject()["keyframe"].toBool());
 
 	}
 	catch (exception e)
@@ -181,17 +184,18 @@
 	properties = c1.PropertiesJSON(500);
 
 	// Parse JSON string into JSON objects
-	root.clear();
-	success = reader.parse( properties, root );
-	if (!success)
+	rootDocument = QJsonDocument::fromJson(properties.c_str(), &error);
+	if (error.error != QJsonParseError::NoError)
 		// Raise exception
 		throw InvalidJSON("JSON could not be parsed (or is invalid)", "");
 
+	root = rootDocument.object();
+
 	try
 	{
 		// Check for specific things
-		CHECK_CLOSE(0.0f, root["alpha"]["value"].asDouble(), 0.00001);
-		CHECK_EQUAL(true, root["alpha"]["keyframe"].asBool());
+		CHECK_CLOSE(0.0f, root["alpha"].toObject()["value"].toDouble(), 0.00001);
+		CHECK_EQUAL(true, root["alpha"].toObject()["keyframe"].toBool());
 
 	}
 	catch (exception e)

=== modified file 'tests/ReaderBase_Tests.cpp'
--- tests/ReaderBase_Tests.cpp	2015-08-24 06:05:48 +0000
+++ tests/ReaderBase_Tests.cpp	2015-10-04 15:21:00 +0000
@@ -46,8 +46,8 @@
 		void Open() { };
 		string Json() { };
 		void SetJson(string value) throw(InvalidJSON) { };
-		Json::Value JsonValue() { };
-		void SetJsonValue(Json::Value root) { };
+		QJsonObject JsonValue() { };
+		void SetJsonValue(QJsonObject root) { };
 		bool IsOpen() { return true; };
 	};
 

=== removed directory 'thirdparty'
=== removed directory 'thirdparty/jsoncpp'
=== removed file 'thirdparty/jsoncpp/LICENSE'
--- thirdparty/jsoncpp/LICENSE	2013-08-01 18:45:09 +0000
+++ thirdparty/jsoncpp/LICENSE	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-The json-cpp library and this documentation are in Public Domain.

=== removed directory 'thirdparty/jsoncpp/include'
=== removed directory 'thirdparty/jsoncpp/include/json'
=== removed file 'thirdparty/jsoncpp/include/json/autolink.h'
--- thirdparty/jsoncpp/include/json/autolink.h	2013-07-31 21:18:54 +0000
+++ thirdparty/jsoncpp/include/json/autolink.h	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#ifndef JSON_AUTOLINK_H_INCLUDED
-# define JSON_AUTOLINK_H_INCLUDED
-
-# include "config.h"
-
-# ifdef JSON_IN_CPPTL
-#  include <cpptl/cpptl_autolink.h>
-# endif
-
-# if !defined(JSON_NO_AUTOLINK)  &&  !defined(JSON_DLL_BUILD)  &&  !defined(JSON_IN_CPPTL)
-#  define CPPTL_AUTOLINK_NAME "json"
-#  undef CPPTL_AUTOLINK_DLL
-#  ifdef JSON_DLL
-#   define CPPTL_AUTOLINK_DLL
-#  endif
-#  include "autolink.h"
-# endif
-
-#endif // JSON_AUTOLINK_H_INCLUDED

=== removed file 'thirdparty/jsoncpp/include/json/config.h'
--- thirdparty/jsoncpp/include/json/config.h	2013-07-31 21:18:54 +0000
+++ thirdparty/jsoncpp/include/json/config.h	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-#ifndef JSON_CONFIG_H_INCLUDED
-# define JSON_CONFIG_H_INCLUDED
-
-/// If defined, indicates that json library is embedded in CppTL library.
-//# define JSON_IN_CPPTL 1
-
-/// If defined, indicates that json may leverage CppTL library
-//#  define JSON_USE_CPPTL 1
-/// If defined, indicates that cpptl vector based map should be used instead of std::map
-/// as Value container.
-//#  define JSON_USE_CPPTL_SMALLMAP 1
-/// If defined, indicates that Json specific container should be used
-/// (hash table & simple deque container with customizable allocator).
-/// THIS FEATURE IS STILL EXPERIMENTAL!
-//#  define JSON_VALUE_USE_INTERNAL_MAP 1
-/// Force usage of standard new/malloc based allocator instead of memory pool based allocator.
-/// The memory pools allocator used optimization (initializing Value and ValueInternalLink
-/// as if it was a POD) that may cause some validation tool to report errors.
-/// Only has effects if JSON_VALUE_USE_INTERNAL_MAP is defined.
-//#  define JSON_USE_SIMPLE_INTERNAL_ALLOCATOR 1
-
-/// If defined, indicates that Json use exception to report invalid type manipulation
-/// instead of C assert macro.
-# define JSON_USE_EXCEPTION 1
-
-# ifdef JSON_IN_CPPTL
-#  include <cpptl/config.h>
-#  ifndef JSON_USE_CPPTL
-#   define JSON_USE_CPPTL 1
-#  endif
-# endif
-
-# ifdef JSON_IN_CPPTL
-#  define JSON_API CPPTL_API
-# elif defined(JSON_DLL_BUILD)
-#  define JSON_API __declspec(dllexport)
-# elif defined(JSON_DLL)
-#  define JSON_API __declspec(dllimport)
-# else
-#  define JSON_API
-# endif
-
-#endif // JSON_CONFIG_H_INCLUDED

=== removed file 'thirdparty/jsoncpp/include/json/features.h'
--- thirdparty/jsoncpp/include/json/features.h	2013-09-10 04:32:16 +0000
+++ thirdparty/jsoncpp/include/json/features.h	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-#ifndef CPPTL_JSON_FEATURES_H_INCLUDED
-# define CPPTL_JSON_FEATURES_H_INCLUDED
-
-# include "forwards.h"
-
-namespace Json {
-
-   /** @brief Configuration passed to reader and writer.
-    * This configuration object can be used to force the Reader or Writer
-    * to behave in a standard conforming way.
-    */
-   class JSON_API Features
-   {
-   public:
-      /** @brief A configuration that allows all features and assumes all strings are UTF-8.
-       * - C & C++ comments are allowed
-       * - Root object can be any JSON value
-       * - Assumes Value strings are encoded in UTF-8
-       */
-      static Features all();
-
-      /** @brief A configuration that is strictly compatible with the JSON specification.
-       * - Comments are forbidden.
-       * - Root object must be either an array or an object value.
-       * - Assumes Value strings are encoded in UTF-8
-       */
-      static Features strictMode();
-
-      /** @brief Initialize the configuration like JsonConfig::allFeatures;
-       */
-      Features();
-
-      /// \c true if comments are allowed. Default: \c true.
-      bool allowComments_;
-
-      /// \c true if root must be either an array or an object value. Default: \c false.
-      bool strictRoot_;
-   };
-
-} // namespace Json
-
-#endif // CPPTL_JSON_FEATURES_H_INCLUDED

=== removed file 'thirdparty/jsoncpp/include/json/forwards.h'
--- thirdparty/jsoncpp/include/json/forwards.h	2013-07-31 21:18:54 +0000
+++ thirdparty/jsoncpp/include/json/forwards.h	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-#ifndef JSON_FORWARDS_H_INCLUDED
-# define JSON_FORWARDS_H_INCLUDED
-
-# include "config.h"
-
-namespace Json {
-
-   // writer.h
-   class FastWriter;
-   class StyledWriter;
-
-   // reader.h
-   class Reader;
-
-   // features.h
-   class Features;
-
-   // value.h
-   typedef int Int;
-   typedef unsigned int UInt;
-   class StaticString;
-   class Path;
-   class PathArgument;
-   class Value;
-   class ValueIteratorBase;
-   class ValueIterator;
-   class ValueConstIterator;
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-   class ValueAllocator;
-   class ValueMapAllocator;
-   class ValueInternalLink;
-   class ValueInternalArray;
-   class ValueInternalMap;
-#endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
-
-} // namespace Json
-
-
-#endif // JSON_FORWARDS_H_INCLUDED

=== removed file 'thirdparty/jsoncpp/include/json/json.h'
--- thirdparty/jsoncpp/include/json/json.h	2013-07-31 21:18:54 +0000
+++ thirdparty/jsoncpp/include/json/json.h	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#ifndef JSON_JSON_H_INCLUDED
-# define JSON_JSON_H_INCLUDED
-
-# include "autolink.h"
-# include "value.h"
-# include "reader.h"
-# include "writer.h"
-# include "features.h"
-
-#endif // JSON_JSON_H_INCLUDED

=== removed file 'thirdparty/jsoncpp/include/json/reader.h'
--- thirdparty/jsoncpp/include/json/reader.h	2013-09-10 04:32:16 +0000
+++ thirdparty/jsoncpp/include/json/reader.h	1970-01-01 00:00:00 +0000
@@ -1,196 +0,0 @@
-#ifndef CPPTL_JSON_READER_H_INCLUDED
-# define CPPTL_JSON_READER_H_INCLUDED
-
-# include "features.h"
-# include "value.h"
-# include <deque>
-# include <stack>
-# include <string>
-# include <iostream>
-
-namespace Json {
-
-   /** @brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a Value.
-    *
-    */
-   class JSON_API Reader
-   {
-   public:
-      typedef char Char;
-      typedef const Char *Location;
-
-      /** @brief Constructs a Reader allowing all features
-       * for parsing.
-       */
-      Reader();
-
-      /** @brief Constructs a Reader allowing the specified feature set
-       * for parsing.
-       */
-      Reader( const Features &features );
-
-      /** @brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-       * \param document UTF-8 encoded string containing the document to read.
-       * \param root [out] Contains the root value of the document if it was
-       *             successfully parsed.
-       * \param collectComments \c true to collect comment and allow writing them back during
-       *                        serialization, \c false to discard comments.
-       *                        This parameter is ignored if Features::allowComments_
-       *                        is \c false.
-       * \return \c true if the document was successfully parsed, \c false if an error occurred.
-       */
-      bool parse( const std::string &document, 
-                  Value &root,
-                  bool collectComments = true );
-
-      /** @brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-       * \param document UTF-8 encoded string containing the document to read.
-       * \param root [out] Contains the root value of the document if it was
-       *             successfully parsed.
-       * \param collectComments \c true to collect comment and allow writing them back during
-       *                        serialization, \c false to discard comments.
-       *                        This parameter is ignored if Features::allowComments_
-       *                        is \c false.
-       * \return \c true if the document was successfully parsed, \c false if an error occurred.
-       */
-      bool parse( const char *beginDoc, const char *endDoc, 
-                  Value &root,
-                  bool collectComments = true );
-
-      /// @brief Parse from input stream.
-      /// \see Json::operator>>(std::istream&, Json::Value&).
-      bool parse( std::istream &is,
-                  Value &root,
-                  bool collectComments = true );
-
-      /** @brief Returns a user friendly string that list errors in the parsed document.
-       * \return Formatted error message with the list of errors with their location in 
-       *         the parsed document. An empty string is returned if no error occurred
-       *         during parsing.
-       */
-      std::string getFormatedErrorMessages() const;
-
-   private:
-      enum TokenType
-      {
-         tokenEndOfStream = 0,
-         tokenObjectBegin,
-         tokenObjectEnd,
-         tokenArrayBegin,
-         tokenArrayEnd,
-         tokenString,
-         tokenNumber,
-         tokenTrue,
-         tokenFalse,
-         tokenNull,
-         tokenArraySeparator,
-         tokenMemberSeparator,
-         tokenComment,
-         tokenError
-      };
-
-      class Token
-      {
-      public:
-         TokenType type_;
-         Location start_;
-         Location end_;
-      };
-
-      class ErrorInfo
-      {
-      public:
-         Token token_;
-         std::string message_;
-         Location extra_;
-      };
-
-      typedef std::deque<ErrorInfo> Errors;
-
-      bool expectToken( TokenType type, Token &token, const char *message );
-      bool readToken( Token &token );
-      void skipSpaces();
-      bool match( Location pattern, 
-                  int patternLength );
-      bool readComment();
-      bool readCStyleComment();
-      bool readCppStyleComment();
-      bool readString();
-      void readNumber();
-      bool readValue();
-      bool readObject( Token &token );
-      bool readArray( Token &token );
-      bool decodeNumber( Token &token );
-      bool decodeString( Token &token );
-      bool decodeString( Token &token, std::string &decoded );
-      bool decodeDouble( Token &token );
-      bool decodeUnicodeCodePoint( Token &token, 
-                                   Location &current, 
-                                   Location end, 
-                                   unsigned int &unicode );
-      bool decodeUnicodeEscapeSequence( Token &token, 
-                                        Location &current, 
-                                        Location end, 
-                                        unsigned int &unicode );
-      bool addError( const std::string &message, 
-                     Token &token,
-                     Location extra = 0 );
-      bool recoverFromError( TokenType skipUntilToken );
-      bool addErrorAndRecover( const std::string &message, 
-                               Token &token,
-                               TokenType skipUntilToken );
-      void skipUntilSpace();
-      Value &currentValue();
-      Char getNextChar();
-      void getLocationLineAndColumn( Location location,
-                                     int &line,
-                                     int &column ) const;
-      std::string getLocationLineAndColumn( Location location ) const;
-      void addComment( Location begin, 
-                       Location end, 
-                       CommentPlacement placement );
-      void skipCommentTokens( Token &token );
-   
-      typedef std::stack<Value *> Nodes;
-      Nodes nodes_;
-      Errors errors_;
-      std::string document_;
-      Location begin_;
-      Location end_;
-      Location current_;
-      Location lastValueEnd_;
-      Value *lastValue_;
-      std::string commentsBefore_;
-      Features features_;
-      bool collectComments_;
-   };
-
-   /** @brief Read from 'sin' into 'root'.
-
-    Always keep comments from the input JSON.
-
-    This can be used to read a file into a particular sub-object.
-    For example:
-    \code
-    Json::Value root;
-    cin >> root["dir"]["file"];
-    cout << root;
-    \endcode
-    Result:
-    \verbatim
-    {
-	"dir": {
-	    "file": {
-		// The input stream JSON would be nested here.
-	    }
-	}
-    }
-    \endverbatim
-    \throw std::exception on parse error.
-    \see Json::operator<<()
-   */
-   std::istream& operator>>( std::istream&, Value& );
-
-} // namespace Json
-
-#endif // CPPTL_JSON_READER_H_INCLUDED

=== removed file 'thirdparty/jsoncpp/include/json/value.h'
--- thirdparty/jsoncpp/include/json/value.h	2013-09-10 04:32:16 +0000
+++ thirdparty/jsoncpp/include/json/value.h	1970-01-01 00:00:00 +0000
@@ -1,1069 +0,0 @@
-#ifndef CPPTL_JSON_H_INCLUDED
-# define CPPTL_JSON_H_INCLUDED
-
-# include "forwards.h"
-# include <string>
-# include <vector>
-
-# ifndef JSON_USE_CPPTL_SMALLMAP
-#  include <map>
-# else
-#  include <cpptl/smallmap.h>
-# endif
-# ifdef JSON_USE_CPPTL
-#  include <cpptl/forwards.h>
-# endif
-
-/** @brief JSON (JavaScript Object Notation).
- */
-namespace Json {
-
-   /** @brief Type of the value held by a Value object.
-    */
-   enum ValueType
-   {
-      nullValue = 0, ///< 'null' value
-      intValue,      ///< signed integer value
-      uintValue,     ///< unsigned integer value
-      realValue,     ///< double value
-      stringValue,   ///< UTF-8 string value
-      booleanValue,  ///< bool value
-      arrayValue,    ///< array value (ordered list)
-      objectValue    ///< object value (collection of name/value pairs).
-   };
-
-   enum CommentPlacement
-   {
-      commentBefore = 0,        ///< a comment placed on the line before a value
-      commentAfterOnSameLine,   ///< a comment just after a value on the same line
-      commentAfter,             ///< a comment on the line after a value (only make sense for root value)
-      numberOfCommentPlacement
-   };
-
-//# ifdef JSON_USE_CPPTL
-//   typedef CppTL::AnyEnumerator<const char *> EnumMemberNames;
-//   typedef CppTL::AnyEnumerator<const Value &> EnumValues;
-//# endif
-
-   /** @brief Lightweight wrapper to tag static string.
-    *
-    * Value constructor and objectValue member assignement takes advantage of the
-    * StaticString and avoid the cost of string duplication when storing the
-    * string or the member name.
-    *
-    * Example of usage:
-    * \code
-    * Json::Value aValue( StaticString("some text") );
-    * Json::Value object;
-    * static const StaticString code("code");
-    * object[code] = 1234;
-    * \endcode
-    */
-   class JSON_API StaticString
-   {
-   public:
-      explicit StaticString( const char *czstring )
-         : str_( czstring )
-      {
-      }
-
-      operator const char *() const
-      {
-         return str_;
-      }
-
-      const char *c_str() const
-      {
-         return str_;
-      }
-
-   private:
-      const char *str_;
-   };
-
-   /** @brief Represents a <a HREF="http://www.json.org">JSON</a> value.
-    *
-    * This class is a discriminated union wrapper that can represents a:
-    * - signed integer [range: Value::minInt - Value::maxInt]
-    * - unsigned integer (range: 0 - Value::maxUInt)
-    * - double
-    * - UTF-8 string
-    * - boolean
-    * - 'null'
-    * - an ordered list of Value
-    * - collection of name/value pairs (javascript object)
-    *
-    * The type of the held value is represented by a #ValueType and 
-    * can be obtained using type().
-    *
-    * values of an #objectValue or #arrayValue can be accessed using operator[]() methods. 
-    * Non const methods will automatically create the a #nullValue element 
-    * if it does not exist. 
-    * The sequence of an #arrayValue will be automatically resize and initialized 
-    * with #nullValue. resize() can be used to enlarge or truncate an #arrayValue.
-    *
-    * The get() methods can be used to obtanis default value in the case the required element
-    * does not exist.
-    *
-    * It is possible to iterate over the list of a #objectValue values using 
-    * the getMemberNames() method.
-    */
-   class JSON_API Value 
-   {
-      friend class ValueIteratorBase;
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-      friend class ValueInternalLink;
-      friend class ValueInternalMap;
-# endif
-   public:
-      typedef std::vector<std::string> Members;
-      typedef ValueIterator iterator;
-      typedef ValueConstIterator const_iterator;
-      typedef Json::UInt UInt;
-      typedef Json::Int Int;
-      typedef UInt ArrayIndex;
-
-      static const Value null;
-      static const Int minInt;
-      static const Int maxInt;
-      static const UInt maxUInt;
-
-   private:
-#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-# ifndef JSON_VALUE_USE_INTERNAL_MAP
-      class CZString 
-      {
-      public:
-         enum DuplicationPolicy 
-         {
-            noDuplication = 0,
-            duplicate,
-            duplicateOnCopy
-         };
-         CZString( int index );
-         CZString( const char *cstr, DuplicationPolicy allocate );
-         CZString( const CZString &other );
-         ~CZString();
-         CZString &operator =( const CZString &other );
-         bool operator<( const CZString &other ) const;
-         bool operator==( const CZString &other ) const;
-         int index() const;
-         const char *c_str() const;
-         bool isStaticString() const;
-      private:
-         void swap( CZString &other );
-         const char *cstr_;
-         int index_;
-      };
-
-   public:
-#  ifndef JSON_USE_CPPTL_SMALLMAP
-      typedef std::map<CZString, Value> ObjectValues;
-#  else
-      typedef CppTL::SmallMap<CZString, Value> ObjectValues;
-#  endif // ifndef JSON_USE_CPPTL_SMALLMAP
-# endif // ifndef JSON_VALUE_USE_INTERNAL_MAP
-#endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-   public:
-      /** @brief Create a default Value of the given type.
-
-        This is a very useful constructor.
-        To create an empty array, pass arrayValue.
-        To create an empty object, pass objectValue.
-        Another Value can then be set to this one by assignment.
-	This is useful since clear() and resize() will not alter types.
-
-        Examples:
-	\code
-	Json::Value null_value; // null
-	Json::Value arr_value(Json::arrayValue); // []
-	Json::Value obj_value(Json::objectValue); // {}
-	\endcode
-      */
-      Value( ValueType type = nullValue );
-      Value( Int value );
-      Value( UInt value );
-      Value( double value );
-      Value( const char *value );
-      Value( const char *beginValue, const char *endValue );
-      /** @brief Constructs a value from a static string.
-
-       * Like other value string constructor but do not duplicate the string for
-       * internal storage. The given string must remain alive after the call to this
-       * constructor.
-       * Example of usage:
-       * \code
-       * Json::Value aValue( StaticString("some text") );
-       * \endcode
-       */
-      Value( const StaticString &value );
-      Value( const std::string &value );
-# ifdef JSON_USE_CPPTL
-      Value( const CppTL::ConstString &value );
-# endif
-      Value( bool value );
-      Value( const Value &other );
-      ~Value();
-
-      Value &operator=( const Value &other );
-      /// Swap values.
-      /// \note Currently, comments are intentionally not swapped, for
-      /// both logic and efficiency.
-      void swap( Value &other );
-
-      ValueType type() const;
-
-      bool operator <( const Value &other ) const;
-      bool operator <=( const Value &other ) const;
-      bool operator >=( const Value &other ) const;
-      bool operator >( const Value &other ) const;
-
-      bool operator ==( const Value &other ) const;
-      bool operator !=( const Value &other ) const;
-
-      int compare( const Value &other );
-
-      const char *asCString() const;
-      std::string asString() const;
-# ifdef JSON_USE_CPPTL
-      CppTL::ConstString asConstString() const;
-# endif
-      Int asInt() const;
-      UInt asUInt() const;
-      double asDouble() const;
-      bool asBool() const;
-
-      bool isNull() const;
-      bool isBool() const;
-      bool isInt() const;
-      bool isUInt() const;
-      bool isIntegral() const;
-      bool isDouble() const;
-      bool isNumeric() const;
-      bool isString() const;
-      bool isArray() const;
-      bool isObject() const;
-
-      bool isConvertibleTo( ValueType other ) const;
-
-      /// Number of values in array or object
-      UInt size() const;
-
-      /// @brief Return true if empty array, empty object, or null;
-      /// otherwise, false.
-      bool empty() const;
-
-      /// Return isNull()
-      bool operator!() const;
-
-      /// Remove all object members and array elements.
-      /// \pre type() is arrayValue, objectValue, or nullValue
-      /// \post type() is unchanged
-      void clear();
-
-      /// Resize the array to size elements. 
-      /// New elements are initialized to null.
-      /// May only be called on nullValue or arrayValue.
-      /// \pre type() is arrayValue or nullValue
-      /// \post type() is arrayValue
-      void resize( UInt size );
-
-      /// Access an array element (zero based index ).
-      /// If the array contains less than index element, then null value are inserted
-      /// in the array so that its size is index+1.
-      /// (You may need to say 'value[0u]' to get your compiler to distinguish
-      ///  this from the operator[] which takes a string.)
-      Value &operator[]( UInt index );
-      /// Access an array element (zero based index )
-      /// (You may need to say 'value[0u]' to get your compiler to distinguish
-      ///  this from the operator[] which takes a string.)
-      const Value &operator[]( UInt index ) const;
-      /// If the array contains at least index+1 elements, returns the element value, 
-      /// otherwise returns defaultValue.
-      Value get( UInt index, 
-                 const Value &defaultValue ) const;
-      /// Return true if index < size().
-      bool isValidIndex( UInt index ) const;
-      /// @brief Append value to array at the end.
-      ///
-      /// Equivalent to jsonvalue[jsonvalue.size()] = value;
-      Value &append( const Value &value );
-
-      /// Access an object value by name, create a null member if it does not exist.
-      Value &operator[]( const char *key );
-      /// Access an object value by name, returns null if there is no member with that name.
-      const Value &operator[]( const char *key ) const;
-      /// Access an object value by name, create a null member if it does not exist.
-      Value &operator[]( const std::string &key );
-      /// Access an object value by name, returns null if there is no member with that name.
-      const Value &operator[]( const std::string &key ) const;
-      /** @brief Access an object value by name, create a null member if it does not exist.
-
-       * If the object as no entry for that name, then the member name used to store
-       * the new entry is not duplicated.
-       * Example of use:
-       * \code
-       * Json::Value object;
-       * static const StaticString code("code");
-       * object[code] = 1234;
-       * \endcode
-       */
-      Value &operator[]( const StaticString &key );
-# ifdef JSON_USE_CPPTL
-      /// Access an object value by name, create a null member if it does not exist.
-      Value &operator[]( const CppTL::ConstString &key );
-      /// Access an object value by name, returns null if there is no member with that name.
-      const Value &operator[]( const CppTL::ConstString &key ) const;
-# endif
-      /// Return the member named key if it exist, defaultValue otherwise.
-      Value get( const char *key, 
-                 const Value &defaultValue ) const;
-      /// Return the member named key if it exist, defaultValue otherwise.
-      Value get( const std::string &key,
-                 const Value &defaultValue ) const;
-# ifdef JSON_USE_CPPTL
-      /// Return the member named key if it exist, defaultValue otherwise.
-      Value get( const CppTL::ConstString &key,
-                 const Value &defaultValue ) const;
-# endif
-      /// @brief Remove and return the named member.  
-      ///
-      /// Do nothing if it did not exist.
-      /// \return the removed Value, or null.
-      /// \pre type() is objectValue or nullValue
-      /// \post type() is unchanged
-      Value removeMember( const char* key );
-      /// Same as removeMember(const char*)
-      Value removeMember( const std::string &key );
-
-      /// Return true if the object has a member named key.
-      bool isMember( const char *key ) const;
-      /// Return true if the object has a member named key.
-      bool isMember( const std::string &key ) const;
-# ifdef JSON_USE_CPPTL
-      /// Return true if the object has a member named key.
-      bool isMember( const CppTL::ConstString &key ) const;
-# endif
-
-      /// @brief Return a list of the member names.
-      ///
-      /// If null, return an empty list.
-      /// \pre type() is objectValue or nullValue
-      /// \post if type() was nullValue, it remains nullValue
-      Members getMemberNames() const;
-
-//# ifdef JSON_USE_CPPTL
-//      EnumMemberNames enumMemberNames() const;
-//      EnumValues enumValues() const;
-//# endif
-
-      /// Comments must be //... or /* ... */
-      void setComment( const char *comment,
-                       CommentPlacement placement );
-      /// Comments must be //... or /* ... */
-      void setComment( const std::string &comment,
-                       CommentPlacement placement );
-      bool hasComment( CommentPlacement placement ) const;
-      /// Include delimiters and embedded newlines.
-      std::string getComment( CommentPlacement placement ) const;
-
-      std::string toStyledString() const;
-
-      const_iterator begin() const;
-      const_iterator end() const;
-
-      iterator begin();
-      iterator end();
-
-   private:
-      Value &resolveReference( const char *key, 
-                               bool isStatic );
-
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-      inline bool isItemAvailable() const
-      {
-         return itemIsUsed_ == 0;
-      }
-
-      inline void setItemUsed( bool isUsed = true )
-      {
-         itemIsUsed_ = isUsed ? 1 : 0;
-      }
-
-      inline bool isMemberNameStatic() const
-      {
-         return memberNameIsStatic_ == 0;
-      }
-
-      inline void setMemberNameIsStatic( bool isStatic )
-      {
-         memberNameIsStatic_ = isStatic ? 1 : 0;
-      }
-# endif // # ifdef JSON_VALUE_USE_INTERNAL_MAP
-
-   private:
-      struct CommentInfo
-      {
-         CommentInfo();
-         ~CommentInfo();
-
-         void setComment( const char *text );
-
-         char *comment_;
-      };
-
-      //struct MemberNamesTransform
-      //{
-      //   typedef const char *result_type;
-      //   const char *operator()( const CZString &name ) const
-      //   {
-      //      return name.c_str();
-      //   }
-      //};
-
-      union ValueHolder
-      {
-         Int int_;
-         UInt uint_;
-         double real_;
-         bool bool_;
-         char *string_;
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-         ValueInternalArray *array_;
-         ValueInternalMap *map_;
-#else
-         ObjectValues *map_;
-# endif
-      } value_;
-      ValueType type_ : 8;
-      int allocated_ : 1;     // Notes: if declared as bool, bitfield is useless.
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-      unsigned int itemIsUsed_ : 1;      // used by the ValueInternalMap container.
-      int memberNameIsStatic_ : 1;       // used by the ValueInternalMap container.
-# endif
-      CommentInfo *comments_;
-   };
-
-
-   /** @brief Experimental and untested: represents an element of the "path" to access a node.
-    */
-   class PathArgument
-   {
-   public:
-      friend class Path;
-
-      PathArgument();
-      PathArgument( UInt index );
-      PathArgument( const char *key );
-      PathArgument( const std::string &key );
-
-   private:
-      enum Kind
-      {
-         kindNone = 0,
-         kindIndex,
-         kindKey
-      };
-      std::string key_;
-      UInt index_;
-      Kind kind_;
-   };
-
-   /** @brief Experimental and untested: represents a "path" to access a node.
-    *
-    * Syntax:
-    * - "." => root node
-    * - ".[n]" => elements at index 'n' of root node (an array value)
-    * - ".name" => member named 'name' of root node (an object value)
-    * - ".name1.name2.name3"
-    * - ".[0][1][2].name1[3]"
-    * - ".%" => member name is provided as parameter
-    * - ".[%]" => index is provied as parameter
-    */
-   class Path
-   {
-   public:
-      Path( const std::string &path,
-            const PathArgument &a1 = PathArgument(),
-            const PathArgument &a2 = PathArgument(),
-            const PathArgument &a3 = PathArgument(),
-            const PathArgument &a4 = PathArgument(),
-            const PathArgument &a5 = PathArgument() );
-
-      const Value &resolve( const Value &root ) const;
-      Value resolve( const Value &root, 
-                     const Value &defaultValue ) const;
-      /// Creates the "path" to access the specified node and returns a reference on the node.
-      Value &make( Value &root ) const;
-
-   private:
-      typedef std::vector<const PathArgument *> InArgs;
-      typedef std::vector<PathArgument> Args;
-
-      void makePath( const std::string &path,
-                     const InArgs &in );
-      void addPathInArg( const std::string &path, 
-                         const InArgs &in, 
-                         InArgs::const_iterator &itInArg, 
-                         PathArgument::Kind kind );
-      void invalidPath( const std::string &path, 
-                        int location );
-
-      Args args_;
-   };
-
-   /** @brief Experimental do not use: Allocator to customize member name and string value memory management done by Value.
-    *
-    * - makeMemberName() and releaseMemberName() are called to respectively duplicate and
-    *   free an Json::objectValue member name.
-    * - duplicateStringValue() and releaseStringValue() are called similarly to
-    *   duplicate and free a Json::stringValue value.
-    */
-   class ValueAllocator
-   {
-   public:
-      enum { unknown = (unsigned)-1 };
-
-      virtual ~ValueAllocator();
-
-      virtual char *makeMemberName( const char *memberName ) = 0;
-      virtual void releaseMemberName( char *memberName ) = 0;
-      virtual char *duplicateStringValue( const char *value, 
-                                          unsigned int length = unknown ) = 0;
-      virtual void releaseStringValue( char *value ) = 0;
-   };
-
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-   /** @brief Allocator to customize Value internal map.
-    * Below is an example of a simple implementation (default implementation actually
-    * use memory pool for speed).
-    * \code
-      class DefaultValueMapAllocator : public ValueMapAllocator
-      {
-      public: // overridden from ValueMapAllocator
-         virtual ValueInternalMap *newMap()
-         {
-            return new ValueInternalMap();
-         }
-
-         virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
-         {
-            return new ValueInternalMap( other );
-         }
-
-         virtual void destructMap( ValueInternalMap *map )
-         {
-            delete map;
-         }
-
-         virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
-         {
-            return new ValueInternalLink[size];
-         }
-
-         virtual void releaseMapBuckets( ValueInternalLink *links )
-         {
-            delete [] links;
-         }
-
-         virtual ValueInternalLink *allocateMapLink()
-         {
-            return new ValueInternalLink();
-         }
-
-         virtual void releaseMapLink( ValueInternalLink *link )
-         {
-            delete link;
-         }
-      };
-    * \endcode
-    */ 
-   class JSON_API ValueMapAllocator
-   {
-   public:
-      virtual ~ValueMapAllocator();
-      virtual ValueInternalMap *newMap() = 0;
-      virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other ) = 0;
-      virtual void destructMap( ValueInternalMap *map ) = 0;
-      virtual ValueInternalLink *allocateMapBuckets( unsigned int size ) = 0;
-      virtual void releaseMapBuckets( ValueInternalLink *links ) = 0;
-      virtual ValueInternalLink *allocateMapLink() = 0;
-      virtual void releaseMapLink( ValueInternalLink *link ) = 0;
-   };
-
-   /** @brief ValueInternalMap hash-map bucket chain link (for internal use only).
-    * \internal previous_ & next_ allows for bidirectional traversal.
-    */
-   class JSON_API ValueInternalLink
-   {
-   public:
-      enum { itemPerLink = 6 };  // sizeof(ValueInternalLink) = 128 on 32 bits architecture.
-      enum InternalFlags { 
-         flagAvailable = 0,
-         flagUsed = 1
-      };
-
-      ValueInternalLink();
-
-      ~ValueInternalLink();
-
-      Value items_[itemPerLink];
-      char *keys_[itemPerLink];
-      ValueInternalLink *previous_;
-      ValueInternalLink *next_;
-   };
-
-
-   /** @brief A linked page based hash-table implementation used internally by Value.
-    * \internal ValueInternalMap is a tradional bucket based hash-table, with a linked
-    * list in each bucket to handle collision. There is an addional twist in that
-    * each node of the collision linked list is a page containing a fixed amount of
-    * value. This provides a better compromise between memory usage and speed.
-    * 
-    * Each bucket is made up of a chained list of ValueInternalLink. The last
-    * link of a given bucket can be found in the 'previous_' field of the following bucket.
-    * The last link of the last bucket is stored in tailLink_ as it has no following bucket.
-    * Only the last link of a bucket may contains 'available' item. The last link always
-    * contains at least one element unless is it the bucket one very first link.
-    */
-   class JSON_API ValueInternalMap
-   {
-      friend class ValueIteratorBase;
-      friend class Value;
-   public:
-      typedef unsigned int HashKey;
-      typedef unsigned int BucketIndex;
-
-# ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-      struct IteratorState
-      {
-         IteratorState() 
-            : map_(0)
-            , link_(0)
-            , itemIndex_(0)
-            , bucketIndex_(0) 
-         {
-         }
-         ValueInternalMap *map_;
-         ValueInternalLink *link_;
-         BucketIndex itemIndex_;
-         BucketIndex bucketIndex_;
-      };
-# endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-      ValueInternalMap();
-      ValueInternalMap( const ValueInternalMap &other );
-      ValueInternalMap &operator =( const ValueInternalMap &other );
-      ~ValueInternalMap();
-
-      void swap( ValueInternalMap &other );
-
-      BucketIndex size() const;
-
-      void clear();
-
-      bool reserveDelta( BucketIndex growth );
-
-      bool reserve( BucketIndex newItemCount );
-
-      const Value *find( const char *key ) const;
-
-      Value *find( const char *key );
-
-      Value &resolveReference( const char *key, 
-                               bool isStatic );
-
-      void remove( const char *key );
-
-      void doActualRemove( ValueInternalLink *link, 
-                           BucketIndex index,
-                           BucketIndex bucketIndex );
-
-      ValueInternalLink *&getLastLinkInBucket( BucketIndex bucketIndex );
-
-      Value &setNewItem( const char *key, 
-                         bool isStatic, 
-                         ValueInternalLink *link, 
-                         BucketIndex index );
-
-      Value &unsafeAdd( const char *key, 
-                        bool isStatic, 
-                        HashKey hashedKey );
-
-      HashKey hash( const char *key ) const;
-
-      int compare( const ValueInternalMap &other ) const;
-
-   private:
-      void makeBeginIterator( IteratorState &it ) const;
-      void makeEndIterator( IteratorState &it ) const;
-      static bool equals( const IteratorState &x, const IteratorState &other );
-      static void increment( IteratorState &iterator );
-      static void incrementBucket( IteratorState &iterator );
-      static void decrement( IteratorState &iterator );
-      static const char *key( const IteratorState &iterator );
-      static const char *key( const IteratorState &iterator, bool &isStatic );
-      static Value &value( const IteratorState &iterator );
-      static int distance( const IteratorState &x, const IteratorState &y );
-
-   private:
-      ValueInternalLink *buckets_;
-      ValueInternalLink *tailLink_;
-      BucketIndex bucketsSize_;
-      BucketIndex itemCount_;
-   };
-
-   /** @brief A simplified deque implementation used internally by Value.
-   * \internal
-   * It is based on a list of fixed "page", each page contains a fixed number of items.
-   * Instead of using a linked-list, a array of pointer is used for fast item look-up.
-   * Look-up for an element is as follow:
-   * - compute page index: pageIndex = itemIndex / itemsPerPage
-   * - look-up item in page: pages_[pageIndex][itemIndex % itemsPerPage]
-   *
-   * Insertion is amortized constant time (only the array containing the index of pointers
-   * need to be reallocated when items are appended).
-   */
-   class JSON_API ValueInternalArray
-   {
-      friend class Value;
-      friend class ValueIteratorBase;
-   public:
-      enum { itemsPerPage = 8 };    // should be a power of 2 for fast divide and modulo.
-      typedef Value::ArrayIndex ArrayIndex;
-      typedef unsigned int PageIndex;
-
-# ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-      struct IteratorState // Must be a POD
-      {
-         IteratorState() 
-            : array_(0)
-            , currentPageIndex_(0)
-            , currentItemIndex_(0) 
-         {
-         }
-         ValueInternalArray *array_;
-         Value **currentPageIndex_;
-         unsigned int currentItemIndex_;
-      };
-# endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-      ValueInternalArray();
-      ValueInternalArray( const ValueInternalArray &other );
-      ValueInternalArray &operator =( const ValueInternalArray &other );
-      ~ValueInternalArray();
-      void swap( ValueInternalArray &other );
-
-      void clear();
-      void resize( ArrayIndex newSize );
-
-      Value &resolveReference( ArrayIndex index );
-
-      Value *find( ArrayIndex index ) const;
-
-      ArrayIndex size() const;
-
-      int compare( const ValueInternalArray &other ) const;
-
-   private:
-      static bool equals( const IteratorState &x, const IteratorState &other );
-      static void increment( IteratorState &iterator );
-      static void decrement( IteratorState &iterator );
-      static Value &dereference( const IteratorState &iterator );
-      static Value &unsafeDereference( const IteratorState &iterator );
-      static int distance( const IteratorState &x, const IteratorState &y );
-      static ArrayIndex indexOf( const IteratorState &iterator );
-      void makeBeginIterator( IteratorState &it ) const;
-      void makeEndIterator( IteratorState &it ) const;
-      void makeIterator( IteratorState &it, ArrayIndex index ) const;
-
-      void makeIndexValid( ArrayIndex index );
-
-      Value **pages_;
-      ArrayIndex size_;
-      PageIndex pageCount_;
-   };