Remove some unnecessary includes as well as simplifying exisiting ones if possible.

This commit is contained in:
Lioncash 2013-10-17 00:32:18 -04:00
parent bf352c3ed0
commit 97cd42f5c3
69 changed files with 30 additions and 98 deletions

View File

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

View File

@ -5,8 +5,8 @@
#ifndef _NULLSOUNDSTREAM_H_
#define _NULLSOUNDSTREAM_H_
#include <stdlib.h>
#include "SoundStream.h"
#include "Thread.h"
#define BUF_SIZE (48000 * 4 / 32)

View File

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

View File

@ -8,7 +8,7 @@
#include <vector>
#include <string>
#include "Common.h"
#include "CommonTypes.h"
class DebugInterface;
@ -67,7 +67,7 @@ public:
void Remove(u32 _iAddress);
void Clear();
void DeleteByAddress(u32 _Address);
void DeleteByAddress(u32 _Address);
private:
TBreakPoints m_BreakPoints;
@ -93,7 +93,7 @@ public:
// memory breakpoint
TMemCheck *GetMemCheck(u32 address);
void Remove(u32 _Address);
void Remove(u32 _Address);
void Clear() { m_MemChecks.clear(); };
};

View File

@ -1,10 +1,8 @@
#ifndef _CDUTILS_H_
#define _CDUTILS_H_
#include <stdlib.h>
#include <vector>
#include <string>
#include <stdio.h>
// Returns a pointer to an array of strings with the device names
std::vector<std::string> cdio_get_devices();

View File

@ -3,18 +3,15 @@
// Refer to the license.txt file included.
#include <algorithm> // min
#include <cstdlib>
#include <string> // System: To be able to add strings with "+"
#include <stdio.h>
#include <math.h>
#ifdef _WIN32
#include <windows.h>
#include <array>
#else
#include <stdarg.h>
#endif
#include "Common.h"
#include "LogManager.h" // Common
#include "ConsoleListener.h" // Common
ConsoleListener::ConsoleListener()

View File

