Remove some more includes.

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

View File

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

View File

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

View File

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

View File

@ -12,11 +12,9 @@
#include <windows.h>
#endif
#include <string>
#include <algorithm>
#include "FileSearch.h"
#include "StringUtil.h"

View File

@ -3,10 +3,8 @@
// Refer to the license.txt file included.
#include "Common.h"
#include "CommonPaths.h"
#include "FileUtil.h"
#include "StringUtil.h"
#ifdef _WIN32
#include <windows.h>
@ -34,8 +32,6 @@
#include <algorithm>
#include <sys/stat.h>
#include "StringUtil.h"
#ifndef S_ISDIR
#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR)
#endif

View File

@ -6,7 +6,7 @@
#ifndef _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 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower

View File

@ -14,7 +14,8 @@
namespace LogTypes
{
enum LOG_TYPE {
enum LOG_TYPE
{
ACTIONREPLAY,
AUDIO,
AUDIO_INTERFACE,
@ -67,7 +68,8 @@ enum LOG_TYPE {
};
// FIXME: should this be removed?
enum LOG_LEVELS {
enum LOG_LEVELS
{
LNOTICE = NOTICE_LEVEL,
LERROR = ERROR_LEVEL,
LWARNING = WARNING_LEVEL,

View File

@ -2,8 +2,6 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common.h"
#include "MathUtil.h"
#include <cmath>
@ -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])
{
for (int i = 0; i < 3; ++i) {
for (int i = 0; i < 3; ++i)
{
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];
}
}
@ -192,7 +193,8 @@ void Matrix44::LoadMatrix33(Matrix44 &mtx, const Matrix33 &m33)
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];
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -2,18 +2,17 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <string>
#include "Common.h"
#include "CommonPaths.h"
#include "IniFile.h"
#include "ConfigManager.h"
#include "IniFile.h"
#include "FileUtil.h"
#include "NANDContentLoader.h"
SConfig* SConfig::m_Instance;
static const struct {
static const struct
{
const char* IniText;
const int DefaultKey;
const int DefaultModifier;