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
+5 -3
View File
@@ -3,12 +3,14 @@
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "JSystem/JUtility/JUTNameTab.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "dolphin/gx/GX.h"
#include "dolphin/os/OS.h"
#include "dolphin/types.h"
#include "global.h"
typedef struct _GXColor GXColor;
typedef struct _GXColorS10 GXColorS10;
class J2DScreen;
class JUTPalette;
struct ResTIMG;
enum J2DAnmKind {
KIND_TRANSFORM = 0,
-1
View File
@@ -2,7 +2,6 @@
#define J2DANMLOADER_H
#include "JSystem/J2DGraph/J2DAnimation.h"
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "dolphin/types.h"
struct J2DAnmLoaderDataBase {
+2 -1
View File
@@ -1,9 +1,10 @@
#ifndef J2DMANAGE_H
#define J2DMANAGE_H
#include "JSystem/JSupport/JSUInputStream.h"
#include "dolphin/types.h"
class JSUInputStream;
struct J2DResReference {
/* 0x00 */ u16 mCount;
/* 0x02 */ u16 mOffsets[1];
+9 -2
View File
@@ -2,11 +2,18 @@
#define J2DMATBLOCK_H
#include "JSystem/J2DGraph/J2DTevs.h"
#include "JSystem/JUtility/JUTResFont.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "JSystem/JUtility/TColor.h"
#include "dolphin/gx/GXStruct.h"
#include "dolphin/types.h"
class JUTFont;
class JUTPalette;
class JUTResFont;
class JUTTexture;
struct ResFONT;
struct ResTIMG;
struct ResTLUT;
struct J2DGXColorS10 : public GXColorS10 {
/* 802F1B90 */ J2DGXColorS10();
};
-1
View File
@@ -3,7 +3,6 @@
#include "JSystem/J2DGraph/J2DAnimation.h"
#include "JSystem/J2DGraph/J2DMatBlock.h"
#include "dolphin/gx/GX.h"
#include "dolphin/types.h"
class J2DMaterial {
+15 -5
View File
@@ -2,16 +2,26 @@
#define J2DMATERIALFACTORY_H
#include "JSystem/J2DGraph/J2DManage.h"
#include "JSystem/J2DGraph/J2DMaterial.h"
#include "JSystem/JKernel/JKRArchive.h"
#include "dolphin/gx/GXEnum.h"
#include "dolphin/types.h"
struct J2DMaterialBlock {};
struct J2DMaterialInitData;
struct J2DIndInitData;
struct J2DTevSwapModeTableInfo;
typedef struct _GXColor GXColor;
typedef struct _GXColorS10 GXColorS10;
struct J2DAlphaCompInfo;
struct J2DBlendInfo;
struct J2DColorChanInfo;
struct J2DIndInitData;
class J2DMaterial;
struct J2DMaterialInitData;
struct J2DTevStageInfo;
struct J2DTevSwapModeTableInfo;
struct J2DTevSwapModeInfo;
struct J2DTevOrderInfo;
struct J2DTexCoordInfo;
struct J2DTexMtxInfo;
class JKRArchive;
class J2DMaterialFactory {
public:
+14 -7
View File
@@ -1,19 +1,26 @@
#ifndef J2DPANE_H
#define J2DPANE_H
#include "JSystem/J2DGraph/J2DAnimation.h"
#include "JSystem/J2DGraph/J2DGrafContext.h"
#include "JSystem/JGeometry.h"
#include "JSystem/JKernel/JKRArchive.h"
#include "JSystem/JSupport/JSUList.h"
#include "JSystem/JSupport/JSURandomInputStream.h"
#include "JSystem/JUtility/JUTFont.h"
#include "JSystem/JUtility/JUTResFont.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "dolphin/gx/GXEnum.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/types.h"
class J2DAnmBase;
class J2DAnmColor;
class J2DAnmTransform;
class J2DAnmTevRegKey;
class J2DAnmTextureSRTKey;
class J2DAnmVisibilityFull;
class J2DAnmVtxColor;
class J2DGrafContext;
class J2DScreen;
class J2DAnmTexPattern;
class JKRArchive;
class JSURandomInputStream;
struct ResFONT;
struct ResTIMG;
enum J2DRotateAxis {
/* 0x78 */ ROTATE_X = 'x',
+8 -2
View File
@@ -2,10 +2,16 @@
#define J2DPICTURE_H
#include "JSystem/J2DGraph/J2DPane.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "JSystem/JUtility/TColor.h"
#include "dolphin/gx/GXEnum.h"
#include "dolphin/types.h"
class J2DMaterial;
class JUTPalette;
class JUTTexture;
struct ResTIMG;
struct ResTLUT;
enum J2DMirror {
/* 0x0 */ MIRROR0, // temp, figure out later
};
+4 -1
View File
@@ -1,10 +1,13 @@
#ifndef J2DPICTUREEX_H
#define J2DPICTUREEX_H
#include "JSystem/J2DGraph/J2DMaterial.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "JSystem/J2DGraph/J2DTevs.h"
#include "dolphin/gx/GXEnum.h"
#include "dolphin/types.h"
class J2DMaterial;
class J2DPictureEx : public J2DPicture {
public:
enum stage_enum {};
+2
View File
@@ -6,6 +6,8 @@
#include "Runtime.PPCEABI.H/__va_arg.h"
#include "dolphin/types.h"
class JUTFont;
class J2DPrint {
public:
struct TSize {
+4 -2
View File
@@ -2,11 +2,13 @@
#define J2DSCREEN_H
#include "JSystem/J2DGraph/J2DManage.h"
#include "JSystem/J2DGraph/J2DMaterial.h"
#include "JSystem/J2DGraph/J2DPane.h"
#include "JSystem/JUtility/JUTNameTab.h"
#include "JSystem/JUtility/TColor.h"
#include "dolphin/types.h"
class J2DMaterial;
class JUTNameTab;
struct J2DScrnHeader {
/* 0x00 */ u32 mTag;
/* 0x04 */ u32 mType;
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef J2DTEVS_H
#define J2DTEVS_H
#include "dolphin/gx/GX.h"
#include "dolphin/gx/GXEnum.h"
#include "dolphin/mtx/mtxvec.h"
#include "dolphin/types.h"
+3
View File
@@ -5,6 +5,9 @@
#include "JSystem/J2DGraph/J2DPane.h"
#include "dolphin/types.h"
class J2DMaterial;
class JUTFont;
enum J2DTextBoxVBinding {
/* 0x0 */ VBIND_CENTER,
/* 0x1 */ VBIND_BOTTOM,
+3 -2
View File
@@ -1,11 +1,12 @@
#ifndef J2DTEXTBOXEX_H
#define J2DTEXTBOXEX_H
#include "JSystem/J2DGraph/J2DMaterial.h"
#include "JSystem/J2DGraph/J2DPrint.h"
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "dolphin/gx/GXEnum.h"
#include "dolphin/types.h"
class J2DMaterial;
class J2DTextBoxEx : public J2DTextBox {
public:
enum stage_enum {
+3 -1
View File
@@ -3,9 +3,11 @@
#include "JSystem/J2DGraph/J2DMaterial.h"
#include "JSystem/J2DGraph/J2DPane.h"
#include "JSystem/JSupport/JSURandomInputStream.h"
#include "dolphin/types.h"
class JSURandomInputStream;
class JUTTexture;
class J2DWindow : public J2DPane {
public:
struct TMaterial {
+1
View File
@@ -3,6 +3,7 @@
#include "JSystem/J2DGraph/J2DMaterial.h"
#include "JSystem/J2DGraph/J2DWindow.h"
#include "dolphin/gx/GXEnum.h"
#include "dolphin/types.h"
class J2DWindowEx : public J2DWindow {