@ -2,7 +2,6 @@
#define _DEBUGINTERFACE_H
#include <string>
#include <string.h>
class DebugInterface
{

View File

@ -18,7 +18,6 @@
#if defined(WIN32)
#include <windows.h>
#include <tchar.h>
#include <string>

View File

@ -16,7 +16,7 @@
// http://code.google.com/p/dolphin-emu/
#ifndef FPU_ROUND_MODE_H_
#define FPU_ROUND_MODE_H_
#include "Common.h"
#include "CommonTypes.h"
namespace FPURoundMode
{

View File

@ -15,6 +15,6 @@
// Official Git repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "Common.h"
#include "CommonTypes.h"
bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename);

View File

@ -5,7 +5,7 @@
#ifndef _TIMER_H_
#define _TIMER_H_
#include "Common.h"
#include "CommonTypes.h"
#include <string>
namespace Common

View File

@ -5,9 +5,6 @@
#ifndef _ARDECRYPT_H_
#define _ARDECRYPT_H_
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <vector>
#include "Common.h"
#include "ActionReplay.h"

View File

@ -12,13 +12,11 @@
#include "../PowerPC/PowerPC.h"
#include "../PowerPC/PPCAnalyst.h"
#include "../Core.h"
#include "../HW/HW.h"
#include "../HW/EXI_DeviceIPL.h"
#include "../HW/Memmap.h"
#include "../HW/ProcessorInterface.h"
#include "../HW/DVDInterface.h"
#include "../HW/VideoInterface.h"
#include "../HW/CPU.h"
#include "../IPC_HLE/WII_IPC_HLE.h"
#include "../Debugger/Debugger_SymbolMap.h" // Debugger
@ -30,7 +28,6 @@
#include "../PatchEngine.h"
#include "../PowerPC/SignatureDB.h"
#include "../PowerPC/PPCSymbolDB.h"
#include "../MemTools.h"
#include "../ConfigManager.h"
#include "VolumeCreator.h" // DiscIO

View File

@ -5,9 +5,9 @@
#ifndef _BOOT_H
#define _BOOT_H
#include <cstdlib>
#include <string>
#include "Common.h"
#include "../CoreParameter.h"
class CBoot

View File

@ -14,7 +14,6 @@
#include "../HW/DVDInterface.h"
#include "../HW/CPU.h"
#include "../Host.h"
#include "../VolumeHandler.h"
#include "../PatchEngine.h"
#include "../MemTools.h"

View File

@ -5,7 +5,7 @@
#ifndef _BOOT_DOL_H
#define _BOOT_DOL_H
#include "Common.h"
#include "CommonTypes.h"
class CDolLoader
{

View File

@ -16,7 +16,6 @@
#include "MathUtil.h"
#include "MemoryUtil.h"
#include "Console.h"
#include "Core.h"
#include "CPUDetect.h"
#include "CoreTiming.h"

View File

@ -15,7 +15,7 @@
#include <vector>
#include <string>
#include "Common.h"
#include "CommonTypes.h"
#include "CoreParameter.h"
namespace Core

View File

@ -10,7 +10,6 @@
#include "DSPHost.h"
#include "DSPInterpreter.h"
#include "DSPAnalyzer.h"
#include "Jit/DSPJitUtil.h"
#include "x64Emitter.h"
#include "x64ABI.h"

View File

@ -24,7 +24,6 @@
====================================================================*/
#include "DSPTables.h"
#include "DSPHost.h"
#include "DSPCore.h"
#include "DSPAnalyzer.h"

View File

@ -8,9 +8,6 @@
#include "../DSPIntUtil.h"
#include "../DSPEmitter.h"
#include "../DSPAnalyzer.h"
#ifdef _M_X64
#include "DSPJitUtil.h"
#endif
#include "x64Emitter.h"
#include "x64ABI.h"
using namespace Gen;

View File

@ -6,7 +6,6 @@
#include "../DSPEmitter.h"
#include "../DSPStacks.h"
#include "../DSPAnalyzer.h"
#include "DSPJitUtil.h"
#include "x64Emitter.h"
#include "x64ABI.h"

View File

@ -9,7 +9,6 @@
#include "../DSPIntUtil.h"
#include "../DSPEmitter.h"
#include "DSPJitUtil.h"
#include "x64Emitter.h"
#include "x64ABI.h"
using namespace Gen;

View File

@ -4,7 +4,6 @@
#include "../DSPMemoryMap.h"
#include "../DSPEmitter.h"
#include "DSPJitUtil.h"
#include "x64Emitter.h"
#include "x64ABI.h"

View File

@ -7,7 +7,6 @@
#include "../DSPIntCCUtil.h"
#include "../DSPIntUtil.h"
#include "../DSPEmitter.h"
#include "DSPJitUtil.h"
#include "x64Emitter.h"
#include "x64ABI.h"
using namespace Gen;

View File

@ -4,7 +4,6 @@
#include "../DSPIntUtil.h"
#include "../DSPEmitter.h"
#include "DSPJitUtil.h"
#include "x64Emitter.h"
#include "x64ABI.h"
using namespace Gen;

View File

@ -10,9 +10,6 @@
#include "../DSPIntUtil.h"
#include "../DSPEmitter.h"
#include "../DSPAnalyzer.h"
#ifdef _M_X64
#include "DSPJitUtil.h"
#endif
#include "x64Emitter.h"
#include "x64ABI.h"
using namespace Gen;

View File

@ -10,7 +10,6 @@
#include "../PowerPC/PowerPC.h"
#include "../PowerPC/PPCAnalyst.h"
#include "../PowerPC/PPCSymbolDB.h"
#include "PowerPCDisasm.h"
namespace Dolphin_Debugger
{

View File

@ -6,7 +6,7 @@
#define _HLE_H
#include <map>
#include "Common.h"
#include "CommonTypes.h"
namespace HLE
{

View File

@ -6,6 +6,7 @@
#define _DSPDEBUGINTERFACE_H
#include <string>
#include <string.h>
#include "DebugInterface.h"
#include "Common.h"

View File

@ -7,7 +7,6 @@
#include "Common.h"
#include "AudioCommon.h"
#include <stdio.h>
// TODO: Get rid of this file.

View File

@ -2,8 +2,6 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <stdarg.h>
#include <list>
#include <map>
#include <string>

View File

@ -8,8 +8,6 @@
#include "Common.h"
#include "SymbolDB.h"
#include <stdio.h>
namespace DSPSymbols {
class DSPSymbolDB : public SymbolDB

View File

@ -5,7 +5,7 @@
#ifndef _DVDINTERFACE_H
#define _DVDINTERFACE_H
#include "Common.h"
#include "CommonTypes.h"
class PointerWrap;
namespace DVDInterface

View File

@ -5,7 +5,7 @@
#ifndef _EXIINTERFACE_H
#define _EXIINTERFACE_H
#include "Common.h"
#include "CommonTypes.h"
#include "EXI_Channel.h"
#include "Thread.h"
class PointerWrap;

View File

@ -5,7 +5,7 @@
#ifndef _EXICHANNEL_H
#define _EXICHANNEL_H
#include "Common.h"
#include "CommonTypes.h"
#include "EXI_Device.h"

View File

@ -5,7 +5,7 @@
#ifndef _EXIDEVICE_H
#define _EXIDEVICE_H
#include "Common.h"
#include "CommonTypes.h"
#include "ChunkFile.h"
enum TEXIDevices

View File

@ -10,7 +10,6 @@
#include "../ConfigManager.h"
#include "../../InputCommon/Src/InputConfig.h"
#include "Host.h"
namespace Pad
{

View File

@ -5,7 +5,7 @@
#ifndef _PROCESSORINTERFACE_H
#define _PROCESSORINTERFACE_H
#include "Common.h"
#include "CommonTypes.h"
class PointerWrap;
// Holds statuses of things like the write gatherer used for fifos, and interrupts from various sources

View File

@ -2,9 +2,6 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <stdio.h>
#include <stdlib.h>
#include "SI.h"
#include "SI_Device.h"
#include "SI_DeviceDanceMat.h"

View File

@ -2,9 +2,6 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <stdio.h>
#include <stdlib.h>
#include "SI.h"
#include "SI_Device.h"
#include "SI_DeviceGCController.h"

View File

@ -2,9 +2,6 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <stdio.h>
#include <stdlib.h>
#include "SI.h"
#include "SI_Device.h"
#include "SI_DeviceGCSteeringWheel.h"

View File

@ -36,7 +36,7 @@ distribution.
#ifndef __SRAM_h__
#define __SRAM_h__
#include "Common.h"
#include "CommonTypes.h"
#pragma pack(push,1)
union SRAM

View File

@ -18,7 +18,7 @@
#ifndef _SYSTEMTIMERS_H
#define _SYSTEMTIMERS_H
#include "Common.h"
#include "CommonTypes.h"
namespace SystemTimers
{

View File

@ -5,7 +5,7 @@
#ifndef _VIDEOINTERFACE_H
#define _VIDEOINTERFACE_H
#include "Common.h"
#include "CommonTypes.h"
class PointerWrap;
namespace VideoInterface

View File

@ -5,7 +5,7 @@
#ifndef _MEMTOOLS_H
#define _MEMTOOLS_H
#include "Common.h"
#include "CommonTypes.h"
namespace EMM

View File

@ -2,7 +2,6 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <math.h>
#include "Interpreter.h"
#include "../../HW/Memmap.h"

View File

@ -2,7 +2,6 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <float.h>
#ifdef _WIN32
#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset

View File

@ -8,10 +8,10 @@
#include <vector>
#include <map>
#include <cstdlib>
#include <string>
#include "Common.h"
#include "Gekko.h"
#include "PPCTables.h"
class PPCSymbolDB;
@ -62,8 +62,8 @@ struct BlockRegStats
int GetTotalNumAccesses(int reg) {return numReads[reg] + numWrites[reg];}
int GetUseRange(int reg) {
return max(lastRead[reg], lastWrite[reg]) -
min(firstRead[reg], firstWrite[reg]);}
return std::max(lastRead[reg], lastWrite[reg]) -
std::min(firstRead[reg], firstWrite[reg]);}
inline void SetInputRegister(int reg, short opindex) {
if (firstRead[reg] == -1)

View File

@ -5,7 +5,7 @@
#ifndef _PPCCACHE_H
#define _PPCCACHE_H
#include "Common.h"
#include "CommonTypes.h"
#define FAST_ICACHE

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common.h"
#include "CommonTypes.h"
#include <map>
#include <string>

View File

@ -2,8 +2,6 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <float.h>
#include "Common.h"
#include "Atomic.h"
#include "MathUtil.h"

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common.h"
#include "CommonTypes.h"
#include <map>
#include <string>

View File

@ -10,7 +10,6 @@
#include <stdio.h>
#include <string.h>
#include "Common.h"
#include "Crypto/aes.h"
#include "polarssl/sha1.h"
#include "Crypto/tools.h"
#include "FileUtil.h"

View File

@ -8,7 +8,6 @@
#include "HW/Memmap.h"
#include "BreakpointDlg.h"
#include "MemoryCheckDlg.h"
#include "Host.h"
#include "PowerPC/PowerPC.h"
#include "FileUtil.h"

View File

@ -30,7 +30,6 @@
#include "Debugger/PPCDebugInterface.h"
#include "Debugger/Debugger_SymbolMap.h"
#include "PowerPC/PPCAnalyst.h"
#include "PowerPC/Profiler.h"
#include "PowerPC/PPCSymbolDB.h"
#include "PowerPC/SignatureDB.h"
#include "PowerPC/PPCTables.h"

View File

@ -15,7 +15,6 @@
#include "PowerPC/JitCommon/JitCache.h"
#include "PowerPC/PPCAnalyst.h"
#include "PowerPCDisasm.h"
#include "Host.h"
#include "disasm.h"
#include "Debugger/PPCDebugInterface.h"

View File

@ -12,7 +12,6 @@
#include "MemoryWindow.h"
#include "HW/CPU.h"
#include "PowerPC/PowerPC.h"
#include "Host.h"
#include "FileUtil.h"
#include "Debugger/PPCDebugInterface.h"

View File

@ -5,8 +5,6 @@
#ifndef _GCPAD_H_INCLUDED__
#define _GCPAD_H_INCLUDED__
#include "CommonTypes.h"
#define PAD_ERR_NONE 0
#define PAD_ERR_NO_CONTROLLER -1
#define PAD_ERR_NOT_READY -2

View File

@ -12,10 +12,8 @@
#include "ControllerInterface/ControllerInterface.h"
#include "ControllerEmu.h"
#include <string>
#include <vector>
#include <map>
#include <sstream>
// InputPlugin isn't a very good name anymore since it's used by GCPad/Wiimote
// which are not even plugins anymore.

View File

@ -6,7 +6,6 @@
#include "VideoConfig.h"
#include "IniFile.h"
#include "Core.h"
#include "Host.h"
#include "VideoBackend.h"
#include "ConfigManager.h"

View File

@ -28,7 +28,6 @@
#include "ImageWrite.h"
#include "PixelEngine.h"
#include "Render.h"
#include "OpcodeDecoding.h"
#include "BPStructs.h"
#include "TextureCache.h"
#include "RasterFont.h"
@ -49,7 +48,6 @@
#include "Debugger.h"
#include "Core.h"
#include "Movie.h"
#include "Host.h"
#include "BPFunctions.h"
#include "FPSCounter.h"
#include "ConfigManager.h"

View File

@ -5,8 +5,6 @@
// Fast image conversion using OpenGL shaders.
// This kind of stuff would be a LOT nicer with OpenCL.
#include <math.h>
#include "TextureConverter.h"
#include "TextureConversionShader.h"
#include "TextureCache.h"

View File

@ -24,7 +24,6 @@
#include "VertexLoader.h"
#include "VertexManager.h"
#include "IndexGenerator.h"
#include "OpcodeDecoding.h"
#include "FileUtil.h"
#include "Debugger.h"
#include "StreamBuffer.h"

View File

@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include "Common.h"
#include <math.h>
#include "../../OGL/Src/GLUtil.h"
#include "RasterFont.h"

View File

@ -13,7 +13,6 @@
#include "BPFunctions.h"
#include "BPStructs.h"
#include "TextureDecoder.h"
#include "OpcodeDecoding.h"
#include "VertexLoader.h"
#include "VertexShaderManager.h"
#include "Thread.h"

View File

@ -8,7 +8,6 @@
#include "MathUtil.h"
#include "Thread.h"
#include "Atomic.h"
#include "OpcodeDecoding.h"
#include "Fifo.h"
#include "ChunkFile.h"
#include "CommandProcessor.h"

View File

@ -2,8 +2,6 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <assert.h>
#include "Common.h"
#include "VideoCommon.h"
#include "VideoConfig.h"

View File

@ -5,7 +5,6 @@
#ifndef GCOGL_VERTEXSHADER_H
#define GCOGL_VERTEXSHADER_H
#include <stdarg.h>
#include "XFMemory.h"
#include "VideoCommon.h"
#include "ShaderGenCommon.h"