mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 15:40:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further fixes to the formatting change. WX sucks.

Browse Source
This commit is contained in:
Pierre Bourdon 2016-06-24 12:16:10 +02:00
parent 3570c7f03a
commit 5fcb4bb3ab
16 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/StringUtil.cpp
View File

@ -23,9 +23,9 @@
#ifdef _WIN32
#include <Windows.h>
#else
#include <errno.h>
#include <iconv.h>
#include <locale.h>
#include <errno.h>
#endif
#if !defined(_WIN32) && !defined(ANDROID)

2
Source/Core/Core/HW/WiimoteReal/WiimoteRealBase.h
View File

@ -15,8 +15,8 @@
#define NS_ENUM_AVAILABLE(...)
// end hack
#import <IOBluetooth/IOBluetooth.h>
#include <IOKit/pwr_mgt/IOPMLib.h>
#include <IOKit/hid/IOHIDManager.h>
#include <IOKit/pwr_mgt/IOPMLib.h>
#elif defined(__linux__) && HAVE_BLUEZ
#include <bluetooth/bluetooth.h>
#endif

1
Source/Core/Core/NetPlayServer.h
View File

@ -12,6 +12,7 @@
#include <thread>
#include <unordered_map>
#include <unordered_set>
#include "Common/FifoQueue.h"
#include "Common/Timer.h"
#include "Common/TraversalClient.h"
#include "Core/NetPlayProto.h"

4
Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
View File

@ -2,12 +2,14 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
// clang-format off
#include <wx/bitmap.h>
#include <wx/aui/auibar.h>
#include <wx/aui/framemanager.h>
#include <wx/bitmap.h>
#include <wx/image.h>
#include <wx/listbase.h>
#include <wx/panel.h>
// clang-format on
#include "Common/BreakPoints.h"
#include "Common/CommonTypes.h"

5
Source/Core/DolphinWX/Debugger/CodeWindow.cpp
View File

@ -5,8 +5,10 @@
#include <cstdio>
#include <string>
#include <vector>
#include <wx/aui/auibar.h>
// clang-format off
#include <wx/bitmap.h>
#include <wx/aui/auibar.h>
#include <wx/image.h>
#include <wx/listbox.h>
#include <wx/menu.h>
@ -17,6 +19,7 @@
#include <wx/textdlg.h>
#include <wx/thread.h>
#include <wx/toolbar.h>
// clang-format on
#include "Common/BreakPoints.h"
#include "Common/CommonTypes.h"

4
Source/Core/DolphinWX/Debugger/WatchWindow.cpp
View File

@ -4,9 +4,11 @@
#include <cstddef>
#include <wx/aui/auibar.h>
// clang-format off
#include <wx/bitmap.h>
#include <wx/aui/auibar.h>
#include <wx/panel.h>
// clang-format on
#include "Common/FileUtil.h"
#include "Common/IniFile.h"

4
Source/Core/DolphinWX/FrameAui.cpp
View File

@ -5,6 +5,9 @@
#include <cstddef>
#include <string>
#include <vector>
// clang-format off
#include <wx/bitmap.h>
#include <wx/aui/auibar.h>
#include <wx/aui/auibook.h>
#include <wx/aui/framemanager.h>
@ -18,6 +21,7 @@
#include <wx/statusbr.h>
#include <wx/textdlg.h>
#include <wx/toplevel.h>
// clang-format on
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"

3
Source/Core/VideoCommon/PixelShaderGen.cpp
View File

@ -937,8 +937,7 @@ static void WriteStage(T& out, pixel_shader_uid_data* uid_data, int n, API_TYPE
}
else
{
const char* function_table[] =
{
const char* function_table[] = {
"((tevin_a.r > tevin_b.r) ? tevin_c.rgb : int3(0,0,0))", // TEVCMP_R8_GT
"((tevin_a.r == tevin_b.r) ? tevin_c.rgb : int3(0,0,0))", // TEVCMP_R8_EQ
"((idot(tevin_a.rgb, comp16) > idot(tevin_b.rgb, comp16)) ? tevin_c.rgb : "