Skip to content

Commit a3fc415

Browse files
committed
Un-namespace change - this is very bad on the CC source side
1 parent abd878c commit a3fc415

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+89
-89
lines changed

Editor/GUIEditorApp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
using namespace RTE;
2828

2929

30-
namespace GUI {
3130
AllegroScreen *g_Screen;
3231
AllegroInput *g_Input;
3332

3433
extern GUIEditorApp g_GUIEditor;
34+
namespace RTE {
3535

3636
#define ROOTORIGINX 300
3737
#define ROOTORIGINY 120

Editor/GUIEditorLib.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <commdlg.h>
55
#include <direct.h>
66

7-
namespace GUI {
7+
namespace RTE {
88

99
HINSTANCE g_hInstance = 0;
1010
HWND g_hWnd = 0;

Editor/GUIEditorLib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _GUIEDITORLIB_
22
#define _GUIEDITORLIB_
33

4-
namespace GUI {
4+
namespace RTE {
55

66
/// <summary>
77
/// GUI Editor Library class with static functions to handle windows calls

GUILibrary/Include/GUIBanner.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct BITMAP;
1919
#define MAXBANNERFONTCHARS 256
2020

2121
using namespace RTE;
22-
namespace GUI
22+
namespace RTE
2323
{
2424

2525

@@ -324,6 +324,6 @@ class GUIBanner {
324324
Timer m_FrameTimer;
325325
};
326326

327-
}; // namespace GUI
327+
}; // namespace RTE
328328

329329
#endif // _GUIBanner_

GUILibrary/Include/GUIButton.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// www.shplorb.com/~jackal
1212

1313

14-
namespace GUI
14+
namespace RTE
1515
{
1616

1717

@@ -267,7 +267,7 @@ class GUIButton :
267267
};
268268

269269

270-
}; // namespace GUI
270+
}; // namespace RTE
271271

272272

273273
#endif // _GUIBUTTON_

GUILibrary/Include/GUICheckbox.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// www.shplorb.com/~jackal
1212

1313

14-
namespace GUI
14+
namespace RTE
1515
{
1616

1717

@@ -264,7 +264,7 @@ class GUICheckbox :
264264
};
265265

266266

267-
}; // namespace GUI
267+
}; // namespace RTE
268268

269269

270270
#endif // _GUICHECKBOX_

GUILibrary/Include/GUICollectionBox.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// www.shplorb.com/~jackal
1212

1313

14-
namespace GUI
14+
namespace RTE
1515
{
1616

1717

@@ -293,7 +293,7 @@ class GUICollectionBox :
293293
};
294294

295295

296-
}; // namespace GUI
296+
}; // namespace RTE
297297

298298

299299
#endif // _GUICOLLECTIONBOX_

GUILibrary/Include/GUIComboBox.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "GUIListPanel.h"
1919

2020

21-
namespace GUI
21+
namespace RTE
2222
{
2323

2424

@@ -533,7 +533,7 @@ class GUIComboBoxButton :
533533
};
534534

535535

536-
}; // namespace GUI
536+
}; // namespace RTE
537537

538538

539539
#endif // _GUICOMBOBOX_

GUILibrary/Include/GUIControl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "Writer.h"
1818

1919
using namespace RTE;
20-
namespace GUI
20+
namespace RTE
2121
{
2222

2323

@@ -346,7 +346,7 @@ class GUIControl {
346346
};
347347

348348

349-
}; // namespace GUI
349+
}; // namespace RTE
350350

351351

352352
#endif // _GUICONTROL_

GUILibrary/Include/GUIControlFactory.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// www.shplorb.com/~jackal
1212

1313

14-
namespace GUI
14+
namespace RTE
1515
{
1616

1717
//////////////////////////////////////////////////////////////////////////////////////////
@@ -52,7 +52,7 @@ class GUIControlFactory {
5252
};
5353

5454

55-
}; // namespace GUI
55+
}; // namespace RTE
5656

5757

5858
#endif // _GUICONTROLFACTORY_

0 commit comments

Comments
 (0)