Skip to content

Commit e7ad3fb

Browse files
Xottab-DUTYXottab-DUTY
committed
xrGame/UIXmlInit.h: cleanup
1 parent b94fc3d commit e7ad3fb

File tree

2 files changed

+1
-215
lines changed

2 files changed

+1
-215
lines changed

‎src/xrGame/ui/UIXmlInit.cpp‎

Lines changed: 1 addition & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -24,66 +24,9 @@
2424
#include "UITabButtonMP.h"
2525
#include "xrUICore/Lines/UILines.h"
2626

27-
CUIXmlInit::CUIXmlInit() : baseClass() {}
27+
CUIXmlInit::CUIXmlInit() : CUIXmlInitBase() {}
2828
CUIXmlInit::~CUIXmlInit() {}
2929

30-
Frect CUIXmlInit::GetFRect(CUIXml& xml_doc, LPCSTR path, int index)
31-
{
32-
return baseClass::GetFRect(xml_doc, path, index);
33-
}
34-
35-
bool CUIXmlInit::InitWindow(CUIXml& xml_doc, LPCSTR path, int index, CUIWindow* pWnd)
36-
{
37-
return baseClass::InitWindow(xml_doc, path, index, pWnd);
38-
}
39-
40-
//////////////////////////////////////////////////////////////////////////
41-
42-
bool CUIXmlInit::InitFrameWindow(CUIXml& xml_doc, LPCSTR path, int index, CUIFrameWindow* pWnd)
43-
{
44-
return baseClass::InitFrameWindow(xml_doc, path, index, pWnd);
45-
}
46-
47-
bool CUIXmlInit::InitOptionsItem(CUIXml& xml_doc, LPCSTR path, int index, CUIOptionsItem* pWnd)
48-
{
49-
return baseClass::InitOptionsItem(xml_doc, path, index, pWnd);
50-
}
51-
52-
bool CUIXmlInit::InitStatic(CUIXml& xml_doc, LPCSTR path, int index, CUIStatic* pWnd)
53-
{
54-
return baseClass::InitStatic(xml_doc, path, index, pWnd);
55-
}
56-
57-
bool CUIXmlInit::InitTextWnd(CUIXml& xml_doc, LPCSTR path, int index, CUITextWnd* pWnd)
58-
{
59-
return baseClass::InitTextWnd(xml_doc, path, index, pWnd);
60-
}
61-
62-
bool CUIXmlInit::InitCheck(CUIXml& xml_doc, LPCSTR path, int index, CUICheckButton* pWnd)
63-
{
64-
return baseClass::InitCheck(xml_doc, path, index, pWnd);
65-
}
66-
67-
bool CUIXmlInit::InitSpin(CUIXml& xml_doc, LPCSTR path, int index, CUICustomSpin* pWnd)
68-
{
69-
return baseClass::InitSpin(xml_doc, path, index, pWnd);
70-
}
71-
72-
bool CUIXmlInit::InitText(CUIXml& xml_doc, LPCSTR path, int index, CUIStatic* pWnd)
73-
{
74-
return baseClass::InitText(xml_doc, path, index, pWnd);
75-
}
76-
77-
bool CUIXmlInit::InitText(CUIXml& xml_doc, LPCSTR path, int index, CUILines* pLines)
78-
{
79-
return baseClass::InitText(xml_doc, path, index, pLines);
80-
}
81-
82-
bool CUIXmlInit::Init3tButton(CUIXml& xml_doc, LPCSTR path, int index, CUI3tButton* pWnd)
83-
{
84-
return baseClass::Init3tButton(xml_doc, path, index, pWnd);
85-
}
86-
8730
bool CUIXmlInit::InitTabButtonMP(CUIXml& xml_doc, LPCSTR path, int index, CUITabButtonMP* pWnd)
8831
{
8932
Init3tButton(xml_doc, path, index, pWnd);
@@ -111,11 +54,6 @@ bool CUIXmlInit::InitTabButtonMP(CUIXml& xml_doc, LPCSTR path, int index, CUITab
11154
return true;
11255
}
11356

114-
bool CUIXmlInit::InitSound(CUIXml& xml_doc, LPCSTR path, int index, CUI3tButton* pWnd)
115-
{
116-
return baseClass::InitSound(xml_doc, path, index, pWnd);
117-
}
118-
11957
bool CUIXmlInit::InitDragDropListEx(CUIXml& xml_doc, LPCSTR path, int index, CUIDragDropListEx* pWnd)
12058
{
12159
R_ASSERT4(xml_doc.NavigateToNode(path, index), "XML node not found", path, xml_doc.m_xml_file_name);
@@ -176,60 +114,6 @@ bool CUIXmlInit::InitDragDropListEx(CUIXml& xml_doc, LPCSTR path, int index, CUI
176114
return true;
177115
}
178116

179-
bool CUIXmlInit::InitProgressBar(CUIXml& xml_doc, LPCSTR path, int index, CUIProgressBar* pWnd)
180-
{
181-
return baseClass::InitProgressBar(xml_doc, path, index, pWnd);
182-
}
183-
184-
bool CUIXmlInit::InitProgressShape(CUIXml& xml_doc, LPCSTR path, int index, CUIProgressShape* pWnd)
185-
{
186-
return baseClass::InitProgressShape(xml_doc, path, index, pWnd);
187-
}
188-
189-
void CUIXmlInit::InitAutoStaticGroup(CUIXml& xml_doc, LPCSTR path, int index, CUIWindow* pParentWnd)
190-
{
191-
baseClass::InitAutoStaticGroup(xml_doc, path, index, pParentWnd);
192-
}
193-
194-
void CUIXmlInit::InitAutoFrameLineGroup(CUIXml& xml_doc, LPCSTR path, int index, CUIWindow* pParentWnd)
195-
{
196-
baseClass::InitAutoFrameLineGroup(xml_doc, path, index, pParentWnd);
197-
}
198-
199-
bool CUIXmlInit::InitFont(CUIXml& xml_doc, LPCSTR path, int index, u32& color, CGameFont*& pFnt)
200-
{
201-
return baseClass::InitFont(xml_doc, path, index, color, pFnt);
202-
}
203-
204-
bool CUIXmlInit::InitTabControl(CUIXml& xml_doc, LPCSTR path, int index, CUITabControl* pWnd)
205-
{
206-
return baseClass::InitTabControl(xml_doc, path, index, pWnd);
207-
}
208-
209-
//////////////////////////////////////////////////////////////////////////
210-
211-
bool CUIXmlInit::InitFrameLine(CUIXml& xml_doc, LPCSTR path, int index, CUIFrameLineWnd* pWnd)
212-
{
213-
return baseClass::InitFrameLine(xml_doc, path, index, pWnd);
214-
}
215-
216-
bool CUIXmlInit::InitCustomEdit(CUIXml& xml_doc, LPCSTR path, int index, CUICustomEdit* pWnd)
217-
{
218-
return baseClass::InitCustomEdit(xml_doc, path, index, pWnd);
219-
}
220-
221-
bool CUIXmlInit::InitEditBox(CUIXml& xml_doc, LPCSTR path, int index, CUIEditBox* pWnd)
222-
{
223-
return baseClass::InitEditBox(xml_doc, path, index, pWnd);
224-
}
225-
226-
//////////////////////////////////////////////////////////////////////////
227-
228-
bool CUIXmlInit::InitAnimatedStatic(CUIXml& xml_doc, LPCSTR path, int index, CUIAnimatedStatic* pWnd)
229-
{
230-
return baseClass::InitAnimatedStatic(xml_doc, path, index, pWnd);
231-
}
232-
233117
bool CUIXmlInit::InitSleepStatic(CUIXml& xml_doc, LPCSTR path, int index, CUISleepStatic* pWnd)
234118
{
235119
R_ASSERT4(xml_doc.NavigateToNode(path, index), "XML node not found", path, xml_doc.m_xml_file_name);
@@ -239,58 +123,6 @@ bool CUIXmlInit::InitSleepStatic(CUIXml& xml_doc, LPCSTR path, int index, CUISle
239123
return true;
240124
}
241125

242-
bool CUIXmlInit::InitTexture(CUIXml& xml_doc, LPCSTR path, int index, ITextureOwner* pWnd)
243-
{
244-
return baseClass::InitTexture(xml_doc, path, index, pWnd);
245-
}
246-
247-
bool CUIXmlInit::InitTextureOffset(CUIXml& xml_doc, LPCSTR path, int index, CUIStatic* pWnd)
248-
{
249-
return baseClass::InitTextureOffset(xml_doc, path, index, pWnd);
250-
}
251-
252-
bool CUIXmlInit::InitMultiTexture(CUIXml& xml_doc, LPCSTR path, int index, CUI3tButton* pWnd)
253-
{
254-
return baseClass::InitMultiTexture(xml_doc, path, index, pWnd);
255-
}
256-
257-
//////////////////////////////////////////////////////////////////////////
258-
259-
bool CUIXmlInit::InitAlignment(CUIXml& xml_doc, const char* path, int index, float& x, float& y, CUIWindow* pWnd)
260-
{
261-
return baseClass::InitAlignment(xml_doc, path, index, x, y, pWnd);
262-
}
263-
264-
//////////////////////////////////////////////////////////////////////////
265-
266-
void CUIXmlInit::InitColorDefs() { baseClass::InitColorDefs(); }
267-
268-
bool CUIXmlInit::InitScrollView(CUIXml& xml_doc, LPCSTR path, int index, CUIScrollView* pWnd)
269-
{
270-
return baseClass::InitScrollView(xml_doc, path, index, pWnd);
271-
}
272-
273-
bool CUIXmlInit::InitListBox(CUIXml& xml_doc, LPCSTR path, int index, CUIListBox* pWnd)
274-
{
275-
return baseClass::InitListBox(xml_doc, path, index, pWnd);
276-
}
277-
278-
bool CUIXmlInit::InitTrackBar(CUIXml& xml_doc, LPCSTR path, int index, CUITrackBar* pWnd)
279-
{
280-
return baseClass::InitTrackBar(xml_doc, path, index, pWnd);
281-
}
282-
283-
bool CUIXmlInit::InitComboBox(CUIXml& xml_doc, LPCSTR path, int index, CUIComboBox* pWnd)
284-
{
285-
return baseClass::InitComboBox(xml_doc, path, index, pWnd);
286-
}
287-
288-
void CUIXmlInit::AssignColor(LPCSTR name, u32 clr) { baseClass::AssignColor(name, clr); }
289-
u32 CUIXmlInit::GetColor(CUIXml& xml_doc, LPCSTR path, int index, u32 def_clr)
290-
{
291-
return baseClass::GetColor(xml_doc, path, index, def_clr);
292-
}
293-
294126
bool CUIXmlInit::InitHintWindow(CUIXml& xml_doc, LPCSTR path, int index, UIHintWindow* pWnd)
295127
{
296128
VERIFY(pWnd);

‎src/xrGame/ui/UIXmlInit.h‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,58 +7,12 @@ class CUITabButtonMP;
77

88
class CUIXmlInit : public CUIXmlInitBase
99
{
10-
using baseClass = CUIXmlInitBase;
1110
public:
1211
CUIXmlInit();
1312
virtual ~CUIXmlInit();
1413

15-
static bool InitWindow(CUIXml& xml_doc, LPCSTR path, int index, CUIWindow* pWnd);
16-
static bool InitFrameWindow(CUIXml& xml_doc, LPCSTR path, int index, CUIFrameWindow* pWnd);
17-
static bool InitFrameLine(CUIXml& xml_doc, LPCSTR path, int index, CUIFrameLineWnd* pWnd);
18-
static bool InitCustomEdit(CUIXml& xml_doc, LPCSTR paht, int index, CUICustomEdit* pWnd);
19-
static bool InitEditBox(CUIXml& xml_doc, LPCSTR paht, int index, CUIEditBox* pWnd);
20-
static bool InitStatic(CUIXml& xml_doc, LPCSTR path, int index, CUIStatic* pWnd);
21-
static bool InitTextWnd(CUIXml& xml_doc, LPCSTR path, int index, CUITextWnd* pWnd);
22-
static bool InitCheck(CUIXml& xml_doc, LPCSTR path, int index, CUICheckButton* pWnd);
23-
static bool InitSpin(CUIXml& xml_doc, LPCSTR path, int index, CUICustomSpin* pWnd);
24-
static bool InitText(CUIXml& xml_doc, LPCSTR path, int index, CUIStatic* pWnd);
25-
static bool InitText(CUIXml& xml_doc, LPCSTR path, int index, CUILines* pLines);
26-
static bool Init3tButton(CUIXml& xml_doc, LPCSTR path, int index, CUI3tButton* pWnd);
2714
static bool InitDragDropListEx(CUIXml& xml_doc, LPCSTR path, int index, CUIDragDropListEx* pWnd);
28-
static bool InitProgressBar(CUIXml& xml_doc, LPCSTR path, int index, CUIProgressBar* pWnd);
29-
static bool InitProgressShape(CUIXml& xml_doc, LPCSTR path, int index, CUIProgressShape* pWnd);
30-
static bool InitFont(CUIXml& xml_doc, LPCSTR path, int index, u32& color, CGameFont*& pFnt);
3115
static bool InitTabButtonMP(CUIXml& xml_doc, LPCSTR path, int index, CUITabButtonMP* pWnd);
32-
static bool InitTabControl(CUIXml& xml_doc, LPCSTR path, int index, CUITabControl* pWnd);
33-
static bool InitAnimatedStatic(CUIXml& xml_doc, LPCSTR path, int index, CUIAnimatedStatic* pWnd);
3416
static bool InitSleepStatic(CUIXml& xml_doc, LPCSTR path, int index, CUISleepStatic* pWnd);
35-
static bool InitTextureOffset(CUIXml& xml_doc, LPCSTR path, int index, CUIStatic* pWnd);
36-
static bool InitSound(CUIXml& xml_doc, LPCSTR path, int index, CUI3tButton* pWnd);
37-
static bool InitMultiTexture(CUIXml& xml_doc, LPCSTR path, int index, CUI3tButton* pWnd);
38-
static bool InitTexture(CUIXml& xml_doc, LPCSTR path, int index, ITextureOwner* pWnd);
39-
static bool InitOptionsItem(CUIXml& xml_doc, LPCSTR paht, int index, CUIOptionsItem* pWnd);
40-
static bool InitScrollView(CUIXml& xml_doc, LPCSTR path, int index, CUIScrollView* pWnd);
41-
static bool InitListBox(CUIXml& xml_doc, LPCSTR path, int index, CUIListBox* pWnd);
42-
static bool InitComboBox(CUIXml& xml_doc, LPCSTR path, int index, CUIComboBox* pWnd);
43-
static bool InitTrackBar(CUIXml& xml_doc, LPCSTR path, int index, CUITrackBar* pWnd);
4417
static bool InitHintWindow(CUIXml& xml_doc, LPCSTR path, int index, UIHintWindow* pWnd);
45-
static Frect GetFRect(CUIXml& xml_doc, LPCSTR path, int index);
46-
static u32 GetColor(CUIXml& xml_doc, LPCSTR path, int index, u32 def_clr);
47-
48-
static bool InitAlignment(CUIXml& xml_doc, const char* path, int index, float& x, float& y, CUIWindow* pWnd);
49-
50-
static void InitAutoStaticGroup(CUIXml& xml_doc, LPCSTR path, int index, CUIWindow* pParentWnd);
51-
static void InitAutoFrameLineGroup(CUIXml& xml_doc, LPCSTR path, int index, CUIWindow* pParentWnd);
52-
53-
// Initialize and store predefined colors
54-
using ColorDefs = baseClass::ColorDefs;
55-
56-
static const ColorDefs* GetColorDefs()
57-
{
58-
baseClass::GetColorDefs();
59-
}
60-
61-
static void InitColorDefs();
62-
static void DeleteColorDefs() { baseClass::DeleteColorDefs(); }
63-
static void AssignColor(LPCSTR name, u32 clr);
6418
};

0 commit comments

Comments
 (0)