Merge pull request #17 from natano/itgm-update-jsoncpp

Update jsoncpp from version 0.5.0 to 1.9.5

src/JsonUtil.cpp

@@ -4,8 +4,7 @@
 #include "RageUtil.h"
 #include "RageLog.h"
 #include "arch/Dialog/Dialog.h"
-#include "json/reader.h"
-#include "json/writer.h"
+#include "json/json.h"
 
 bool JsonUtil::LoadFromString(Json::Value &root, RString sData, RString &sErrorOut)
 {
@@ -13,7 +12,7 @@ bool JsonUtil::LoadFromString(Json::Value &root, RString sData, RString &sErrorO
 	bool parsingSuccessful = reader.parse(sData, root);
 	if (!parsingSuccessful)
 	{
-		RString err = reader.getFormatedErrorMessages();
+		RString err = reader.getFormattedErrorMessages();
 		LOG->Warn("JSON: LoadFromFileShowErrors failed: %s", err.c_str());
 		return false;
 	}

src/JsonUtil.h

@@ -3,7 +3,7 @@
 #define JsonUtil_H
 
 class RageFileBasic;
-#include "json/value.h"
+#include "json/json.h"
 
 namespace JsonUtil
 {

src/Makefile.am

@@ -501,17 +501,7 @@ Lua = ../extern/lua-5.1/src/lapi.c ../extern/lua-5.1/src/lauxlib.c ../extern/lua
 ../extern/lua-5.1/src/lstring.h ../extern/lua-5.1/src/ltable.h ../extern/lua-5.1/src/ltm.h ../extern/lua-5.1/src/luaconf.h ../extern/lua-5.1/src/lua.h ../extern/lua-5.1/src/lualib.h \
 ../extern/lua-5.1/src/lundump.h ../extern/lua-5.1/src/lvm.h ../extern/lua-5.1/src/lzio.h
 
-jsoncpp = ../extern/jsoncpp/src/lib_json/json_reader.cpp \
-../extern/jsoncpp/src/lib_json/json_value.cpp \
-../extern/jsoncpp/src/lib_json/json_writer.cpp \
-../extern/jsoncpp/include/json/autolink.h \
-../extern/jsoncpp/include/json/config.h \
-../extern/jsoncpp/include/json/features.h \
-../extern/jsoncpp/include/json/forwards.h \
-../extern/jsoncpp/include/json/json.h \
-../extern/jsoncpp/include/json/reader.h \
-../extern/jsoncpp/include/json/value.h \
-../extern/jsoncpp/include/json/writer.h
+jsoncpp = ../extern/jsoncpp/jsoncpp.cpp
 
 RageFile = \
 RageFileBasic.cpp RageFileBasic.h \
@@ -722,7 +712,7 @@ noinst_LIBRARIES += libtomcrypt.a
 
 main_CPPFLAGS = \
 	$(VIDEO_CFLAGS) \
-	-I$(top_srcdir)/extern/jsoncpp/include
+	-I$(top_srcdir)/extern/jsoncpp
 #-I$(top_srcdir)/extern/glew-1.5.8/include
 
 main_SOURCES = $(Screens) \

src/NotesLoaderJson.cpp

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "NotesLoaderJson.h"
-#include "json/value.h"
+#include "json/json.h"
 #include "TimingData.h"
 #include "RageUtil.h"
 #include "JsonUtil.h"

src/NotesWriterJson.cpp

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "NotesWriterJson.h"
 #include "TimingData.h"
-#include "json/value.h"
+#include "json/json.h"
 #include "JsonUtil.h"
 #include "Song.h"
 #include "BackgroundUtil.h"

src/RageUtil.cpp

@@ -2582,7 +2582,7 @@ int LuaFunc_JsonEncode(lua_State* L)
 				Json::Value array(Json::arrayValue);
 				array.resize(len);
 
-				for (size_t i = 0; i < len; i++)
+				for (int i = 0; i < len; i++)
 				{
 					lua_rawgeti(L, index, i + 1);
 					array[i] = convert(-1);
@@ -2662,7 +2662,7 @@ int LuaFunc_JsonDecode(lua_State* L)
 	bool ok = reader.parse(std::string(data, datalen), root, true);
 	if (!ok)
 	{
-		std::string error = reader.getFormatedErrorMessages();
+		std::string error = reader.getFormattedErrorMessages();
 		luaL_error(L, "failed to parse JSON: %s", error.c_str());
 	}
 

src/ScreenInstallOverlay.cpp

@@ -5,7 +5,7 @@
 #include "Preference.h"
 #include "RageLog.h"
 #include "FileDownload.h"
-#include "json/value.h"
+#include "json/json.h"
 #include "JsonUtil.h"
 #include "SpecialFiles.h"
 class Song;