piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove some more includes.

Browse Source
This commit is contained in:
Lioncash
2013-10-19 18:58:02 -04:00
parent 207547b425
commit 1f0710caf7
20 changed files with 42 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/AudioCommon/Src/AOSoundStream.h
View File

@ -6,13 +6,12 @@
#define _AOSOUNDSTREAM_H_ #define _AOSOUNDSTREAM_H_
#include "SoundStream.h" #include "SoundStream.h"
#include "Thread.h"
#if defined(HAVE_AO) && HAVE_AO #if defined(HAVE_AO) && HAVE_AO
#include <ao/ao.h> #include <ao/ao.h>
#endif #endif
#include "Thread.h"
class AOSound : public SoundStream class AOSound : public SoundStream
{ {
#if defined(HAVE_AO) && HAVE_AO #if defined(HAVE_AO) && HAVE_AO

1
Source/Core/AudioCommon/Src/NullSoundStream.cpp
View File

@ -2,7 +2,6 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "CommonTypes.h"
#include "NullSoundStream.h" #include "NullSoundStream.h"
#include "../../Core/Src/HW/SystemTimers.h" #include "../../Core/Src/HW/SystemTimers.h"
#include "../../Core/Src/HW/AudioInterface.h" #include "../../Core/Src/HW/AudioInterface.h"

1
Source/Core/AudioCommon/Src/OpenALStream.h
View File

@ -5,7 +5,6 @@
#ifndef _OPENALSTREAM_H_ #ifndef _OPENALSTREAM_H_
#define _OPENALSTREAM_H_ #define _OPENALSTREAM_H_
#include "CommonTypes.h"
#include "SoundStream.h" #include "SoundStream.h"
#include "Thread.h" #include "Thread.h"

4
Source/Core/Common/Src/FileSearch.cpp
View File

@ -12,11 +12,9 @@
#include <windows.h> #include <windows.h>
#endif #endif
#include <string>
#include <algorithm> #include <algorithm>
#include "FileSearch.h" #include "FileSearch.h"
#include "StringUtil.h" #include "StringUtil.h"
@ -46,7 +44,7 @@ void CFileSearch::FindFiles(const std::string& _searchString, const std::string&
bool bkeepLooping = true; bool bkeepLooping = true;
while (bkeepLooping) while (bkeepLooping)
{ {
if (findData.cFileName[0] != '.') if (findData.cFileName[0] != '.')
{ {
std::string strFilename; std::string strFilename;

10
Source/Core/Common/Src/FileUtil.cpp
View File

@ -3,18 +3,16 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common.h"
#include "CommonPaths.h" #include "CommonPaths.h"
#include "FileUtil.h" #include "FileUtil.h"
#include "StringUtil.h"
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <shlobj.h> // for SHGetFolderPath #include <shlobj.h> // for SHGetFolderPath
#include <shellapi.h> #include <shellapi.h>
#include <commdlg.h> // for GetSaveFileName #include <commdlg.h> // for GetSaveFileName
#include <io.h> #include <io.h>
#include <direct.h> // getcwd #include <direct.h> // getcwd
#else #else
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
@ -34,8 +32,6 @@
#include <algorithm> #include <algorithm>
#include <sys/stat.h> #include <sys/stat.h>
#include "StringUtil.h"
#ifndef S_ISDIR #ifndef S_ISDIR
#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR)
#endif #endif

4
Source/Core/Common/Src/Hash.h
View File

@ -6,13 +6,13 @@
#ifndef _HASH_H_ #ifndef _HASH_H_
#define _HASH_H_ #define _HASH_H_
#include "Common.h" #include "CommonTypes.h"
u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0. u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0.
u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower
u32 HashFNV(const u8* ptr, int length); // Another fast and decent hash u32 HashFNV(const u8* ptr, int length); // Another fast and decent hash
u32 HashEctor(const u8* ptr, int length); // JUNK. DO NOT USE FOR NEW THINGS u32 HashEctor(const u8* ptr, int length); // JUNK. DO NOT USE FOR NEW THINGS
u64 GetCRC32(const u8 *src, int len, u32 samples); // SSE4.2 version of CRC32 u64 GetCRC32(const u8 *src, int len, u32 samples); // SSE4.2 version of CRC32
u64 GetHashHiresTexture(const u8 *src, int len, u32 samples); u64 GetHashHiresTexture(const u8 *src, int len, u32 samples);
u64 GetMurmurHash3(const u8 *src, int len, u32 samples); u64 GetMurmurHash3(const u8 *src, int len, u32 samples);
u64 GetHash64(const u8 *src, int len, u32 samples); u64 GetHash64(const u8 *src, int len, u32 samples);

24
Source/Core/Common/Src/Log.h
View File

@ -5,16 +5,17 @@
#ifndef _LOG_H_ #ifndef _LOG_H_
#define _LOG_H_ #define _LOG_H_
#define NOTICE_LEVEL 1 // VERY important information that is NOT errors. Like startup and OSReports. #define NOTICE_LEVEL 1 // VERY important information that is NOT errors. Like startup and OSReports.
#define ERROR_LEVEL 2 // Critical errors #define ERROR_LEVEL 2 // Critical errors
#define WARNING_LEVEL 3 // Something is suspicious. #define WARNING_LEVEL 3 // Something is suspicious.
#define INFO_LEVEL 4 // General information. #define INFO_LEVEL 4 // General information.
#define DEBUG_LEVEL 5 // Detailed debugging - might make things slow. #define DEBUG_LEVEL 5 // Detailed debugging - might make things slow.
namespace LogTypes namespace LogTypes
{ {
enum LOG_TYPE { enum LOG_TYPE
{
ACTIONREPLAY, ACTIONREPLAY,
AUDIO, AUDIO,
AUDIO_INTERFACE, AUDIO_INTERFACE,
@ -67,12 +68,13 @@ enum LOG_TYPE {
}; };
// FIXME: should this be removed? // FIXME: should this be removed?
enum LOG_LEVELS { enum LOG_LEVELS
LNOTICE = NOTICE_LEVEL, {
LERROR = ERROR_LEVEL, LNOTICE = NOTICE_LEVEL,
LERROR = ERROR_LEVEL,
LWARNING = WARNING_LEVEL, LWARNING = WARNING_LEVEL,
LINFO = INFO_LEVEL, LINFO = INFO_LEVEL,
LDEBUG = DEBUG_LEVEL, LDEBUG = DEBUG_LEVEL,
}; };
#define LOGTYPES_LEVELS LogTypes::LOG_LEVELS #define LOGTYPES_LEVELS LogTypes::LOG_LEVELS

14
Source/Core/Common/Src/MathUtil.cpp
View File

@ -2,8 +2,6 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common.h"
#include "MathUtil.h" #include "MathUtil.h"
#include <cmath> #include <cmath>
@ -144,7 +142,7 @@ void Matrix33::RotateY(Matrix33 &mtx, float rad)
mtx.data[0] = c; mtx.data[0] = c;
mtx.data[2] = s; mtx.data[2] = s;
mtx.data[4] = 1; mtx.data[4] = 1;
mtx.data[6] = -s; mtx.data[6] = -s;
mtx.data[8] = c; mtx.data[8] = c;
} }
@ -155,9 +153,12 @@ void Matrix33::Multiply(const Matrix33 &a, const Matrix33 &b, Matrix33 &result)
void Matrix33::Multiply(const Matrix33 &a, const float vec[3], float result[3]) void Matrix33::Multiply(const Matrix33 &a, const float vec[3], float result[3])
{ {
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i)
{
result[i] = 0; result[i] = 0;
for (int k = 0; k < 3; ++k) {
for (int k = 0; k < 3; ++k)
{
result[i] += a.data[i * 3 + k] * vec[k]; result[i] += a.data[i * 3 + k] * vec[k];
} }
} }
@ -192,7 +193,8 @@ void Matrix44::LoadMatrix33(Matrix44 &mtx, const Matrix33 &m33)
void Matrix44::Set(Matrix44 &mtx, const float mtxArray[16]) void Matrix44::Set(Matrix44 &mtx, const float mtxArray[16])
{ {
for(int i = 0; i < 16; ++i) { for(int i = 0; i < 16; ++i)
{
mtx.data[i] = mtxArray[i]; mtx.data[i] = mtxArray[i];
} }
} }

3
Source/Core/Common/Src/MemArena.cpp
View File

@ -2,8 +2,8 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <set>
#include "Common.h"
#include "MemoryUtil.h" #include "MemoryUtil.h"
#include "MemArena.h" #include "MemArena.h"
@ -20,7 +20,6 @@
#include <linux/ashmem.h> #include <linux/ashmem.h>
#endif #endif
#endif #endif
#include <set>
#if defined(__APPLE__) #if defined(__APPLE__)
static const char* ram_temp_file = "/tmp/gc_mem.tmp"; static const char* ram_temp_file = "/tmp/gc_mem.tmp";

3
Source/Core/Common/Src/MemoryUtil.h
View File

@ -6,10 +6,11 @@
#ifndef _MEMORYUTIL_H #ifndef _MEMORYUTIL_H
#define _MEMORYUTIL_H #define _MEMORYUTIL_H
#include <string>
#ifndef _WIN32 #ifndef _WIN32
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
#include <string>
void* AllocateExecutableMemory(size_t size, bool low = true); void* AllocateExecutableMemory(size_t size, bool low = true);
void* AllocateMemoryPages(size_t size); void* AllocateMemoryPages(size_t size);

2
Source/Core/Common/Src/Misc.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common.h" #include "CommonTypes.h"
// Neither Android nor OS X support TLS // Neither Android nor OS X support TLS
#if defined(__APPLE__) || (ANDROID && __clang__) #if defined(__APPLE__) || (ANDROID && __clang__)

1
Source/Core/Common/Src/SettingsHandler.cpp
View File

@ -4,7 +4,6 @@
// Thanks to Treeki for writing the original class - 29/01/2012 // Thanks to Treeki for writing the original class - 29/01/2012
#include "Common.h"
#include "CommonPaths.h" #include "CommonPaths.h"
#include "Timer.h" #include "Timer.h"
#include "SettingsHandler.h" #include "SettingsHandler.h"

2
Source/Core/Common/Src/SettingsHandler.h
View File

@ -8,7 +8,7 @@
#include <string> #include <string>
#include "Common.h" #include "CommonTypes.h"
class SettingsHandler class SettingsHandler
{ {

1
Source/Core/Common/Src/StringUtil.cpp
View File

@ -6,7 +6,6 @@
#include <stdio.h> #include <stdio.h>
#include <algorithm> #include <algorithm>
#include "Common.h"
#include "CommonPaths.h" #include "CommonPaths.h"
#include "StringUtil.h" #include "StringUtil.h"

1
Source/Core/Common/Src/Thread.cpp
View File

@ -3,7 +3,6 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Thread.h" #include "Thread.h"
#include "Common.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <mach/mach.h> #include <mach/mach.h>

1
Source/Core/Common/Src/Timer.cpp
View File

@ -12,7 +12,6 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include "Common.h"
#include "Timer.h" #include "Timer.h"
#include "StringUtil.h" #include "StringUtil.h"

3
Source/Core/Common/Src/x64ABI.cpp
View File

@ -2,9 +2,8 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common.h"
#include "x64Emitter.h"
#include "x64ABI.h" #include "x64ABI.h"
#include "x64Emitter.h"
using namespace Gen; using namespace Gen;

2
Source/Core/Common/Src/x64Analyzer.h
View File

@ -5,7 +5,7 @@
#ifndef _X64ANALYZER_H_ #ifndef _X64ANALYZER_H_
#define _X64ANALYZER_H_ #define _X64ANALYZER_H_
#include "Common.h" #include "CommonTypes.h"
struct InstructionInfo struct InstructionInfo
{ {

2
Source/Core/Core/Src/BootManager.cpp
View File

@ -23,7 +23,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "Common.h" #include "CommonTypes.h"
#include "CommonPaths.h" #include "CommonPaths.h"
#include "IniFile.h" #include "IniFile.h"
#include "BootManager.h" #include "BootManager.h"

13
Source/Core/Core/Src/ConfigManager.cpp
View File

@ -2,21 +2,20 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <string>
#include "Common.h" #include "Common.h"
#include "CommonPaths.h" #include "CommonPaths.h"
#include "IniFile.h"
#include "ConfigManager.h" #include "ConfigManager.h"
#include "IniFile.h"
#include "FileUtil.h" #include "FileUtil.h"
#include "NANDContentLoader.h" #include "NANDContentLoader.h"
SConfig* SConfig::m_Instance; SConfig* SConfig::m_Instance;
static const struct { static const struct
const char* IniText; {
const int DefaultKey; const char* IniText;
const int DefaultModifier; const int DefaultKey;
const int DefaultModifier;
} g_HKData[] = { } g_HKData[] = {
#ifdef __APPLE__ #ifdef __APPLE__
{ "Open", 79 /* 'O' */, 2 /* wxMOD_CMD */ }, { "Open", 79 /* 'O' */, 2 /* wxMOD_CMD */ },