summaryrefslogtreecommitdiff
path: root/protocols/Discord
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 /protocols/Discord
parent87c39b86cfeb0dedf94f9bf04af30de2daf368bc (diff)
convert all files exept curl and new_gpg to utf-8 BOM (reverted from commit 62202ed10617927d5429bc59898e12a366abe744)
Diffstat (limited to 'protocols/Discord')
-rw-r--r--protocols/Discord/CMakeLists.txt2
-rw-r--r--protocols/Discord/proto_discord/CMakeLists.txt2
-rw-r--r--protocols/Discord/proto_discord/src/resource.h2
-rw-r--r--protocols/Discord/src/avatars.cpp2
-rw-r--r--protocols/Discord/src/connection.cpp2
-rw-r--r--protocols/Discord/src/dispatch.cpp2
-rw-r--r--protocols/Discord/src/gateway.cpp2
-rw-r--r--protocols/Discord/src/groupchat.cpp2
-rw-r--r--protocols/Discord/src/guilds.cpp2
-rw-r--r--protocols/Discord/src/http.cpp2
-rw-r--r--protocols/Discord/src/main.cpp2
-rw-r--r--protocols/Discord/src/menus.cpp2
-rw-r--r--protocols/Discord/src/options.cpp2
-rw-r--r--protocols/Discord/src/proto.cpp2
-rw-r--r--protocols/Discord/src/proto.h2
-rw-r--r--protocols/Discord/src/resource.h2
-rw-r--r--protocols/Discord/src/server.cpp2
-rw-r--r--protocols/Discord/src/stdafx.cxx2
-rw-r--r--protocols/Discord/src/stdafx.h2
-rw-r--r--protocols/Discord/src/utils.cpp2
-rw-r--r--protocols/Discord/src/version.h2
21 files changed, 21 insertions, 21 deletions
diff --git a/protocols/Discord/CMakeLists.txt b/protocols/Discord/CMakeLists.txt
index 47735cea72..a227eff6df 100644
--- a/protocols/Discord/CMakeLists.txt
+++ b/protocols/Discord/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB SOURCES "src/*.h" "src/*.cpp" "res/*.rc")
+file(GLOB SOURCES "src/*.h" "src/*.cpp" "res/*.rc")
set(TARGET Discord)
include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake)
target_link_libraries(${TARGET} Zlib libjson)
diff --git a/protocols/Discord/proto_discord/CMakeLists.txt b/protocols/Discord/proto_discord/CMakeLists.txt
index 4a05c37c2a..5ea6891fa1 100644
--- a/protocols/Discord/proto_discord/CMakeLists.txt
+++ b/protocols/Discord/proto_discord/CMakeLists.txt
@@ -1,2 +1,2 @@
-set(TARGET Proto_Discord)
+set(TARGET Proto_Discord)
include(${CMAKE_SOURCE_DIR}/cmake/icons.cmake) \ No newline at end of file
diff --git a/protocols/Discord/proto_discord/src/resource.h b/protocols/Discord/proto_discord/src/resource.h
index 3854c946cf..c74e04f59e 100644
--- a/protocols/Discord/proto_discord/src/resource.h
+++ b/protocols/Discord/proto_discord/src/resource.h
@@ -1,4 +1,4 @@
-//{{NO_DEPENDENCIES}}
+//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by Proto_ICQ.rc
//
diff --git a/protocols/Discord/src/avatars.cpp b/protocols/Discord/src/avatars.cpp
index 6d457a4149..d2b629e442 100644
--- a/protocols/Discord/src/avatars.cpp
+++ b/protocols/Discord/src/avatars.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/connection.cpp b/protocols/Discord/src/connection.cpp
index 4fb22432bb..5d8f9677e2 100644
--- a/protocols/Discord/src/connection.cpp
+++ b/protocols/Discord/src/connection.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/dispatch.cpp b/protocols/Discord/src/dispatch.cpp
index efef1a9829..025eeff0dd 100644
--- a/protocols/Discord/src/dispatch.cpp
+++ b/protocols/Discord/src/dispatch.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/gateway.cpp b/protocols/Discord/src/gateway.cpp
index 76ee03d0a9..0f59b9382e 100644
--- a/protocols/Discord/src/gateway.cpp
+++ b/protocols/Discord/src/gateway.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/groupchat.cpp b/protocols/Discord/src/groupchat.cpp
index 04c451a5eb..6bf5735879 100644
--- a/protocols/Discord/src/groupchat.cpp
+++ b/protocols/Discord/src/groupchat.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/guilds.cpp b/protocols/Discord/src/guilds.cpp
index 5b8b2e78e4..9589494962 100644
--- a/protocols/Discord/src/guilds.cpp
+++ b/protocols/Discord/src/guilds.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/http.cpp b/protocols/Discord/src/http.cpp
index 95e6b7aae2..26154f3ff6 100644
--- a/protocols/Discord/src/http.cpp
+++ b/protocols/Discord/src/http.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/main.cpp b/protocols/Discord/src/main.cpp
index f25361d8ae..808354befb 100644
--- a/protocols/Discord/src/main.cpp
+++ b/protocols/Discord/src/main.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/menus.cpp b/protocols/Discord/src/menus.cpp
index ef84482532..ee43464e16 100644
--- a/protocols/Discord/src/menus.cpp
+++ b/protocols/Discord/src/menus.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/options.cpp b/protocols/Discord/src/options.cpp
index f6e28ad941..f335f2aa91 100644
--- a/protocols/Discord/src/options.cpp
+++ b/protocols/Discord/src/options.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp
index 4bbf0a57a1..e937ade657 100644
--- a/protocols/Discord/src/proto.cpp
+++ b/protocols/Discord/src/proto.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/proto.h b/protocols/Discord/src/proto.h
index 08c7876be5..56c04ef157 100644
--- a/protocols/Discord/src/proto.h
+++ b/protocols/Discord/src/proto.h
@@ -1,4 +1,4 @@
-
+
typedef __int64 SnowFlake;
__forceinline int compareInt64(const SnowFlake i1, const SnowFlake i2)
diff --git a/protocols/Discord/src/resource.h b/protocols/Discord/src/resource.h
index 258cb1dba1..e73ee518ec 100644
--- a/protocols/Discord/src/resource.h
+++ b/protocols/Discord/src/resource.h
@@ -1,4 +1,4 @@
-//{{NO_DEPENDENCIES}}
+//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by w:\miranda-ng\protocols\Discord\res\discord.rc
//
diff --git a/protocols/Discord/src/server.cpp b/protocols/Discord/src/server.cpp
index 39bfb23e97..49eceea8a1 100644
--- a/protocols/Discord/src/server.cpp
+++ b/protocols/Discord/src/server.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/stdafx.cxx b/protocols/Discord/src/stdafx.cxx
index fcd6ada028..1643cbea3a 100644
--- a/protocols/Discord/src/stdafx.cxx
+++ b/protocols/Discord/src/stdafx.cxx
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/stdafx.h b/protocols/Discord/src/stdafx.h
index ae1483590e..12b741fa85 100644
--- a/protocols/Discord/src/stdafx.h
+++ b/protocols/Discord/src/stdafx.h
@@ -1,4 +1,4 @@
-// stdafx.h : include file for standard system include files,
+// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, but
// are changed infrequently
//
diff --git a/protocols/Discord/src/utils.cpp b/protocols/Discord/src/utils.cpp
index 685a0a9f36..2c0b254930 100644
--- a/protocols/Discord/src/utils.cpp
+++ b/protocols/Discord/src/utils.cpp
@@ -1,4 +1,4 @@
-/*
+/*
Copyright © 2016-17 Miranda NG team
This program is free software: you can redistribute it and/or modify
diff --git a/protocols/Discord/src/version.h b/protocols/Discord/src/version.h
index f7d9b1f955..2389a715d1 100644
--- a/protocols/Discord/src/version.h
+++ b/protocols/Discord/src/version.h
@@ -1,4 +1,4 @@
-#define __MAJOR_VERSION 0
+#define __MAJOR_VERSION 0
#define __MINOR_VERSION 5
#define __RELEASE_NUM 1
#define __BUILD_NUM 2