run clang-format

include/JSystem/J2DGraph/J2DScreen/J2DScreen.h

@@ -1,8 +1,6 @@
 #ifndef J2DSCREEN_H_
 #define J2DSCREEN_H_
 
-class J2DScreen {
-
-};
+class J2DScreen {};
 
 #endif

include/JSystem/J3DGraphAnimator/J3DJoint.h

@@ -1,8 +1,6 @@
 #ifndef J3DJOINT_H_
 #define J3DJOINT_H_
 
-struct J3DJoint{
-
-};
+struct J3DJoint {};
 
 #endif

include/JSystem/J3DGraphAnimator/J3DModel.h

@@ -1,8 +1,6 @@
 #ifndef J3DMODEL_H_
 #define J3DMODEL_H_
 
-struct J3DModel{
-
-};
+struct J3DModel {};
 
 #endif

include/JSystem/J3DGraphAnimator/J3DModelData.h

@@ -1,8 +1,6 @@
 #ifndef J3DMODELDATA_H_
 #define J3DMODELDATA_H_
 
-struct J3DModelData{
-
-};
+struct J3DModelData {};
 
 #endif

include/JSystem/J3DGraphAnimator/J3DModelLoader.h

@@ -1,8 +1,6 @@
 #ifndef J3DMODELLOADER_H_
 #define J3DMODELLOADER_H_
 
-struct J3DMaterial{
-
-};
+struct J3DMaterial {};
 
 #endif

include/JSystem/JAudio2/JAISe/JAISe.h

@@ -3,9 +3,9 @@
 
 #include "global.h"
 
