From f0a8e931ff837fcde8e334e193e09149a142210a Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 7 Aug 2016 17:59:35 -0700 Subject: [PATCH] Remove UTF-8 BOMs from a few files. And note the only ones that do need them in editorconfig. --- .editorconfig | 8 ++++++++ Core/Dialog/PSPNetconfDialog.cpp | 2 +- Core/HLE/sceMd5.cpp | 4 ++-- GPU/GLES/DepalettizeShader.cpp | 2 +- GPU/GLES/Framebuffer.cpp | 2 +- UI/GameSettingsScreen.cpp | 2 +- UI/MiscScreens.cpp | 2 +- Windows/XinputDevice.cpp | 2 +- ext/native/ui/view.cpp | 2 +- ext/native/util/random/rng.h | 2 +- 10 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.editorconfig b/.editorconfig index d689177aa1..807c348085 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,5 +18,13 @@ end_of_line = lf [Core/Dialog/PSPOskDialog.cpp] charset = utf-16le +[ext/native/tools/kanjifilter.h] +# This file may need to force a BOM so compilers treat as utf-8. +charset = utf-8-bom + +[Windows/GEDebugger/CtrlDisplayListView.cpp] +# This file may need to force a BOM so compilers treat as utf-8. +charset = utf-8-bom + [Windows/version.rc] charset = utf-16le diff --git a/Core/Dialog/PSPNetconfDialog.cpp b/Core/Dialog/PSPNetconfDialog.cpp index 3df74563f3..d9f6ff1c54 100644 --- a/Core/Dialog/PSPNetconfDialog.cpp +++ b/Core/Dialog/PSPNetconfDialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012- PPSSPP Project. +// Copyright (c) 2012- PPSSPP Project. // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Core/HLE/sceMd5.cpp b/Core/HLE/sceMd5.cpp index eb73904035..70e118d8e5 100644 --- a/Core/HLE/sceMd5.cpp +++ b/Core/HLE/sceMd5.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012- PPSSPP Project. +// Copyright (c) 2012- PPSSPP Project. // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -185,4 +185,4 @@ const HLEFunction sceMd5[] = { void Register_sceMd5() { RegisterModule("sceMd5", ARRAY_SIZE(sceMd5), sceMd5); -} \ No newline at end of file +} diff --git a/GPU/GLES/DepalettizeShader.cpp b/GPU/GLES/DepalettizeShader.cpp index d82191c83e..65155778e0 100644 --- a/GPU/GLES/DepalettizeShader.cpp +++ b/GPU/GLES/DepalettizeShader.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014- PPSSPP Project. +// Copyright (c) 2014- PPSSPP Project. // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index 42e346a360..7522dd3967 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012- PPSSPP Project. +// Copyright (c) 2012- PPSSPP Project. // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 61cb3b03f5..4bba985f7b 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2013- PPSSPP Project. +// Copyright (c) 2013- PPSSPP Project. // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 0070fa7fe1..0877e42f75 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2013- PPSSPP Project. +// Copyright (c) 2013- PPSSPP Project. // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Windows/XinputDevice.cpp b/Windows/XinputDevice.cpp index e4f51b6f61..c169664cff 100644 --- a/Windows/XinputDevice.cpp +++ b/Windows/XinputDevice.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "base/NativeApp.h" diff --git a/ext/native/ui/view.cpp b/ext/native/ui/view.cpp index 88bdab3619..b63fcd7862 100644 --- a/ext/native/ui/view.cpp +++ b/ext/native/ui/view.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "base/mutex.h" diff --git a/ext/native/util/random/rng.h b/ext/native/util/random/rng.h index 15ace2bb71..0a5960fa70 100644 --- a/ext/native/util/random/rng.h +++ b/ext/native/util/random/rng.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "base/basictypes.h"