From 62202ed10617927d5429bc59898e12a366abe744 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Wed, 6 Dec 2017 13:00:20 +0300 Subject: convert all files exept curl and new_gpg to utf-8 BOM --- libs/libjson/CMakeLists.txt | 2 +- libs/libjson/src/JSONChildren.cpp | 2 +- libs/libjson/src/JSONChildren.h | 2 +- libs/libjson/src/JSONDebug.cpp | 2 +- libs/libjson/src/JSONDebug.h | 2 +- libs/libjson/src/JSONDefs.h | 2 +- libs/libjson/src/JSONIterators.cpp | 2 +- libs/libjson/src/JSONMemory.cpp | 2 +- libs/libjson/src/JSONMemory.h | 2 +- libs/libjson/src/JSONNode.cpp | 2 +- libs/libjson/src/JSONNode.h | 2 +- libs/libjson/src/JSONNode.inl | 2 +- libs/libjson/src/JSONNode_Mutex.cpp | 2 +- libs/libjson/src/JSONOptions.h | 2 +- libs/libjson/src/JSONWorker.cpp | 2 +- libs/libjson/src/JSONWorker.h | 2 +- libs/libjson/src/JSONWriter.cpp | 2 +- libs/libjson/src/NumberToString.h | 2 +- libs/libjson/src/internalJSONNode.cpp | 2 +- libs/libjson/src/internalJSONNode.h | 2 +- libs/libjson/src/libJSON.cpp | 2 +- libs/libjson/src/libjson.def | 2 +- libs/libjson/src/libjson64.def | 2 +- libs/libjson/src/stdafx.cxx | 2 +- libs/libjson/src/stdafx.h | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) (limited to 'libs/libjson') diff --git a/libs/libjson/CMakeLists.txt b/libs/libjson/CMakeLists.txt index 62b68e2eb2..1abc7d4652 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 33174ef5b4..9fe972b95d 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 ce697ffd77..dc9194dd41 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 54107dbe6b..7bf2a2cd1f 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 ff1cedf8fc..40f41cd9dd 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 dbd325b342..ef6ba068f5 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 ec7ef5e582..3872ee7333 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 0a025bbc88..1907f73521 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 32e8c3f4ef..8ecf52c37d 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 //for malloc, realloc, and free diff --git a/libs/libjson/src/JSONNode.cpp b/libs/libjson/src/JSONNode.cpp index 222125f0f8..9fa7d0b009 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 8c48d24dbe..f018d5d280 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 48c1b9ec4f..0b08a7d4df 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 24919381a6..ede2e4190b 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 453d37c4e2..92fdc18ef9 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 517b193272..ef34f17b78 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 88c61f6b2d..4164c1df2e 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 2e07f5b1c7..0d7819a754 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 a706372f92..08e8f1f018 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 57d721ec64..bf93d17782 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 26e279764e..fe61ec6ad7 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 7cf7fb9075..f883cd086f 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 9d8b63ec49..2fb8abc7c2 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 1e501cba21..d54dda7512 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 6f97ed9a4e..f2abe4d94b 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 79bf24a0dc..3098200e5f 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* -- cgit v1.2.3