-struct  JAISoundID{
+struct JAISoundID {
     u32 soundId;
-    JAISoundID(JAISoundID const &soundIdToSet);
+    JAISoundID(JAISoundID const& soundIdToSet);
 };
 
 #endif

include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h

@@ -3,8 +3,6 @@
 
 #include "global.h"
 
-struct JAISoundHandle{
-
-};
+struct JAISoundHandle {};
 
 #endif

include/JSystem/JKernel/JKRAram/JKRAram.h

@@ -1,8 +1,8 @@
 #ifndef __JKRARAM_H__
 #define __JKRARAM_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRThread/JKRThread.h"
+#include "dolphin/types.h"
 
 // JKRExpandSwitch
 #include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
@@ -13,21 +13,17 @@
 class JKRHeap;
 class JKRAramBlock;
 class JKRAram : public JKRThread {
-  private:
+private:
     JKRAram(u32, u32, long);
     virtual ~JKRAram();
 
     /* vt[03] */ void* run(void); /* override */
-    
-  public:
-    void* getAudioMemory() {
-        return this->mAudioMemoryPtr;
-    }
-    u32 getAudioMemSize() {
-        return this->mAudioMemorySize;
-    }
 
-  private:
+public:
+    void* getAudioMemory() { return this->mAudioMemoryPtr; }
+    u32 getAudioMemSize() { return this->mAudioMemorySize; }
+
+private:
     void* mAudioMemoryPtr;
     u32 mAudioMemorySize;
     void* mGraphMemoryPtr;
@@ -38,20 +34,16 @@ class JKRAram : public JKRThread {
     u32 field_0x9c;
     u32 field_0xa0;
 
-  public:
+public:
     static void create(u32, u32, long, long, long);
     static void checkOkAddress(u8*, u32, JKRAramBlock*, u32);
     static void changeGroupIdIfNeed(u8*, int);
     static void mainRamToAram(u8*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
     static void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
 
-    static JKRAram* getManager() {
-        return lbl_804513C8;
-    }
+    static JKRAram* getManager() { return lbl_804513C8; }
 
-    static JKRAramHeap* getAramHeap() {
-        return getManager()->mAramHeap;
-    }
+    static JKRAramHeap* getAramHeap() { return getManager()->mAramHeap; }
 
     static u8 decideAramGroupId(int groupId) {
         JKRAramHeap* heap;
@@ -64,13 +56,9 @@ class JKRAram : public JKRThread {
         return (u8)groupId;
     }
 
-    static u32 getSZSBufferSize() {
-        return lbl_804508B8;
-    }
+    static u32 getSZSBufferSize() { return lbl_804508B8; }
 
-    void setSZSBufferSize(u32 size) {
-        lbl_804508B8 = size;
-    }
+    void setSZSBufferSize(u32 size) { lbl_804508B8 = size; }
 };
 
 void JKRDecompressFromAramToMainRam(u32, void*, u32, u32, u32, u32*);

include/JSystem/JKernel/JKRAramArchive/JKRAramArchive.h

@@ -1,11 +1,11 @@
 #ifndef __JKRARAMARCHIVE_H__
 #define __JKRARAMARCHIVE_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
+#include "dolphin/types.h"
 
 class JKRAramArchive : public JKRArchive {
-  public:
+public:
     JKRAramArchive(long, JKRArchive::EMountDirection);
     virtual ~JKRAramArchive();
 
@@ -17,7 +17,7 @@ class JKRAramArchive : public JKRArchive {
     /* vt[16] */ void fetchResource(JKRArchive::SDIFileEntry*, u32*);             /* override */
     /* vt[17] */ void fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*); /* override */
 
-  public:
+public:
     static void fetchResource_subroutine(u32, u32, u8*, u32, int);
     static void fetchResource_subroutine(u32, u32, JKRHeap*, int, u8**);
 };

include/JSystem/JKernel/JKRAramBlock/JKRAramBlock.h

@@ -1,35 +1,27 @@
 #ifndef __JKRARAMBLOCK_H__
 #define __JKRARAMBLOCK_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JSupport/JSUList/JSUList.h"
+#include "dolphin/types.h"
 
 class JKRAramHeap;
 class JKRAramBlock {
-  public:
+public:
     JKRAramBlock(u32, u32, u32, u8, bool);
     virtual ~JKRAramBlock();
 
     void allocHead(u32, u8, JKRAramHeap*);
     void allocTail(u32, u8, JKRAramHeap*);
 
-    void* getAddress() {
-        return (void*)this->mAddress;
-    }
+    void* getAddress() { return (void*)this->mAddress; }
 
-    u32 getSize() {
-        return this->mSize;
-    }
+    u32 getSize() { return this->mSize; }
 
-    bool isTempMemory() {
-        return this->mIsTempMemory;
-    }
+    bool isTempMemory() { return this->mIsTempMemory; }
 
-    void newGroupID(u8 groupId) {
-        this->mGroupId = groupId;
-    }
+    void newGroupID(u8 groupId) { this->mGroupId = groupId; }
 
-  public:
+public:
     JSULink<JKRAramBlock> mBlockLink;
     u32 mAddress;
     u32 mSize;

include/JSystem/JKernel/JKRAramHeap/JKRAramHeap.h

@@ -1,18 +1,18 @@
 #ifndef __JKRARAMHEAP_H__
 #define __JKRARAMHEAP_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
+#include "dolphin/types.h"
 #include "global.h"
 
 class JKRAramHeap : public JKRDisposer {
-  public:
+public:
     enum EAllocMode {
         HEAD = 0,
         TAIL = 1,
     };
 
-  public:
+public:
     JKRAramHeap(u32, u32);
     virtual ~JKRAramHeap(void);
 
@@ -23,23 +23,15 @@ class JKRAramHeap : public JKRDisposer {
     void getTotalFreeSize(void);
     void dump(void);
 
-    u8 getCurrentGroupID() {
-        return this->mGroupId;
-    }
+    u8 getCurrentGroupID() { return this->mGroupId; }
 
-    JKRHeap* getMgrHeap() {
-        return this->mHeap;
-    }
+    JKRHeap* getMgrHeap() { return this->mHeap; }
 
-    void lock() {
-        OSLockMutex(&this->mMutex);
-    }
+    void lock() { OSLockMutex(&this->mMutex); }
 
-    void unlock() {
-        OSUnlockMutex(&this->mMutex);
-    }
+    void unlock() { OSUnlockMutex(&this->mMutex); }
 
-  public:
+public:
     OSMutex mMutex;
     JKRHeap* mHeap;
     u32 field_0x34;

include/JSystem/JKernel/JKRAramPiece/JKRAramPiece.h

@@ -4,14 +4,14 @@
 #include "dolphin/types.h"
 
 class JKRAMCommand {
-  public:
+public:
     JKRAMCommand(void);
     ~JKRAMCommand();
 };
 
 class JKRAramBlock;
 class JKRAramPiece {
-  public:
+public:
     static void prepareCommand(int, u32, u32, u32, JKRAramBlock*, void (*)(u32));
     static void sendCommand(JKRAMCommand*);
 

include/JSystem/JKernel/JKRAramStream/JKRAramStream.h

@@ -1,16 +1,16 @@
 #ifndef __JKRARAMSTREAM_H__
 #define __JKRARAMSTREAM_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRThread/JKRThread.h"
 #include "JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h"
 #include "JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h"
+#include "dolphin/types.h"
 
 class JKRAramStreamCommand {
-  public:
+public:
     JKRAramStreamCommand();
 
-  public:
+public:
     u32 field_0x00;
     u32 field_0x04;
     u32 field_0x08;
@@ -31,13 +31,13 @@ class JKRAramStreamCommand {
 };
 
 class JKRAramStream : public JKRThread {
-  private:
+private:
     JKRAramStream(long);
     virtual ~JKRAramStream();
 
     /* vt[03] */ void* run(void); /* override */
 
-  public:
+public:
     static void create(long);
 
     static void readFromAram(void);

include/JSystem/JKernel/JKRArchive/JKRArchive.h

@@ -1,68 +1,59 @@
 #ifndef __JKRARCHIVEPUB_H__
 #define __JKRARCHIVEPUB_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRFileLoader/JKRFileLoader.h"
+#include "dolphin/types.h"
 
 class JKRHeap;
 class JKRDvdFile;
 class JKRArchive : public JKRFileLoader {
-  public:
+public:
     class SDirEntry {};
     class SDIFileEntry {};
 
     enum EMountMode {
         UNKNOWN_MOUNT_MODE = 0,
-        MEM                = 1,
-        ARAM               = 2,
-        DVD                = 3,
-        COMP               = 4,
+        MEM = 1,
+        ARAM = 2,
+        DVD = 3,
+        COMP = 4,
 
         __EMOUNT_MODE_PADDING_FOR_32BIT = 0xFFFFFFFF
     };
 
     enum EMountDirection {
         UNKNOWN_MOUNT_DIRECTION = 0,
-        HEAD                    = 1,
-        TAIL                    = 2,
+        HEAD = 1,
+        TAIL = 2,
 
         __EMOUNT_DIRECTION_PADDING_FOR_32BIT = 0xFFFFFFFF
     };
 
     class CArcName {
-      public:
-        CArcName() {
-        }
-        CArcName(char const* data) {
-            this->store(data);
-        }
-        CArcName(char const** data, char endChar) {
-            *data = this->store(*data, endChar);
-        }
+    public:
+        CArcName() {}
+        CArcName(char const* data) { this->store(data); }
+        CArcName(char const** data, char endChar) { *data = this->store(*data, endChar); }
 
         void store(char const* data);
         const char* store(char const* data, char endChar);
 
-        u16 getHash() {
-            return mHash;
-        }
-        
-        const char* getString() {
-            return mData;
-        }
+        u16 getHash() { return mHash; }
 
-      private:
+        const char* getString() { return mData; }
+
+    private:
         u16 mHash;
         u16 mLength;
         char mData[64];
     };
 
-  protected:
+protected:
     JKRArchive();
     JKRArchive(long, EMountMode);
     virtual ~JKRArchive();
 
-  public:
+public:
     bool getDirEntry(SDirEntry*, u32) const;
     void getIdxResource(u32);
     void getResource(unsigned short);
@@ -80,7 +71,7 @@ class JKRArchive : public JKRFileLoader {
     void findPtrResource(void const*) const;
     void findIdResource(unsigned short) const;
 
-  public:
+public:
     /* vt[04] */ virtual void becomeCurrent(char const*);                 /* override */
     /* vt[05] */ virtual void getResource(char const*);                   /* override */
     /* vt[06] */ virtual void getResource(u32, char const*);              /* override */
@@ -93,12 +84,12 @@ class JKRArchive : public JKRFileLoader {
     /* vt[13] */ virtual void countFile(char const*) const;               /* override */
     /* vt[14] */ virtual void getFirstFile(char const*) const;            /* override */
     /* vt[15] */ virtual void getExpandedResSize(void const*) const;
-    /* vt[16] */ virtual void fetchResource(SDIFileEntry*, u32)              = 0;
+    /* vt[16] */ virtual void fetchResource(SDIFileEntry*, u32) = 0;
     /* vt[17] */ virtual void fetchResource(void*, u32, SDIFileEntry*, u32*) = 0;
     /* vt[18] */ virtual void setExpandSize(SDIFileEntry*, u32);
     /* vt[19] */ virtual void getExpandSize(SDIFileEntry*) const;
 
-  private:
+private:
     JKRHeap* mHeap;
     EMountMode mMountMode;
     int mEntryNum;
@@ -113,7 +104,7 @@ class JKRArchive : public JKRFileLoader {
     u32 field_0x64;
     JKRDvdFile* mDvdFile;
 
-  public:
+public:
     static void check_mount_already(long, JKRHeap*);
     static void mount(char const*, EMountMode, JKRHeap*, EMountDirection);
     static void mount(void*, JKRHeap*, EMountDirection);

include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h

@@ -1,15 +1,15 @@
 #ifndef __JKRASSERTHEAP_H__
 #define __JKRASSERTHEAP_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
+#include "dolphin/types.h"
 
 class JKRAssertHeap : public JKRHeap {
-  protected:
+protected:
     JKRAssertHeap(void*, unsigned long, JKRHeap*, bool);
     virtual ~JKRAssertHeap();
 
-  public:
+public:
     /* vt[04] */ virtual u32 getHeapType(void);           /* override */
     /* vt[05] */ virtual bool check(void);                /* override */
     /* vt[06] */ virtual bool dump(void);                 /* override */
@@ -28,7 +28,7 @@ class JKRAssertHeap : public JKRHeap {
     /* vt[19] */ virtual u8 do_changeGroupID(u8 param_1); /* override */
     /* vt[20] */ virtual u8 do_getCurrentGroupId(void);   /* override */
 
-  public:
+public:
     static void create(JKRHeap*);
 };
 

include/JSystem/JKernel/JKRCompArchive/JKRCompArchive.h

@@ -1,11 +1,11 @@
 #ifndef __JKRCOMPARCHIVE_H__
 #define __JKRCOMPARCHIVE_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
+#include "dolphin/types.h"
 
 class JKRCompArchive : public JKRArchive {
-  public:
+public:
     JKRCompArchive(long, JKRArchive::EMountDirection);
     virtual ~JKRCompArchive();
 
@@ -18,7 +18,7 @@ class JKRCompArchive : public JKRArchive {
     /* vt[16] */ void fetchResource(JKRArchive::SDIFileEntry*, u32*);             /* override */
     /* vt[17] */ void fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*); /* override */
 
-  public:
+public:
 };
 
 #endif

include/JSystem/JKernel/JKRDecomp/JKRDecomp.h

@@ -1,23 +1,23 @@
 #ifndef __JKRDECOMP_H__
 #define __JKRDECOMP_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRThread/JKRThread.h"
+#include "dolphin/types.h"
 
 class JKRDecompCommand {
-  public:
+public:
     JKRDecompCommand();
     ~JKRDecompCommand();
 };
 
 class JKRDecomp : public JKRThread {
-  private:
+private:
     JKRDecomp(long);
     virtual ~JKRDecomp(void);
 
     /* vt[03] */ virtual void* run(); /* override */
 
-  public:
+public:
     static void create(long);
     static void prepareCommand(u8*, u8*, u32, u32, void (*)(u32));
     static void sendCommand(JKRDecompCommand*);

include/JSystem/JKernel/JKRDisposer/JKRDisposer.h

@@ -1,16 +1,16 @@
 #ifndef __JKRDISPOSER_H__
 #define __JKRDISPOSER_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JSupport/JSUList/JSUList.h"
+#include "dolphin/types.h"
 
 class JKRHeap;
 class JKRDisposer {
-  public:
+public:
     JKRDisposer();
     virtual ~JKRDisposer();
 
-  public:
+public:
     JKRHeap* mHeap;
     JSULink<JKRDisposer> mLink;
 };

include/JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h

@@ -1,19 +1,19 @@
 #ifndef __JKRDVDARAMRIPPER_H__
 #define __JKRDVDARAMRIPPER_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
 #include "JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h"
+#include "dolphin/types.h"
 
 class JKRADCommand {
-  public:
+public:
     JKRADCommand();
     ~JKRADCommand();
 };
 
 class JKRDvdFile;
 class JKRDvdAramRipper {
-  public:
+public:
     static void loadToAram(long, u32, JKRExpandSwitch, u32, u32, u32*);
     static void loadToAram(JKRDvdFile*, u32, JKRExpandSwitch, u32, u32, u32*);
     static void loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32, u32, u32*);

include/JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h

@@ -1,21 +1,22 @@
 #ifndef __JKRDVDARCHIVE_H__
 #define __JKRDVDARCHIVE_H__
 
-#include "dolphin/types.h"
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
+#include "dolphin/types.h"
 
 class JKRDvdArchive : public JKRArchive {
-  public:
+public:
     JKRDvdArchive(long, JKRArchive::EMountDirection);
     virtual ~JKRDvdArchive();
 
     void open(long);
 
-    /* vt[15] */ virtual void getExpandedResSize(void const*) const;                      /* override */
-    /* vt[16] */ virtual void fetchResource(JKRArchive::SDIFileEntry*, u32*);             /* override */
-    /* vt[17] */ virtual void fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*); /* override */
+    /* vt[15] */ virtual void getExpandedResSize(void const*) const;          /* override */
+    /* vt[16] */ virtual void fetchResource(JKRArchive::SDIFileEntry*, u32*); /* override */
+    /* vt[17] */ virtual void fetchResource(void*, u32, JKRArchive::SDIFileEntry*,
+                                            u32*); /* override */
 
-  public:
+public:
     static void fetchResource_subroutine(long, u32, u32, u8*, u32, int, int);
     static void fetchResource_subroutine(long, u32, u32, JKRHeap*, int, int, u8**);
 };