Skip to content

Commit f08fa82

Browse files
AdventureTAdventureT
committed
Format code
1 parent dad84e1 commit f08fa82

File tree

7 files changed

+36
-39
lines changed

7 files changed

+36
-39
lines changed

‎OpenJPOG/Source/GUI/AGUISystem.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class AGUISystem : public Toshi::TTask
2424
static AGUISystem *TOSHI_API GetGUISystem();
2525

2626
private:
27-
Toshi::TGUIInterface *m_pGUIInterface; // 0x24
27+
Toshi::TGUIInterface *m_pGUIInterface; // 0x24
2828
PGUITRDisplayContext *m_pDisplayContext; // 0xA4
29-
PGUITRTextureFactory *m_pTextureFactory; // 0xA8
30-
PGUITRFontFactory *m_pFontFactory; // 0xAC
31-
Toshi::TNullResource *m_pNullResource; // 0x140
29+
PGUITRTextureFactory *m_pTextureFactory; // 0xA8
30+
PGUITRFontFactory *m_pFontFactory; // 0xAC
31+
Toshi::TNullResource *m_pNullResource; // 0x140
3232
};

‎Toshi/Include/TGUI/TGUITextureFactory.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ class TGUIINTERFACE_EXPORTS TGUITextureFactory : public TObject
99
DECLARE_DYNAMIC(TGUITextureFactory)
1010
};
1111

12-
TOSHI_NAMESPACE_END
12+
TOSHI_NAMESPACE_END

‎Toshi/Include/TGui/TGUIDeserialisable.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class TGUIINTERFACE_EXPORTS TGUIDeserialisable : public TObject
1212

1313
public:
1414
static TGUIDeserialisable *TOSHI_API Create(TGUIInterface *a_pInterface, const PProperties *a_pProperties);
15-
15+
1616
TBOOL ValidateProperty(const TPCString &a_rPropName, const PPropertyValue &a_rValue);
1717
};
1818

‎Toshi/Include/TGui/TGUIDisplayContext.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class TGUIINTERFACE_EXPORTS TGUIDisplayContext : public TObject
1818
public:
1919
virtual void PushClip(int a_iMinX, int a_iMinY, int a_MaxX, int a_iMaxY);
2020
virtual void PopClip();
21-
virtual void PushRotation(float a_fRotation, int a_iX, int a_iY) = 0;
22-
virtual void PushRotation(float a_fRotation) ;
21+
virtual void PushRotation(float a_fRotation, int a_iX, int a_iY) = 0;
22+
virtual void PushRotation(float a_fRotation);
2323
virtual void PushScale(float a_fYaw, float a_fPitch) = 0;
2424
virtual void PopTransform() = 0;
2525
virtual void PushModulateColour(const TGUIColour &m_rColour) = 0;
@@ -36,7 +36,7 @@ class TGUIINTERFACE_EXPORTS TGUIDisplayContext : public TObject
3636
virtual void DrawLabel(const TGUIRectangle &a_rRectangle, const TGUIFont *m_pFont, const TGUIColour &m_rColour, const TLString &a_rLabel, const TGUIRectangle &a_rRectangle2) = 0;
3737
virtual void DrawLabel(const TGUIRectangle &a_rRectangle, const TGUIFont *m_pFont, const TGUIColour &m_rColour, const TLString &a_rLabel) = 0;
3838
virtual void DrawLabel(const TGUIRectangle &a_rRectangle, const TGUIFont *m_pFont, const TGUIColour &m_rColour, const TWString &a_rLabel, bool) = 0;
39-
virtual void DrawFormattedText(const TGUIFormattedText &a_rFormattedText, int a_iX, int a_iY, int a_iWidth, int a_iHeight) ;
39+
virtual void DrawFormattedText(const TGUIFormattedText &a_rFormattedText, int a_iX, int a_iY, int a_iWidth, int a_iHeight);
4040

