From a27079fe5c4a210664515c47767c00112c435d65 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Wed, 6 Dec 2017 14:15:09 +0300 Subject: convert all files exept curl and new_gpg to utf-8 BOM (reverted from commit 62202ed10617927d5429bc59898e12a366abe744) --- protocols/Tox/src/api_av.cpp | 2 +- protocols/Tox/src/api_avatars.cpp | 2 +- protocols/Tox/src/api_connection.cpp | 2 +- protocols/Tox/src/api_dns.cpp | 2 +- protocols/Tox/src/api_encryption.cpp | 2 +- protocols/Tox/src/api_friends.cpp | 2 +- protocols/Tox/src/api_groupchats.cpp | 2 +- protocols/Tox/src/api_main.cpp | 2 +- protocols/Tox/src/api_transfer.cpp | 2 +- protocols/Tox/src/http_request.h | 2 +- protocols/Tox/src/main.cpp | 2 +- protocols/Tox/src/resource.h | 2 +- protocols/Tox/src/stdafx.cxx | 2 +- protocols/Tox/src/stdafx.h | 2 +- protocols/Tox/src/tox_accounts.cpp | 2 +- protocols/Tox/src/tox_address.h | 2 +- protocols/Tox/src/tox_avatars.cpp | 2 +- protocols/Tox/src/tox_bootstrap.cpp | 2 +- protocols/Tox/src/tox_chatrooms.cpp | 2 +- protocols/Tox/src/tox_chatrooms.h | 2 +- protocols/Tox/src/tox_connection.cpp | 2 +- protocols/Tox/src/tox_contacts.cpp | 2 +- protocols/Tox/src/tox_core.cpp | 2 +- protocols/Tox/src/tox_dialogs.h | 2 +- protocols/Tox/src/tox_events.cpp | 2 +- protocols/Tox/src/tox_icons.cpp | 2 +- protocols/Tox/src/tox_menus.cpp | 2 +- protocols/Tox/src/tox_menus.h | 2 +- protocols/Tox/src/tox_messages.cpp | 2 +- protocols/Tox/src/tox_multimedia.cpp | 2 +- protocols/Tox/src/tox_multimedia.h | 2 +- protocols/Tox/src/tox_netlib.cpp | 2 +- protocols/Tox/src/tox_options.cpp | 2 +- protocols/Tox/src/tox_options.h | 2 +- protocols/Tox/src/tox_profile.cpp | 2 +- protocols/Tox/src/tox_profile.h | 2 +- protocols/Tox/src/tox_proto.cpp | 2 +- protocols/Tox/src/tox_proto.h | 2 +- protocols/Tox/src/tox_search.cpp | 2 +- protocols/Tox/src/tox_services.cpp | 2 +- protocols/Tox/src/tox_thread.h | 2 +- protocols/Tox/src/tox_transfer.cpp | 2 +- protocols/Tox/src/tox_transfer.h | 2 +- protocols/Tox/src/tox_utils.cpp | 2 +- protocols/Tox/src/version.h | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) (limited to 'protocols/Tox/src') diff --git a/protocols/Tox/src/api_av.cpp b/protocols/Tox/src/api_av.cpp index bafc94b7dc..c46e549a35 100644 --- a/protocols/Tox/src/api_av.cpp +++ b/protocols/Tox/src/api_av.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* COMMON A/V FUNCTIONS */ diff --git a/protocols/Tox/src/api_avatars.cpp b/protocols/Tox/src/api_avatars.cpp index 452d20f3ab..658b835a68 100644 --- a/protocols/Tox/src/api_avatars.cpp +++ b/protocols/Tox/src/api_avatars.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* AVATAR FUNCTIONS */ diff --git a/protocols/Tox/src/api_connection.cpp b/protocols/Tox/src/api_connection.cpp index 5fbec0cad4..1ed6b51d40 100644 --- a/protocols/Tox/src/api_connection.cpp +++ b/protocols/Tox/src/api_connection.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* CONNECTION FUNCTIONS */ diff --git a/protocols/Tox/src/api_dns.cpp b/protocols/Tox/src/api_dns.cpp index 2aff585d45..57db01e57c 100644 --- a/protocols/Tox/src/api_dns.cpp +++ b/protocols/Tox/src/api_dns.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* DNS TOXID RESOILVING FUNCTIONS */ diff --git a/protocols/Tox/src/api_encryption.cpp b/protocols/Tox/src/api_encryption.cpp index 2e9568f28e..85e77c06ad 100644 --- a/protocols/Tox/src/api_encryption.cpp +++ b/protocols/Tox/src/api_encryption.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* ENCRYPTION FUNCTIONS */ diff --git a/protocols/Tox/src/api_friends.cpp b/protocols/Tox/src/api_friends.cpp index b831a57f99..caa133feb7 100644 --- a/protocols/Tox/src/api_friends.cpp +++ b/protocols/Tox/src/api_friends.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* FRIEND FUNCTIONS */ diff --git a/protocols/Tox/src/api_groupchats.cpp b/protocols/Tox/src/api_groupchats.cpp index 9c4047af82..9919eee92c 100644 --- a/protocols/Tox/src/api_groupchats.cpp +++ b/protocols/Tox/src/api_groupchats.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* GROUP CHAT FUNCTIONS: WARNING Group chats will be rewritten so this might change */ diff --git a/protocols/Tox/src/api_main.cpp b/protocols/Tox/src/api_main.cpp index f3fadd30e4..3d46576925 100644 --- a/protocols/Tox/src/api_main.cpp +++ b/protocols/Tox/src/api_main.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* MAIN FUNCTIONS */ diff --git a/protocols/Tox/src/api_transfer.cpp b/protocols/Tox/src/api_transfer.cpp index 40a63728c1..446a2ccc80 100644 --- a/protocols/Tox/src/api_transfer.cpp +++ b/protocols/Tox/src/api_transfer.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* FILE SENDING FUNCTIONS */ diff --git a/protocols/Tox/src/http_request.h b/protocols/Tox/src/http_request.h index ec27232cbd..18b8228f63 100644 --- a/protocols/Tox/src/http_request.h +++ b/protocols/Tox/src/http_request.h @@ -1,4 +1,4 @@ -#ifndef _HTTP_REQUEST_H_ +#ifndef _HTTP_REQUEST_H_ #define _HTTP_REQUEST_H_ class HttpRequestException diff --git a/protocols/Tox/src/main.cpp b/protocols/Tox/src/main.cpp index 2b2bf0d6fd..de5356a18a 100644 --- a/protocols/Tox/src/main.cpp +++ b/protocols/Tox/src/main.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" int hLangpack; CHAT_MANAGER *pci; diff --git a/protocols/Tox/src/resource.h b/protocols/Tox/src/resource.h index e9e6210e47..78d9fad660 100644 --- a/protocols/Tox/src/resource.h +++ b/protocols/Tox/src/resource.h @@ -1,4 +1,4 @@ -//{{NO_DEPENDENCIES}} +//{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by C:\Users\unsane\Projects\c++\miranda-ng\protocols\Tox\res\resource.rc // diff --git a/protocols/Tox/src/stdafx.cxx b/protocols/Tox/src/stdafx.cxx index bfd519e3dc..b05ed73bc5 100644 --- a/protocols/Tox/src/stdafx.cxx +++ b/protocols/Tox/src/stdafx.cxx @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2012-17 Miranda NG project (https://miranda-ng.org) This program is free software; you can redistribute it and/or diff --git a/protocols/Tox/src/stdafx.h b/protocols/Tox/src/stdafx.h index 639e405b8a..c403b787ce 100644 --- a/protocols/Tox/src/stdafx.h +++ b/protocols/Tox/src/stdafx.h @@ -1,4 +1,4 @@ -#ifndef _COMMON_H_ +#ifndef _COMMON_H_ #define _COMMON_H_ #include diff --git a/protocols/Tox/src/tox_accounts.cpp b/protocols/Tox/src/tox_accounts.cpp index 6419ad1369..b1bfa58490 100644 --- a/protocols/Tox/src/tox_accounts.cpp +++ b/protocols/Tox/src/tox_accounts.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" LIST CToxProto::Accounts(1, CToxProto::CompareAccounts); diff --git a/protocols/Tox/src/tox_address.h b/protocols/Tox/src/tox_address.h index 0218fc44f1..9ef57caba2 100644 --- a/protocols/Tox/src/tox_address.h +++ b/protocols/Tox/src/tox_address.h @@ -1,4 +1,4 @@ -#ifndef _TOX_ADDRESS_H_ +#ifndef _TOX_ADDRESS_H_ #define _TOX_ADDRESS_H_ class ToxHexAddress; diff --git a/protocols/Tox/src/tox_avatars.cpp b/protocols/Tox/src/tox_avatars.cpp index 810f1b163f..3e41c796f6 100644 --- a/protocols/Tox/src/tox_avatars.cpp +++ b/protocols/Tox/src/tox_avatars.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" wchar_t* CToxProto::GetAvatarFilePath(MCONTACT hContact) { diff --git a/protocols/Tox/src/tox_bootstrap.cpp b/protocols/Tox/src/tox_bootstrap.cpp index 19c37cd6de..5f1ae93dc1 100644 --- a/protocols/Tox/src/tox_bootstrap.cpp +++ b/protocols/Tox/src/tox_bootstrap.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" void CToxProto::BootstrapUdpNode(Tox *tox, const char *address, int port, const char *hexKey) { diff --git a/protocols/Tox/src/tox_chatrooms.cpp b/protocols/Tox/src/tox_chatrooms.cpp index 246f23ce8b..5ca9895fcb 100644 --- a/protocols/Tox/src/tox_chatrooms.cpp +++ b/protocols/Tox/src/tox_chatrooms.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* MCONTACT CToxProto::GetChatRoom(int groupNumber) { diff --git a/protocols/Tox/src/tox_chatrooms.h b/protocols/Tox/src/tox_chatrooms.h index 65bdc40fab..0f51a7391e 100644 --- a/protocols/Tox/src/tox_chatrooms.h +++ b/protocols/Tox/src/tox_chatrooms.h @@ -1,4 +1,4 @@ -#ifndef _TOX_CHATROOMS_H_ +#ifndef _TOX_CHATROOMS_H_ #define _TOX_CHATROOMS_H_ struct ChatRoomInviteParam diff --git a/protocols/Tox/src/tox_connection.cpp b/protocols/Tox/src/tox_connection.cpp index e640fb8ec1..4c578a9696 100644 --- a/protocols/Tox/src/tox_connection.cpp +++ b/protocols/Tox/src/tox_connection.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" bool CToxProto::IsOnline() { diff --git a/protocols/Tox/src/tox_contacts.cpp b/protocols/Tox/src/tox_contacts.cpp index f920c43677..3b76b37407 100644 --- a/protocols/Tox/src/tox_contacts.cpp +++ b/protocols/Tox/src/tox_contacts.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" WORD CToxProto::GetContactStatus(MCONTACT hContact) { diff --git a/protocols/Tox/src/tox_core.cpp b/protocols/Tox/src/tox_core.cpp index e1111bd51e..ab2e4ceb1d 100644 --- a/protocols/Tox/src/tox_core.cpp +++ b/protocols/Tox/src/tox_core.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" Tox_Options* CToxProto::GetToxOptions() { diff --git a/protocols/Tox/src/tox_dialogs.h b/protocols/Tox/src/tox_dialogs.h index c02b44a278..dedd355e1b 100644 --- a/protocols/Tox/src/tox_dialogs.h +++ b/protocols/Tox/src/tox_dialogs.h @@ -1,4 +1,4 @@ -#ifndef _TOX_DIALOGS_H_ +#ifndef _TOX_DIALOGS_H_ #define _TOX_DIALOGS_H_ class CCtrlLabel : public CCtrlData diff --git a/protocols/Tox/src/tox_events.cpp b/protocols/Tox/src/tox_events.cpp index 0e298dde94..f0afe46dbd 100644 --- a/protocols/Tox/src/tox_events.cpp +++ b/protocols/Tox/src/tox_events.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" int CToxProto::OnModulesLoaded(WPARAM, LPARAM) { diff --git a/protocols/Tox/src/tox_icons.cpp b/protocols/Tox/src/tox_icons.cpp index 458da2d868..a96e7984d4 100644 --- a/protocols/Tox/src/tox_icons.cpp +++ b/protocols/Tox/src/tox_icons.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" IconItemT CToxProto::Icons[] = { diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp index ef5122f791..ed70ad8a7b 100644 --- a/protocols/Tox/src/tox_menus.cpp +++ b/protocols/Tox/src/tox_menus.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" HGENMENU CToxProto::ContactMenuItems[CMI_MAX]; diff --git a/protocols/Tox/src/tox_menus.h b/protocols/Tox/src/tox_menus.h index dc0e6af5f8..f4930265a2 100644 --- a/protocols/Tox/src/tox_menus.h +++ b/protocols/Tox/src/tox_menus.h @@ -1,4 +1,4 @@ -#ifndef _TOX_MENUS_H_ +#ifndef _TOX_MENUS_H_ #define _TOX_MENUS_H_ #define CMI_POSITION -201001000 diff --git a/protocols/Tox/src/tox_messages.cpp b/protocols/Tox/src/tox_messages.cpp index a497572c73..761294cbf7 100644 --- a/protocols/Tox/src/tox_messages.cpp +++ b/protocols/Tox/src/tox_messages.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* MESSAGE RECEIVING */ diff --git a/protocols/Tox/src/tox_multimedia.cpp b/protocols/Tox/src/tox_multimedia.cpp index f68697793e..c9c840274a 100644 --- a/protocols/Tox/src/tox_multimedia.cpp +++ b/protocols/Tox/src/tox_multimedia.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" CToxCallDlgBase::CToxCallDlgBase(CToxProto *proto, int idDialog, MCONTACT hContact) : CToxDlgBase(proto, idDialog, false), hContact(hContact) diff --git a/protocols/Tox/src/tox_multimedia.h b/protocols/Tox/src/tox_multimedia.h index 2adcc97c09..922b9b406f 100644 --- a/protocols/Tox/src/tox_multimedia.h +++ b/protocols/Tox/src/tox_multimedia.h @@ -1,4 +1,4 @@ -#ifndef _TOX_MULTIMEDIA_H_ +#ifndef _TOX_MULTIMEDIA_H_ #define _TOX_MULTIMEDIA_H_ #define WM_CALL_END (WM_PROTO_LAST + 100) diff --git a/protocols/Tox/src/tox_netlib.cpp b/protocols/Tox/src/tox_netlib.cpp index 0b8eaa72e5..ab76d7d815 100644 --- a/protocols/Tox/src/tox_netlib.cpp +++ b/protocols/Tox/src/tox_netlib.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" void CToxProto::InitNetlib() { diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index 2a2907ea66..bf4aeea940 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" CToxOptionsMain::CToxOptionsMain(CToxProto *proto, int idDialog) : CToxDlgBase(proto, idDialog, false), diff --git a/protocols/Tox/src/tox_options.h b/protocols/Tox/src/tox_options.h index b2d546df03..f134e3d554 100644 --- a/protocols/Tox/src/tox_options.h +++ b/protocols/Tox/src/tox_options.h @@ -1,4 +1,4 @@ -#ifndef _TOX_OPTIONS_H_ +#ifndef _TOX_OPTIONS_H_ #define _TOX_OPTIONS_H_ class CToxOptionsMain : public CToxDlgBase diff --git a/protocols/Tox/src/tox_profile.cpp b/protocols/Tox/src/tox_profile.cpp index 59d4dadda5..a144eebee2 100644 --- a/protocols/Tox/src/tox_profile.cpp +++ b/protocols/Tox/src/tox_profile.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" HANDLE CToxProto::hProfileFolderPath; diff --git a/protocols/Tox/src/tox_profile.h b/protocols/Tox/src/tox_profile.h index 108d0fafc2..796f264d5b 100644 --- a/protocols/Tox/src/tox_profile.h +++ b/protocols/Tox/src/tox_profile.h @@ -1,4 +1,4 @@ -#ifndef _TOX_PROFILE_H_ +#ifndef _TOX_PROFILE_H_ #define _TOX_PROFILE_H_ class CToxPasswordEditor : public CToxDlgBase diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp index 17fe376827..5b6d345c9c 100644 --- a/protocols/Tox/src/tox_proto.cpp +++ b/protocols/Tox/src/tox_proto.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" CToxProto::CToxProto(const char* protoName, const wchar_t* userName) : PROTO(protoName, userName), diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h index 903dce18a8..810479ab30 100644 --- a/protocols/Tox/src/tox_proto.h +++ b/protocols/Tox/src/tox_proto.h @@ -1,4 +1,4 @@ -#ifndef _TOX_PROTO_H_ +#ifndef _TOX_PROTO_H_ #define _TOX_PROTO_H_ struct CToxProto : public PROTO diff --git a/protocols/Tox/src/tox_search.cpp b/protocols/Tox/src/tox_search.cpp index 31fbad1b50..d03d3a091a 100644 --- a/protocols/Tox/src/tox_search.cpp +++ b/protocols/Tox/src/tox_search.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" ToxHexAddress ResolveToxAddressFromDnsRecordV1(const std::string &dnsRecord) { diff --git a/protocols/Tox/src/tox_services.cpp b/protocols/Tox/src/tox_services.cpp index e798213a51..532eef79d7 100644 --- a/protocols/Tox/src/tox_services.cpp +++ b/protocols/Tox/src/tox_services.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" INT_PTR CToxProto::SetMyNickname(WPARAM wParam, LPARAM lParam) { diff --git a/protocols/Tox/src/tox_thread.h b/protocols/Tox/src/tox_thread.h index 1a27ca7005..ae0f4225f8 100644 --- a/protocols/Tox/src/tox_thread.h +++ b/protocols/Tox/src/tox_thread.h @@ -1,4 +1,4 @@ -#ifndef _TOX_THREAD_H_ +#ifndef _TOX_THREAD_H_ #define _TOX_THREAD_H_ class CToxThread diff --git a/protocols/Tox/src/tox_transfer.cpp b/protocols/Tox/src/tox_transfer.cpp index be80c55b11..3fb9ad77b7 100644 --- a/protocols/Tox/src/tox_transfer.cpp +++ b/protocols/Tox/src/tox_transfer.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" /* FILE RECEIVING */ diff --git a/protocols/Tox/src/tox_transfer.h b/protocols/Tox/src/tox_transfer.h index c203c9cf1d..372b047fb3 100644 --- a/protocols/Tox/src/tox_transfer.h +++ b/protocols/Tox/src/tox_transfer.h @@ -1,4 +1,4 @@ -#ifndef _TOX_TRANSFERS_H_ +#ifndef _TOX_TRANSFERS_H_ #define _TOX_TRANSFERS_H_ struct FileTransferParam diff --git a/protocols/Tox/src/tox_utils.cpp b/protocols/Tox/src/tox_utils.cpp index e4db373064..722517c427 100644 --- a/protocols/Tox/src/tox_utils.cpp +++ b/protocols/Tox/src/tox_utils.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" int CToxProto::MapStatus(int status) { diff --git a/protocols/Tox/src/version.h b/protocols/Tox/src/version.h index 8680eea1eb..ba58f1f238 100644 --- a/protocols/Tox/src/version.h +++ b/protocols/Tox/src/version.h @@ -1,4 +1,4 @@ -#define __MAJOR_VERSION 0 +#define __MAJOR_VERSION 0 #define __MINOR_VERSION 11 #define __RELEASE_NUM 1 #define __BUILD_NUM 26 -- cgit v1.2.3