From 5f86bc44d4591b0ef44a6220b48c39c5b0031a0c Mon Sep 17 00:00:00 2001 From: adrian17 Date: Fri, 27 Sep 2013 21:38:07 +0200 Subject: [PATCH] Deleted some doubled #includes. --- Common/ABI.cpp | 1 - Common/ArmABI.cpp | 1 - Common/ArmEmitter.cpp | 1 - Common/ArmThunk.cpp | 3 --- Common/ChunkFile.h | 2 -- Common/ConsoleListener.cpp | 2 -- Common/FileUtil.cpp | 2 -- Common/FileUtil.h | 1 - Common/LogManager.cpp | 1 - Common/LogManager.h | 1 - Common/MemoryUtil.cpp | 1 - Common/MsgHandler.cpp | 1 - Common/StringUtils.cpp | 4 ---- Common/Thread.h | 1 - Common/Thunk.cpp | 4 ---- Common/Timer.cpp | 1 - Common/x64Emitter.cpp | 1 - 17 files changed, 28 deletions(-) diff --git a/Common/ABI.cpp b/Common/ABI.cpp index 7dc2bef94f..ad1fe2c94e 100644 --- a/Common/ABI.cpp +++ b/Common/ABI.cpp @@ -15,7 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Common.h" #include "x64Emitter.h" #include "ABI.h" diff --git a/Common/ArmABI.cpp b/Common/ArmABI.cpp index 688f54d381..b3608707ce 100644 --- a/Common/ArmABI.cpp +++ b/Common/ArmABI.cpp @@ -15,7 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Common.h" #include "ArmEmitter.h" #include "ArmABI.h" diff --git a/Common/ArmEmitter.cpp b/Common/ArmEmitter.cpp index fcf2e09e84..7bd273c920 100644 --- a/Common/ArmEmitter.cpp +++ b/Common/ArmEmitter.cpp @@ -15,7 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Common.h" #include "ArmEmitter.h" #include "CPUDetect.h" diff --git a/Common/ArmThunk.cpp b/Common/ArmThunk.cpp index 207676dca5..19a01c8c80 100644 --- a/Common/ArmThunk.cpp +++ b/Common/ArmThunk.cpp @@ -15,9 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include - -#include "Common.h" #include "MemoryUtil.h" #include "Thunk.h" diff --git a/Common/ChunkFile.h b/Common/ChunkFile.h index 8b2c386fb4..eb17f5eafb 100644 --- a/Common/ChunkFile.h +++ b/Common/ChunkFile.h @@ -28,9 +28,7 @@ // - Serialization code for anything complex has to be manually written. #include -#include #include -#include #include #include #ifndef __SYMBIAN32__ diff --git a/Common/ConsoleListener.cpp b/Common/ConsoleListener.cpp index f3a583a36b..9a60ffe7d9 100644 --- a/Common/ConsoleListener.cpp +++ b/Common/ConsoleListener.cpp @@ -18,7 +18,6 @@ #include // min #include // System: To be able to add strings with "+" -#include #include #ifdef _WIN32 #include "CommonWindows.h" @@ -30,7 +29,6 @@ #include "thread/threadutil.h" #include "util/text/utf8.h" #include "Common.h" -#include "LogManager.h" // Common #include "ConsoleListener.h" // Common #include "Atomics.h" diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp index b78d51b8b1..ebcd6957f6 100644 --- a/Common/FileUtil.cpp +++ b/Common/FileUtil.cpp @@ -15,7 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Common.h" #include "CommonPaths.h" #include "FileUtil.h" #include "StringUtils.h" @@ -43,7 +42,6 @@ #include "util/text/utf8.h" -#include #include #ifndef S_ISDIR diff --git a/Common/FileUtil.h b/Common/FileUtil.h index e8c40d7cf7..7ab2d010cc 100644 --- a/Common/FileUtil.h +++ b/Common/FileUtil.h @@ -22,7 +22,6 @@ #include #include #include -#include #include #include "Common.h" diff --git a/Common/LogManager.cpp b/Common/LogManager.cpp index eb98db2f24..3333761141 100644 --- a/Common/LogManager.cpp +++ b/Common/LogManager.cpp @@ -21,7 +21,6 @@ #include "LogManager.h" #include "ConsoleListener.h" #include "Timer.h" -#include "Thread.h" #include "FileUtil.h" #include "../Core/Config.h" #ifdef __SYMBIAN32__ diff --git a/Common/LogManager.h b/Common/LogManager.h index cd401ea09d..38ea882062 100644 --- a/Common/LogManager.h +++ b/Common/LogManager.h @@ -24,7 +24,6 @@ #include "file/ini_file.h" #include -#include #define MAX_MESSAGES 8000 #define MAX_MSGLEN 1024 diff --git a/Common/MemoryUtil.cpp b/Common/MemoryUtil.cpp index 16ef11c147..207b790769 100644 --- a/Common/MemoryUtil.cpp +++ b/Common/MemoryUtil.cpp @@ -32,7 +32,6 @@ #include #endif -#include #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) diff --git a/Common/MsgHandler.cpp b/Common/MsgHandler.cpp index 4ebb401cd6..7f15f60f2b 100644 --- a/Common/MsgHandler.cpp +++ b/Common/MsgHandler.cpp @@ -16,7 +16,6 @@ // http://code.google.com/p/dolphin-emu/ -#include // System #include "Common.h" // Local #include "StringUtils.h" diff --git a/Common/StringUtils.cpp b/Common/StringUtils.cpp index 02f5933f65..bb39e66c21 100644 --- a/Common/StringUtils.cpp +++ b/Common/StringUtils.cpp @@ -15,10 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include -#include - -#include "Common.h" #include "CommonPaths.h" #include "StringUtils.h" diff --git a/Common/Thread.h b/Common/Thread.h index c6b6a97e62..9dea9dd3da 100644 --- a/Common/Thread.h +++ b/Common/Thread.h @@ -19,7 +19,6 @@ #define _THREAD_H_ #include "StdThread.h" -#include "StdMutex.h" #include "StdConditionVariable.h" // Don't include common.h here as it will break LogManager diff --git a/Common/Thunk.cpp b/Common/Thunk.cpp index 0cc7fb966a..d7ca7b7964 100644 --- a/Common/Thunk.cpp +++ b/Common/Thunk.cpp @@ -15,10 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include - -#include "Common.h" -#include "x64Emitter.h" #include "MemoryUtil.h" #include "ABI.h" #include "Thunk.h" diff --git a/Common/Timer.cpp b/Common/Timer.cpp index fbab97fb33..3488c98146 100644 --- a/Common/Timer.cpp +++ b/Common/Timer.cpp @@ -25,7 +25,6 @@ #include #endif -#include "Common.h" #include "Timer.h" #include "StringUtils.h" diff --git a/Common/x64Emitter.cpp b/Common/x64Emitter.cpp index c1d45a109e..9abc3eff2c 100644 --- a/Common/x64Emitter.cpp +++ b/Common/x64Emitter.cpp @@ -15,7 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Common.h" #include "x64Emitter.h" #include "ABI.h" #include "CPUDetect.h"