summaryrefslogtreecommitdiff
path: root/libs/libjson
diff options
context:
space:
mode:
authorKirill Volinsky <Mataes2007@gmail.com>2017-12-06 14:15:09 +0300
committerKirill Volinsky <Mataes2007@gmail.com>2017-12-06 14:15:09 +0300
commita27079fe5c4a210664515c47767c00112c435d65 (patch)
tree39e36b58b4138af46e2f10661de352482b89399d /libs/libjson
parent87c39b86cfeb0dedf94f9bf04af30de2daf368bc (diff)
convert all files exept curl and new_gpg to utf-8 BOM (reverted from commit 62202ed10617927d5429bc59898e12a366abe744)
Diffstat (limited to 'libs/libjson')
-rw-r--r--libs/libjson/CMakeLists.txt2
-rw-r--r--libs/libjson/src/JSONChildren.cpp2
-rw-r--r--libs/libjson/src/JSONChildren.h2
-rw-r--r--libs/libjson/src/JSONDebug.cpp2
-rw-r--r--libs/libjson/src/JSONDebug.h2
-rw-r--r--libs/libjson/src/JSONDefs.h2
-rw-r--r--libs/libjson/src/JSONIterators.cpp2
-rw-r--r--libs/libjson/src/JSONMemory.cpp2
-rw-r--r--libs/libjson/src/JSONMemory.h2
-rw-r--r--libs/libjson/src/JSONNode.cpp2
-rw-r--r--libs/libjson/src/JSONNode.h2
-rw-r--r--libs/libjson/src/JSONNode.inl2
-rw-r--r--libs/libjson/src/JSONNode_Mutex.cpp2
-rw-r--r--libs/libjson/src/JSONOptions.h2
-rw-r--r--libs/libjson/src/JSONWorker.cpp2
-rw-r--r--libs/libjson/src/JSONWorker.h2
-rw-r--r--libs/libjson/src/JSONWriter.cpp2
-rw-r--r--libs/libjson/src/NumberToString.h2
-rw-r--r--libs/libjson/src/internalJSONNode.cpp2
-rw-r--r--libs/libjson/src/internalJSONNode.h2
-rw-r--r--libs/libjson/src/libJSON.cpp2
-rw-r--r--libs/libjson/src/libjson.def2
-rw-r--r--libs/libjson/src/libjson64.def2
-rw-r--r--libs/libjson/src/stdafx.cxx2
-rw-r--r--libs/libjson/src/stdafx.h2
25 files changed, 25 insertions, 25 deletions
diff --git a/libs/libjson/CMakeLists.txt b/libs/libjson/CMakeLists.txt
index 1abc7d4652..62b68e2eb2 100644
--- a/libs/libjson/CMakeLists.txt
+++ b/libs/libjson/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB SOURCES "src/*.h" "src/*.cpp")
+file(GLOB SOURCES "src/*.h" "src/*.cpp")
if(CMAKE_CL_64)
list(APPEND SOURCES "src/libjson64.def")
else()
diff --git a/libs/libjson/src/JSONChildren.cpp b/libs/libjson/src/JSONChildren.cpp
index 9fe972b95d..33174ef5b4 100644
--- a/libs/libjson/src/JSONChildren.cpp
+++ b/libs/libjson/src/JSONChildren.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Miranda NG: the free IM client for Microsoft* Windows*
diff --git a/libs/libjson/src/JSONChildren.h b/libs/libjson/src/JSONChildren.h
index dc9194dd41..ce697ffd77 100644
--- a/libs/libjson/src/JSONChildren.h
+++ b/libs/libjson/src/JSONChildren.h
@@ -1,4 +1,4 @@
-#ifndef JSONCHILDREN_H
+#ifndef JSONCHILDREN_H
#define JSONCHILDREN_H
#include "JSONMemory.h"
diff --git a/libs/libjson/src/JSONDebug.cpp b/libs/libjson/src/JSONDebug.cpp
index 7bf2a2cd1f..54107dbe6b 100644
--- a/libs/libjson/src/JSONDebug.cpp
+++ b/libs/libjson/src/JSONDebug.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Miranda NG: the free IM client for Microsoft* Windows*
diff --git a/libs/libjson/src/JSONDebug.h b/libs/libjson/src/JSONDebug.h
index 40f41cd9dd..ff1cedf8fc 100644
--- a/libs/libjson/src/JSONDebug.h
+++ b/libs/libjson/src/JSONDebug.h
@@ -1,4 +1,4 @@
-#ifndef JSON_DEBUG_H
+#ifndef JSON_DEBUG_H
#define JSON_DEBUG_H
#include "JSONDefs.h"
diff --git a/libs/libjson/src/JSONDefs.h b/libs/libjson/src/JSONDefs.h
index ef6ba068f5..dbd325b342 100644
--- a/libs/libjson/src/JSONDefs.h
+++ b/libs/libjson/src/JSONDefs.h
@@ -1,4 +1,4 @@
-#ifndef JSONDEFS_H
+#ifndef JSONDEFS_H
#define JSONDEFS_H
/*
diff --git a/libs/libjson/src/JSONIterators.cpp b/libs/libjson/src/JSONIterators.cpp
index 3872ee7333..ec7ef5e582 100644
--- a/libs/libjson/src/JSONIterators.cpp
+++ b/libs/libjson/src/JSONIterators.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Miranda NG: the free IM client for Microsoft* Windows*
diff --git a/libs/libjson/src/JSONMemory.cpp b/libs/libjson/src/JSONMemory.cpp
index 1907f73521..0a025bbc88 100644
--- a/libs/libjson/src/JSONMemory.cpp
+++ b/libs/libjson/src/JSONMemory.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Miranda NG: the free IM client for Microsoft* Windows*
diff --git a/libs/libjson/src/JSONMemory.h b/libs/libjson/src/JSONMemory.h
index 8ecf52c37d..32e8c3f4ef 100644
--- a/libs/libjson/src/JSONMemory.h
+++ b/libs/libjson/src/JSONMemory.h
@@ -1,4 +1,4 @@
-#ifndef JSON_MEMORY_H
+#ifndef JSON_MEMORY_H
#define JSON_MEMORY_H
#include <cstdlib> //for malloc, realloc, and free
diff --git a/libs/libjson/src/JSONNode.cpp b/libs/libjson/src/JSONNode.cpp
index 9fa7d0b009..222125f0f8 100644
--- a/libs/libjson/src/JSONNode.cpp
+++ b/libs/libjson/src/JSONNode.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Miranda NG: the free IM client for Microsoft* Windows*
diff --git a/libs/libjson/src/JSONNode.h b/libs/libjson/src/JSONNode.h
index f018d5d280..8c48d24dbe 100644
--- a/libs/libjson/src/JSONNode.h
+++ b/libs/libjson/src/JSONNode.h
@@ -1,4 +1,4 @@
-#ifndef JSONNODE_H
+#ifndef JSONNODE_H
#define JSONNODE_H
#include "JSONDefs.h" //for string type
diff --git a/libs/libjson/src/JSONNode.inl b/libs/libjson/src/JSONNode.inl
index 0b08a7d4df..48c1b9ec4f 100644
--- a/libs/libjson/src/JSONNode.inl
+++ b/libs/libjson/src/JSONNode.inl
@@ -1,4 +1,4 @@
-#include "internalJSONNode.h" //internal structure for json value
+#include "internalJSONNode.h" //internal structure for json value
#ifdef JSON_BINARY
#include "JSON_Base64.h"
diff --git a/libs/libjson/src/JSONNode_Mutex.cpp b/libs/libjson/src/JSONNode_Mutex.cpp
index ede2e4190b..24919381a6 100644
--- a/libs/libjson/src/JSONNode_Mutex.cpp
+++ b/libs/libjson/src/JSONNode_Mutex.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Miranda NG: the free IM client for Microsoft* Windows*
diff --git a/libs/libjson/src/JSONOptions.h b/libs/libjson/src/JSONOptions.h
index 92fdc18ef9..453d37c4e2 100644
--- a/libs/libjson/src/JSONOptions.h
+++ b/libs/libjson/src/JSONOptions.h
@@ -1,4 +1,4 @@
-#ifndef JSON_OPTIONS_H
+#ifndef JSON_OPTIONS_H
#define JSON_OPTIONS_H
/**
diff --git a/libs/libjson/src/JSONWorker.cpp b/libs/libjson/src/JSONWorker.cpp
index ef34f17b78..517b193272 100644
--- a/libs/libjson/src/JSONWorker.cpp
+++ b/libs/libjson/src/JSONWorker.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Miranda NG: the free IM client for Microsoft* Windows*
diff --git a/libs/libjson/src/JSONWorker.h b/libs/libjson/src/JSONWorker.h
index 4164c1df2e..88c61f6b2d 100644
--- a/libs/libjson/src/JSONWorker.h
+++ b/libs/libjson/src/JSONWorker.h
@@ -1,4 +1,4 @@
-#ifndef JSON_WORKER_H
+#ifndef JSON_WORKER_H
#define JSON_WORKER_H
class LIBJSON_EXPORT JSONWorker
diff --git a/libs/libjson/src/JSONWriter.cpp b/libs/libjson/src/JSONWriter.cpp
index 0d7819a754..2e07f5b1c7 100644
--- a/libs/libjson/src/JSONWriter.cpp
+++ b/libs/libjson/src/JSONWriter.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Miranda NG: the free IM client for Microsoft* Windows*
diff --git a/libs/libjson/src/NumberToString.h b/libs/libjson/src/NumberToString.h
index 08e8f1f018..a706372f92 100644
--- a/libs/libjson/src/NumberToString.h
+++ b/libs/libjson/src/NumberToString.h
@@ -1,4 +1,4 @@
-#ifndef NUMBERTOSTRING_H
+#ifndef NUMBERTOSTRING_H
#define NUMBERTOSTRING_H
#include "JSONDebug.h"
diff --git a/libs/libjson/src/internalJSONNode.cpp b/libs/libjson/src/internalJSONNode.cpp
index bf93d17782..57d721ec64 100644
--- a/libs/libjson/src/internalJSONNode.cpp
+++ b/libs/libjson/src/internalJSONNode.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Miranda NG: the free IM client for Microsoft* Windows*
diff --git a/libs/libjson/src/internalJSONNode.h b/libs/libjson/src/internalJSONNode.h
index fe61ec6ad7..26e279764e 100644
--- a/libs/libjson/src/internalJSONNode.h
+++ b/libs/libjson/src/internalJSONNode.h
@@ -1,4 +1,4 @@
-#ifndef INTERNAL_JSONNODE_H
+#ifndef INTERNAL_JSONNODE_H
#define INTERNAL_JSONNODE_H
#include "JSONChildren.h"
diff --git a/libs/libjson/src/libJSON.cpp b/libs/libjson/src/libJSON.cpp
index f883cd086f..7cf7fb9075 100644
--- a/libs/libjson/src/libJSON.cpp
+++ b/libs/libjson/src/libJSON.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Miranda NG: the free IM client for Microsoft* Windows*
diff --git a/libs/libjson/src/libjson.def b/libs/libjson/src/libjson.def
index 2fb8abc7c2..9d8b63ec49 100644
--- a/libs/libjson/src/libjson.def
+++ b/libs/libjson/src/libjson.def
@@ -1,4 +1,4 @@
-LIBRARY libjson.mir
+LIBRARY libjson.mir
EXPORTS
??0JSONNode@@AAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z @1 NONAME
diff --git a/libs/libjson/src/libjson64.def b/libs/libjson/src/libjson64.def
index d54dda7512..1e501cba21 100644
--- a/libs/libjson/src/libjson64.def
+++ b/libs/libjson/src/libjson64.def
@@ -1,4 +1,4 @@
-LIBRARY libjson.mir
+LIBRARY libjson.mir
EXPORTS
??0JSONNode@@AEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z @1 NONAME
diff --git a/libs/libjson/src/stdafx.cxx b/libs/libjson/src/stdafx.cxx
index f2abe4d94b..6f97ed9a4e 100644
--- a/libs/libjson/src/stdafx.cxx
+++ b/libs/libjson/src/stdafx.cxx
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 2012-17 Miranda NG team (https://miranda-ng.org)
diff --git a/libs/libjson/src/stdafx.h b/libs/libjson/src/stdafx.h
index 3098200e5f..79bf24a0dc 100644
--- a/libs/libjson/src/stdafx.h
+++ b/libs/libjson/src/stdafx.h
@@ -1,4 +1,4 @@
-/*
+/*
Miranda NG: the free IM client for Microsoft* Windows*