4141
protected:
4242
virtual void Imp_DrawTextureSection(const TGUITextureSection *a_rTextureSection, const TGUIColour &m_rColour, int a_iX, int a_iY, int a_iWidth, int a_iHeight, TGUIAlignment a_eAlignW, TGUIAlignment a_eAlignH) = 0;

‎Toshi/Plugins/Include/PGUIRenderer/PGUITRDisplayContext.h‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,28 @@ class PGUIRENDERER_EXPORTS PGUITRDisplayContext : Toshi::TGUIDisplayContext
1515

1616

1717
public:
18-
virtual void PushRotation(float a_fRotation, int a_iX, int a_iY) ;
19-
virtual void PushScale(float a_fYaw, float a_fPitch) ;
20-
virtual void PopTransform() ;
21-
virtual void PushModulateColour(const Toshi::TGUIColour & m_rColour);
22-
virtual void PopModulateColour() ;
23-
virtual void PushAdditiveColour(const Toshi::TGUIColour &m_rColour) ;
24-
virtual void PopAdditiveColour() ;
25-
virtual void BeginScene() ;
26-
virtual void EndScene() ;
27-
virtual void BeginPostpone() ;
28-
virtual void EndPostpone() ;
29-
virtual void DrawPostpone() ;
30-
virtual void DrawLine(int a_iX1, int a_iY1, int a_iX2, int a_iY2, const Toshi::TGUIColour &m_rColour) ;
31-
virtual void DrawTexturePie(const Toshi::TGUITextureSection &a_rTextureSection, const Toshi::TGUIColour &m_rColour, int a_iX, int a_iY, float a_fStartAngle, float m_fEndAngle) ;
18+
virtual void PushRotation(float a_fRotation, int a_iX, int a_iY);
19+
virtual void PushScale(float a_fYaw, float a_fPitch);
20+
virtual void PopTransform();
21+
virtual void PushModulateColour(const Toshi::TGUIColour &m_rColour);
22+
virtual void PopModulateColour();
23+
virtual void PushAdditiveColour(const Toshi::TGUIColour &m_rColour);
24+
virtual void PopAdditiveColour();
25+
virtual void BeginScene();
26+
virtual void EndScene();
27+
virtual void BeginPostpone();
28+
virtual void EndPostpone();
29+
virtual void DrawPostpone();
30+
virtual void DrawLine(int a_iX1, int a_iY1, int a_iX2, int a_iY2, const Toshi::TGUIColour &m_rColour);
31+
virtual void DrawTexturePie(const Toshi::TGUITextureSection &a_rTextureSection, const Toshi::TGUIColour &m_rColour, int a_iX, int a_iY, float a_fStartAngle, float m_fEndAngle);
3232
virtual void DrawLabel(const Toshi::TGUIRectangle &a_rRectangle, const Toshi::TGUIFont *m_pFont, const Toshi::TGUIColour &m_rColour, const Toshi::TLString &a_rLabel, const Toshi::TGUIRectangle &a_rRectangle2);
33-
virtual void DrawLabel(const Toshi::TGUIRectangle &a_rRectangle, const Toshi::TGUIFont *m_pFont, const Toshi::TGUIColour &m_rColour, const Toshi::TLString &a_rLabel) ;
34-
virtual void DrawLabel(const Toshi::TGUIRectangle &a_rRectangle, const Toshi::TGUIFont *m_pFont, const Toshi::TGUIColour &m_rColour, const Toshi::TWString &a_rLabel, bool) ;
33+
virtual void DrawLabel(const Toshi::TGUIRectangle &a_rRectangle, const Toshi::TGUIFont *m_pFont, const Toshi::TGUIColour &m_rColour, const Toshi::TLString &a_rLabel);
34+
virtual void DrawLabel(const Toshi::TGUIRectangle &a_rRectangle, const Toshi::TGUIFont *m_pFont, const Toshi::TGUIColour &m_rColour, const Toshi::TWString &a_rLabel, bool);
3535

