Cleaned up reclass code generation type definitions.

Author: ajkhoury

ReClass/DialogEdit.cpp

@@ -87,7 +87,7 @@ BOOL CDialogEdit::Create( LPCTSTR lpszTemplateName, CWnd* pParentWnd )
     return CDialogEx::Create( lpszTemplateName, pParentWnd );
 }
 
-void CDialogEdit::InitialiseEditor( )
+void CDialogEdit::InitializeEditor( )
 {
     // Punt if we already have a window
     if (::IsWindow( m_Edit.GetSafeHwnd( ) ))
@@ -154,7 +154,7 @@ BOOL CDialogEdit::OnInitDialog( )
 
     SetWindowText( Title );
     // Create the Scintilla editor	
-    InitialiseEditor( );
+    InitializeEditor( );
     m_Edit.SetText( Text );
 
     ShowWindow( SW_NORMAL );
@@ -165,7 +165,6 @@ BOOL CDialogEdit::OnInitDialog( )
     return FALSE;  // return TRUE unless you set the focus to a control
 }
 
-
 void CDialogEdit::OnCancel( )
 {
     // Get text

ReClass/DialogEdit.h

@@ -15,14 +15,15 @@ class CDialogEdit : public CDialogEx {
     // Sets a Scintilla style
     void SetStyle( int style, COLORREF fore, COLORREF back = RGB( 255, 255, 255 ), int size = -1, const char* face = 0 );
 
-    void InitialiseEditor( );
+    void InitializeEditor( );
     void SizeEditor( );
 
+    enum { IDD = IDD_DIALOG_EDIT };
+
+protected:
     HWND m_hEditWindow;
     CScintillaEdit m_Edit;
 
-    enum { IDD = IDD_DIALOG_EDIT };
-
 protected:
     virtual void DoDataExchange( CDataExchange* pDX );    // DDX/DDV support
 

ReClass/DialogTypes.cpp

@@ -13,7 +13,6 @@ IMPLEMENT_DYNAMIC( CDialogTypes, CDialogEx )
 CDialogTypes::CDialogTypes( CWnd* pParent /*=NULL*/ )
     : CDialogEx( CDialogTypes::IDD, pParent )
 {
-
 }
 
 CDialogTypes::~CDialogTypes( )
@@ -27,10 +26,10 @@ void CDialogTypes::DoDataExchange( CDataExchange* pDX )
     DDX_Control( pDX, IDC_EDIT_INT32, m_Int32 );
     DDX_Control( pDX, IDC_EDIT_INT16, m_Int16 );
     DDX_Control( pDX, IDC_EDIT_INT8, m_Int8 );
-    DDX_Control( pDX, IDC_EDIT_QWORD, m_QWord );
-    DDX_Control( pDX, IDC_EDIT_DWORD, m_DWord );
+    DDX_Control( pDX, IDC_EDIT_QWORD, m_Qword );
+    DDX_Control( pDX, IDC_EDIT_DWORD, m_Dword );
     DDX_Control( pDX, IDC_EDIT_WORD, m_Word );
-    DDX_Control( pDX, IDC_EDIT_BYTE, m_BYTE );
+    DDX_Control( pDX, IDC_EDIT_BYTE, m_Byte );
     DDX_Control( pDX, IDC_EDIT_VEC2, m_Vec2 );
     DDX_Control( pDX, IDC_EDIT_VEC3, m_Vec3 );
     DDX_Control( pDX, IDC_EDIT_QUAT, m_Quat );
@@ -50,48 +49,48 @@ BOOL CDialogTypes::OnInitDialog( )
 {
     CDialogEx::OnInitDialog( );
 
-    m_Hex.SetWindowText( g_tdHex );
+    m_Hex.SetWindowText( g_Typedefs.Hex );
 
-    m_Int64.SetWindowText( g_tdInt64 );
-    m_Int32.SetWindowText( g_tdInt32 );
-    m_Int16.SetWindowText( g_tdInt16 );
-    m_Int8.SetWindowText( g_tdInt8 );
+    m_Int64.SetWindowText( g_Typedefs.Int64 );
+    m_Int32.SetWindowText( g_Typedefs.Int32 );
+    m_Int16.SetWindowText( g_Typedefs.Int16 );
+    m_Int8.SetWindowText( g_Typedefs.Int8 );
 
-    m_QWord.SetWindowText( g_tdQWORD );
-    m_DWord.SetWindowText( g_tdDWORD );
-    m_Word.SetWindowText( g_tdWORD );
-    m_BYTE.SetWindowText( g_tdBYTE );
+    m_Qword.SetWindowText( g_Typedefs.Qword );
+    m_Dword.SetWindowText( g_Typedefs.Dword );
+    m_Word.SetWindowText( g_Typedefs.Word );
+    m_Byte.SetWindowText( g_Typedefs.Byte );
 
-    m_Vec2.SetWindowText( g_tdVec2 );
-    m_Vec3.SetWindowText( g_tdVec3 );
-    m_Quat.SetWindowText( g_tdQuat );
-    m_Matrix.SetWindowText( g_tdMatrix );
-    m_PChar.SetWindowText( g_tdPChar );
-    m_PWChar.SetWindowText( g_tdPWChar );
+    m_Vec2.SetWindowText( g_Typedefs.Vec2 );
+    m_Vec3.SetWindowText( g_Typedefs.Vec3 );
+    m_Quat.SetWindowText( g_Typedefs.Quat );
+    m_Matrix.SetWindowText( g_Typedefs.Matrix );
+    m_PChar.SetWindowText( g_Typedefs.PChar );
+    m_PWChar.SetWindowText( g_Typedefs.PWChar );
 
     return TRUE;
 }
 
 void CDialogTypes::OnOK( )
 {
-    m_Hex.GetWindowText(	g_tdHex );
-
-    m_Int64.GetWindowText(	g_tdInt64 );
-    m_Int32.GetWindowText(	g_tdInt32 );
-    m_Int16.GetWindowText(	g_tdInt16 );
-    m_Int8.GetWindowText(	g_tdInt8 );
-
-    m_QWord.GetWindowText(	g_tdQWORD );
-    m_DWord.GetWindowText(	g_tdDWORD );
-    m_Word.GetWindowText(	g_tdWORD );
-    m_BYTE.GetWindowText(	g_tdBYTE );
-
-    m_Vec2.GetWindowText(	g_tdVec2 );
-    m_Vec3.GetWindowText(	g_tdVec3 );
-    m_Quat.GetWindowText(	g_tdQuat );
-    m_Matrix.GetWindowText( g_tdMatrix );
-    m_PChar.GetWindowText(	g_tdPChar );
-    m_PWChar.GetWindowText( g_tdPWChar );
+    m_Hex.GetWindowText( g_Typedefs.Hex );
+
+    m_Int64.GetWindowText( g_Typedefs.Int64 );
+    m_Int32.GetWindowText( g_Typedefs.Int32 );
+    m_Int16.GetWindowText( g_Typedefs.Int16 );
+    m_Int8.GetWindowText( g_Typedefs.Int8 );
+
+    m_Qword.GetWindowText( g_Typedefs.Qword );
+    m_Dword.GetWindowText( g_Typedefs.Dword );
+    m_Word.GetWindowText( g_Typedefs.Word );
+    m_Byte.GetWindowText( g_Typedefs.Byte );
+
+    m_Vec2.GetWindowText( g_Typedefs.Vec2 );
+    m_Vec3.GetWindowText( g_Typedefs.Vec3 );
+    m_Quat.GetWindowText( g_Typedefs.Quat );
+    m_Matrix.GetWindowText( g_Typedefs.Matrix );
+    m_PChar.GetWindowText( g_Typedefs.PChar );
+    m_PWChar.GetWindowText( g_Typedefs.PWChar );
 
     CDialogEx::OnOK( );
 }

ReClass/DialogTypes.h

@@ -6,7 +6,6 @@
 
 class CDialogTypes : public CDialogEx {
     DECLARE_DYNAMIC( CDialogTypes )
-
 public:
     CDialogTypes( CWnd* pParent = NULL );   // standard constructor
     virtual ~CDialogTypes( );
@@ -28,10 +27,10 @@ class CDialogTypes : public CDialogEx {
     CEdit m_Int32;
     CEdit m_Int16;
     CEdit m_Int8;
-    CEdit m_QWord;
-    CEdit m_DWord;
+    CEdit m_Qword;
+    CEdit m_Dword;
     CEdit m_Word;
-    CEdit m_BYTE;
+    CEdit m_Byte;
     CEdit m_Vec2;
     CEdit m_Vec3;
     CEdit m_Quat;