Skip to content

Commit

Permalink
Merge pull request #8901 from unknownbrackets/utf8-bom
Browse files Browse the repository at this point in the history
Remove UTF-8 BOMs from a few files
  • Loading branch information
hrydgard committed Aug 8, 2016
2 parents fb05c05 + 34358fb commit f9401ea
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 13 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Expand Up @@ -18,5 +18,9 @@ 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/version.rc]
charset = utf-16le
2 changes: 1 addition & 1 deletion 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
Expand Down
4 changes: 2 additions & 2 deletions 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
Expand Down Expand Up @@ -185,4 +185,4 @@ const HLEFunction sceMd5[] = {

void Register_sceMd5() {
RegisterModule("sceMd5", ARRAY_SIZE(sceMd5), sceMd5);
}
}
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
6 changes: 3 additions & 3 deletions Windows/GEDebugger/CtrlDisplayListView.cpp
@@ -1,4 +1,4 @@
#include "Windows/GEDebugger/CtrlDisplayListView.h"
#include "Windows/GEDebugger/CtrlDisplayListView.h"
#include "Windows/GEDebugger/GEDebugger.h"
#include "Windows/InputBox.h"
#include "Windows/Main.h"
Expand Down Expand Up @@ -230,7 +230,7 @@ void CtrlDisplayListView::onPaint(WPARAM wParam, LPARAM lParam)

if (address == list.pc)
{
TextOut(hdc,pixelPositions.opcodeStart-8,rowY1,L"",1);
TextOut(hdc,pixelPositions.opcodeStart-8,rowY1,L"\x25A0",1);
}

const char* opcode = op.desc.c_str();
Expand Down Expand Up @@ -473,4 +473,4 @@ bool CtrlDisplayListView::curAddressIsVisible()
{
u32 windowEnd = windowStart + visibleRows * instructionSize;
return curAddress >= windowStart && curAddress < windowEnd;
}
}
2 changes: 1 addition & 1 deletion Windows/XinputDevice.cpp
@@ -1,4 +1,4 @@
#include <limits.h>
#include <limits.h>
#include <algorithm>

#include "base/NativeApp.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/native/ui/view.cpp
@@ -1,4 +1,4 @@
#include <queue>
#include <queue>
#include <algorithm>

#include "base/mutex.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/native/util/random/rng.h
@@ -1,4 +1,4 @@
#pragma once
#pragma once

#include "base/basictypes.h"

Expand Down

0 comments on commit f9401ea

Please sign in to comment.