3636
protected:
3737
virtual void Imp_DrawTextureSection(const Toshi::TGUITextureSection *a_rTextureSection, const Toshi::TGUIColour &m_rColour, int a_iX, int a_iY, int a_iWidth, int a_iHeight, Toshi::TGUIAlignment a_eAlignW, Toshi::TGUIAlignment a_eAlignH);
38-
virtual void Imp_DrawFilledRectangle(int a_iX, int a_iY, int a_iWidth, int a_iHeight, const Toshi::TGUIColour &m_rColour) ;
39-
virtual void Imp_DrawOutlineRectangle(int a_iX, int a_iY, int a_iWidth, int a_iHeight, const Toshi::TGUIColour &m_rColour) ;
38+
virtual void Imp_DrawFilledRectangle(int a_iX, int a_iY, int a_iWidth, int a_iHeight, const Toshi::TGUIColour &m_rColour);
39+
virtual void Imp_DrawOutlineRectangle(int a_iX, int a_iY, int a_iWidth, int a_iHeight, const Toshi::TGUIColour &m_rColour);
4040

4141
public:
4242
Toshi::TRenderInterface *GetRenderInterface() const
@@ -45,7 +45,7 @@ class PGUIRENDERER_EXPORTS PGUITRDisplayContext : Toshi::TGUIDisplayContext
4545
}
4646

4747
private:
48-
Toshi::TManagedPtr<Toshi::TRenderInterface> m_MPRenderer; // 0x210
48+
Toshi::TManagedPtr<Toshi::TRenderInterface> m_MPRenderer; // 0x210
4949
PGUITRTextureFactory *m_pTextureFactory; // 0x214
50-
PGUITRFontFactory *m_pFontFactory; // 0x218
51-
};
50+
PGUITRFontFactory *m_pFontFactory; // 0x218
51+
};

‎Toshi/Plugins/Include/PGUIRenderer/PGUITRTextureFactory.h‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ class PGUIRENDERER_EXPORTS PGUITRTextureFactory : public Toshi::TGUITextureFacto
88
DECLARE_DYNAMIC(PGUITRTextureFactory)
99

1010
public:
11-
1211
enum TextureFlag
1312
{
1413

@@ -17,14 +16,12 @@ class PGUIRENDERER_EXPORTS PGUITRTextureFactory : public Toshi::TGUITextureFacto
1716
class Texture
1817
{
1918
public:
20-
2119
Texture(const Toshi::TPCString &a_rName, PGUITRTextureFactory *a_pTextureFactory, TBOOL a_bValidate)
2220
{
2321
m_sName = a_rName;
2422
m_pTextureFactory = a_pTextureFactory;
2523
m_iWidth = -1;
2624
m_iHeight = -1;
27-
2825
}
2926

3027
TBOOL GetFlag(TextureFlag a_eFlag) const
@@ -35,7 +32,7 @@ class PGUIRENDERER_EXPORTS PGUITRTextureFactory : public Toshi::TGUITextureFacto
3532
{
3633
return m_iHeight;
3734
}
38-
const Toshi::TPCString& GetName() const
35+
const Toshi::TPCString &GetName() const
3936
{
4037
return m_sName;
4138
}
@@ -62,10 +59,10 @@ class PGUIRENDERER_EXPORTS PGUITRTextureFactory : public Toshi::TGUITextureFacto
6259
}
6360

6461
private:
65-
Toshi::TPCString m_sName; // 0x0
62+
Toshi::TPCString m_sName; // 0x0
6663
PGUITRTextureFactory *m_pTextureFactory; // 0x4
67-
TINT m_iWidth; // 0x10
68-
TINT m_iHeight; // 0x14
69-
TUINT m_eFlags; // 0x18
64+
TINT m_iWidth; // 0x10
65+
TINT m_iHeight; // 0x14
66+
TUINT m_eFlags; // 0x18
7067
};
7168
};

‎Toshi/Source/TGui/TGUIDisplayContext.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ void TGUIDisplayContext::DrawFormattedText(const TGUIFormattedText &a_rFormatted
2020
{
2121
}
2222

23-
TOSHI_NAMESPACE_END
23+
TOSHI_NAMESPACE_END

0 commit comments

Comments
 (0)