Remove #includes from headers (#334)

* add "global.h" to files that use it

* add MSL_C includes to files that use them

* remove dolphin includes from headers that don't need them

* remove JSupport includes from headers that don't need them

* remove JKernel includes from headers that don't need them

* remove JUtility includes from headers that don't need them

* remove J3D includes from headers that don't need them

* remove J2D includes from headers that don't need them

* remove JAudio2 includes from headers that don't need them

* remove Z2AudioLib includes from headers that don't need them

* remove JMessage includes from headers that don't need them

* remove JParticle includes from headers that don't need them

* remove SComponent includes from headers that don't need them

* remove dol includes from headers that don't need them

* sort includes
This commit is contained in:
Jcw87
2023-05-12 12:10:14 -07:00
committed by GitHub
parent 8c7cda8589
commit 221f40e609
640 changed files with 1703 additions and 560 deletions
+4 -2
View File
@@ -3,8 +3,6 @@
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JASAudioReseter.h"
#include "JSystem/JKernel/JKRArchive.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "Z2AudioLib/Z2Audience.h"
#include "Z2AudioLib/Z2FxLineMgr.h"
#include "Z2AudioLib/Z2SceneMgr.h"
@@ -16,6 +14,10 @@
#include "Z2AudioLib/Z2SpeechMgr2.h"
#include "Z2AudioLib/Z2StatusMgr.h"
#include "dolphin/types.h"
#include "global.h"
class JKRArchive;
class JKRSolidHeap;
class Z2AudioMgr {
public:
+1
View File
@@ -3,6 +3,7 @@
#include "SSystem/SComponent/c_xyz.h"
#include "Z2AudioLib/Z2SoundObject.h"
#include "Z2AudioLib/Z2SoundStarter.h"
class Z2Creature {
public:
+1
View File
@@ -5,6 +5,7 @@
#include "Z2AudioLib/Z2Calc.h"
#include "Z2AudioLib/Z2SeMgr.h"
#include "dolphin/mtx/mtxvec.h"
#include "global.h"
struct Z2EnvSeBase {
/* 802C589C */ Z2EnvSeBase(Vec*);
+3 -2
View File
@@ -1,10 +1,11 @@
#ifndef Z2FXLINEMGR_H
#define Z2FXLINEMGR_H
#include "JSystem/JKernel/JKRArchive.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JAudio2/JASGadget.h"
class JKRArchive;
class JKRHeap;
struct Z2FxLineEditNode {};
struct Z2FxLineConfig {};
+1
View File
@@ -2,6 +2,7 @@
#define Z2SEMGR_H
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JAISoundHandles.h"
#include "JSystem/JAudio2/JASGadget.h"
#include "dolphin/mtx/vec.h"
+1
View File
@@ -2,6 +2,7 @@
#define Z2SEQMGR_H
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JAISoundHandles.h"
#include "JSystem/JAudio2/JASGadget.h"
// move TTransition / Z2SoundFader ?
+1
View File
@@ -2,6 +2,7 @@
#define Z2SOUNDHANDLES_H
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JAISoundHandles.h"
#include "JSystem/JSupport/JSUList.h"
#include "dolphin/types.h"
+1
View File
@@ -6,6 +6,7 @@
#include "JSystem/JAudio2/JAISound.h"
#include "JSystem/JAudio2/JAIStreamMgr.h"
#include "JSystem/JAudio2/JASGadget.h"
#include "global.h"
class Z2SoundMgr : public JASGlobalInstance<Z2SoundMgr> {
public:
+2 -1
View File
@@ -3,7 +3,8 @@
#include "JSystem/JAudio2/JASGadget.h"
#include "JSystem/JSupport/JSUList.h"
#include "Z2AudioLib/Z2Creature.h"
class Z2CreatureEnemy;
class Z2SoundObjMgr : protected JSUList<Z2CreatureEnemy>, public JASGlobalInstance<Z2SoundObjMgr> {
public:
+2 -1
View File
@@ -2,10 +2,11 @@
#define Z2SOUNDOBJECT_H
#include "Z2AudioLib/Z2SoundHandles.h"
#include "Z2AudioLib/Z2SoundStarter.h"
#include "dolphin/mtx/mtxvec.h"
#include "dolphin/types.h"
struct Z2SoundStarter;
struct JAUSoundAnimationSound {};
class Z2SoundObjBase : protected Z2SoundHandles {
+1
View File
@@ -6,6 +6,7 @@
#include "JSystem/JMath/random.h"
#include "Z2AudioLib/Z2SoundStarter.h"
#include "dolphin/mtx/vec.h"
#include "global.h"
struct Z2SpeechStarter : public Z2SoundStarter {
/* 802CCFB8 */ Z2SpeechStarter();
+1 -1
View File
@@ -1,8 +1,8 @@
#ifndef Z2STATUSMGR_H
#define Z2STATUSMGR_H
#include "dolphin/mtx/vec.h"
#include "JSystem/JAudio2/JASGadget.h"
#include "dolphin/mtx/vec.h"
struct Z2StatusMgr : public JASGlobalInstance<Z2StatusMgr> {
Z2StatusMgr();
+1 -1
View File
@@ -2,7 +2,7 @@
#define Z2WOLFHOWLMGR_H
#include "JSystem/JAudio2/JASGadget.h"
#include "Z2AudioLib/Z2SoundObject.h"
#include "JSystem/JAudio2/JAISoundHandles.h"
#include "dolphin/types.h"
/*