Rename m_XkeymacsData m_Data, LoadRegistryData LoadData, and

SaveRegistryData SaveData in CProfile.

diff --git a/xkeymacs/profile.cpp b/xkeymacs/profile.cpp
index c71efa1..44677e7 100644 (file)
--- a/xkeymacs/profile.cpp
+++ b/xkeymacs/profile.cpp
@@ -305,7 +305,7 @@ static const KeyName KeyNames[] = {
        {0xff,                  _T("Fn")},\r
 };\r
 \r
-CData CProfile::m_XkeymacsData[MAX_APP];\r
+CData CProfile::m_Data[MAX_APP];\r
 TASK_LIST CProfile::m_TaskList[MAX_TASKS];\r
 DWORD CProfile::m_dwTasks;\r
 \r
@@ -507,7 +507,7 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                CString szSection(MAKEINTRESOURCE(IDS_REG_SECTION_APPLICATION));\r
                szEntry.Format(IDS_REG_ENTRY_APPLICATION, nApplicationID);\r
                if (bSaveAndValidate) { // retrieve\r
-                       m_XkeymacsData[nApplicationID].ClearAll();\r
+                       m_Data[nApplicationID].ClearAll();\r
                        szApplicationName = AfxGetApp()->GetProfileString(szSection, szEntry);\r
                        if (szApplicationName.IsEmpty()) {\r
                                if (nApplicationID) {\r
@@ -525,9 +525,9 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                                        bUseDialogSetting = TRUE;\r
                                }\r
                        }\r
-                       m_XkeymacsData[nApplicationID].SetApplicationName(szApplicationName);\r
+                       m_Data[nApplicationID].SetApplicationName(szApplicationName);\r
                } else {                                // initialize\r
-                       szApplicationName = m_XkeymacsData[nApplicationID].GetApplicationName();\r
+                       szApplicationName = m_Data[nApplicationID].GetApplicationName();\r
                        if (szApplicationName.IsEmpty()) {\r
                                continue;\r
                        }\r
@@ -538,9 +538,9 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                szEntry.LoadString(IDS_REG_ENTRY_APPLICATOIN_TITLE);\r
                if (bSaveAndValidate) { // retrieve\r
                        szApplicationTitle = AfxGetApp()->GetProfileString(szApplicationName, szEntry);\r
-                       m_XkeymacsData[nApplicationID].SetApplicationTitle(szApplicationTitle);\r
+                       m_Data[nApplicationID].SetApplicationTitle(szApplicationTitle);\r
                } else {                                // initialize\r
-                       szApplicationTitle = m_XkeymacsData[nApplicationID].GetApplicationTitle();\r
+                       szApplicationTitle = m_Data[nApplicationID].GetApplicationTitle();\r
                        while (!szApplicationTitle.IsEmpty() && szApplicationTitle.GetAt(0) == _T(' ')) {\r
                                szApplicationTitle.Delete(0);\r
                        }\r
@@ -554,9 +554,9 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                        if (szWindowText.IsEmpty()) {\r
                                szWindowText = _T('*');\r
                        }\r
-                       m_XkeymacsData[nApplicationID].SetWindowText(szWindowText);\r
+                       m_Data[nApplicationID].SetWindowText(szWindowText);\r
                } else {                                // initialize\r
-                       szWindowText = m_XkeymacsData[nApplicationID].GetWindowText();\r
+                       szWindowText = m_Data[nApplicationID].GetWindowText();\r
                        AfxGetApp()->WriteProfileString(szApplicationName, szEntry, szWindowText);\r
                }\r
 \r
@@ -576,9 +576,9 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                                nWindowTextType = IDS_WINDOW_TEXT_MATCH_FULL;\r
                        }\r
 \r
-                       m_XkeymacsData[nApplicationID].SetWindowTextType(nWindowTextType);\r
+                       m_Data[nApplicationID].SetWindowTextType(nWindowTextType);\r
                } else {                                // initialize\r
-                       szWindowTextType.LoadString(m_XkeymacsData[nApplicationID].GetWindowTextType());\r
+                       szWindowTextType.LoadString(m_Data[nApplicationID].GetWindowTextType());\r
                        AfxGetApp()->WriteProfileString(szApplicationName, szEntry, szWindowTextType);\r
                }\r
 \r
@@ -604,7 +604,7 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                                                int nCommandType = 0;\r
                                                int nKey = 0;\r
                                                ReadKeyBind(&nCommandType, &nKey, szKeyBind);\r
-                                               m_XkeymacsData[nApplicationID].SetCommandID(nCommandType, nKey, nCommandID);\r
+                                               m_Data[nApplicationID].SetCommandID(nCommandType, nKey, nCommandID);\r
                                                memset(szKeyBind, 0, sizeof(szKeyBind));\r
                                                dwKeyBind = sizeof(szKeyBind);\r
                                        }\r
@@ -621,7 +621,7 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                                                if (nKey == 0) {\r
                                                        break;\r
                                                }\r
-                                               m_XkeymacsData[nApplicationID].SetCommandID(nCommandType, nKey, nCommandID);\r
+                                               m_Data[nApplicationID].SetCommandID(nCommandType, nKey, nCommandID);\r
                                        }\r
                                }\r
                        }\r
@@ -658,7 +658,7 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                        }\r
                        for (int nCommandType = 0; nCommandType < MAX_COMMAND_TYPE; ++nCommandType) {\r
                                for (int nKey = 0; nKey < MAX_KEY; ++nKey) {\r
-                                       int nCommandID = m_XkeymacsData[nApplicationID].GetCommandID(nCommandType, nKey);\r
+                                       int nCommandID = m_Data[nApplicationID].GetCommandID(nCommandType, nKey);\r
                                        SaveKeyBind(szApplicationName, nCommandID, nCommandType, nKey);\r
                                }\r
                        }\r
@@ -676,9 +676,9 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                szEntry.LoadString(IDS_REG_ENTRY_KILL_RING_MAX);\r
                if (bSaveAndValidate) { // retrieve\r
                        int nKillRingMax = AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 1);\r
-                       m_XkeymacsData[nApplicationID].SetKillRingMax(nKillRingMax);\r
+                       m_Data[nApplicationID].SetKillRingMax(nKillRingMax);\r
                } else {                                // initialize\r
-                       int nKillRingMax = m_XkeymacsData[nApplicationID].GetKillRingMax();\r
+                       int nKillRingMax = m_Data[nApplicationID].GetKillRingMax();\r
                        AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, nKillRingMax);\r
                }\r
 \r
@@ -686,9 +686,9 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                szEntry.LoadString(IDS_REG_ENTRY_USE_DIALOG_SETTING);\r
                if (bSaveAndValidate) { // retrieve\r
                        BOOL bUseDialogSetting = AfxGetApp()->GetProfileInt(szApplicationName,szEntry, 1);\r
-                       m_XkeymacsData[nApplicationID].SetUseDialogSetting(bUseDialogSetting);\r
+                       m_Data[nApplicationID].SetUseDialogSetting(bUseDialogSetting);\r
                } else {                                // initialize\r
-                       BOOL bUseDialogSetting = m_XkeymacsData[nApplicationID].GetUseDialogSetting();\r
+                       BOOL bUseDialogSetting = m_Data[nApplicationID].GetUseDialogSetting();\r
                        AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, bUseDialogSetting);\r
                }\r
 \r
@@ -703,10 +703,10 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                                RegCloseKey(hKey);\r
                                nSettingStyle = SETTING_SPECIFIC;\r
                        }\r
-                       m_XkeymacsData[nApplicationID].SetSettingStyle(nSettingStyle);\r
+                       m_Data[nApplicationID].SetSettingStyle(nSettingStyle);\r
                } else {                                // initialize\r
                        BOOL bDisableXkeymacs = FALSE;\r
-                       if (m_XkeymacsData[nApplicationID].GetSettingStyle() == SETTING_DISABLE) {\r
+                       if (m_Data[nApplicationID].GetSettingStyle() == SETTING_DISABLE) {\r
                                bDisableXkeymacs = TRUE;\r
                        }\r
                        AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, bDisableXkeymacs);\r
@@ -715,45 +715,45 @@ void CProfile::UpdateRegistryData(const BOOL bSaveAndValidate)
                // Ignore Meta Ctrl+? when it is undefined.\r
                szEntry.LoadString(IDC_REG_ENTRY_IGNORE_META_CTRL);\r
                if (bSaveAndValidate) { // retrieve\r
-                       m_XkeymacsData[nApplicationID].SetIgnoreUndefinedMetaCtrl(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
+                       m_Data[nApplicationID].SetIgnoreUndefinedMetaCtrl(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
                } else {                                // initialize\r
-                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedMetaCtrl());\r
+                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_Data[nApplicationID].GetIgnoreUndefinedMetaCtrl());\r
                }\r
 \r
                // Ignore C-x ? when it is undefined.\r
                szEntry.LoadString(IDC_REG_ENTRY_IGNORE_C_X);\r
                if (bSaveAndValidate) { // retrieve\r
-                       m_XkeymacsData[nApplicationID].SetIgnoreUndefinedC_x(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
+                       m_Data[nApplicationID].SetIgnoreUndefinedC_x(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
                } else {                                // initialize\r
-                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedC_x());\r
+                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_Data[nApplicationID].GetIgnoreUndefinedC_x());\r
                }\r
 \r
                // Enable CUA-mode\r
                szEntry.LoadString(IDC_REG_ENTRY_ENABLE_CUA);\r
                if (bSaveAndValidate) { // retrieve\r
-                       m_XkeymacsData[nApplicationID].SetEnableCUA(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
+                       m_Data[nApplicationID].SetEnableCUA(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
                } else {                                // initialize\r
-                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_XkeymacsData[nApplicationID].GetEnableCUA());\r
+                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_Data[nApplicationID].GetEnableCUA());\r
                }\r
 \r
                // Version 3.26 compatible mode\r
                szEntry.LoadString(IDS_REG_ENTRY_326_COMPATIBLE);\r
                if (bSaveAndValidate) { // retrieve\r
-                       m_XkeymacsData[nApplicationID].Set326Compatible(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
+                       m_Data[nApplicationID].Set326Compatible(AfxGetApp()->GetProfileInt(szApplicationName, szEntry, 0));\r
                } else {                                // initialize\r
-                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_XkeymacsData[nApplicationID].Get326Compatible());\r
+                       AfxGetApp()->WriteProfileInt(szApplicationName, szEntry, m_Data[nApplicationID].Get326Compatible());\r
                }\r
        }\r
 }\r
 \r
-void CProfile::LoadRegistryData()\r
+void CProfile::LoadData()\r
 {\r
        CDotXkeymacs::Load();\r
        LevelUp();\r
        UpdateRegistryData(TRUE);\r
 }\r
 \r
-void CProfile::SaveRegistryData()\r
+void CProfile::SaveData()\r
 {\r
        DeleteAllRegistryData();\r
        UpdateRegistryData(FALSE);\r
@@ -769,7 +769,7 @@ void CProfile::SetDllData()
 \r
        for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
 \r
-               CString szApplicationName = m_XkeymacsData[nApplicationID].GetApplicationName();\r
+               CString szApplicationName = m_Data[nApplicationID].GetApplicationName();\r
 \r
                if (szApplicationName.IsEmpty()) {\r
                        CXkeymacsDll::Clear(nApplicationID);\r
@@ -777,12 +777,12 @@ void CProfile::SetDllData()
                }\r
 \r
                CXkeymacsDll::SetApplicationName(nApplicationID, szApplicationName);\r
-               CXkeymacsDll::SetWindowText(nApplicationID, m_XkeymacsData[nApplicationID].GetWindowText());\r
+               CXkeymacsDll::SetWindowText(nApplicationID, m_Data[nApplicationID].GetWindowText());\r
                CXkeymacsDll::SetCommandID(nApplicationID, CONTROL, 'X', 0);\r
 \r
                for (int nCommandType = 0; nCommandType < MAX_COMMAND_TYPE; ++nCommandType) {\r
                        for (int nKey = 0; nKey < MAX_KEY; ++nKey) {\r
-                               const int nCommandID = m_XkeymacsData[nApplicationID].GetCommandID(nCommandType, nKey);\r
+                               const int nCommandID = m_Data[nApplicationID].GetCommandID(nCommandType, nKey);\r
                                CXkeymacsDll::SetCommandID(nApplicationID, nCommandType, nKey, nCommandID);\r
                                if ((nCommandType & CONTROLX) && nCommandID) {\r
                                        CXkeymacsDll::SetCommandID(nApplicationID, CONTROL, 'X', 1);                    // Commands[1] is C-x\r
@@ -802,13 +802,13 @@ void CProfile::SetDllData()
                        }\r
                }\r
 \r
-               CXkeymacsDll::SetKillRingMax(nApplicationID, m_XkeymacsData[nApplicationID].GetKillRingMax());\r
-               CXkeymacsDll::SetUseDialogSetting(nApplicationID, m_XkeymacsData[nApplicationID].GetUseDialogSetting());\r
-               CXkeymacsDll::SetSettingStyle(nApplicationID, m_XkeymacsData[nApplicationID].GetSettingStyle());\r
-               CXkeymacsDll::SetIgnoreUndefinedMetaCtrl(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedMetaCtrl());\r
-               CXkeymacsDll::SetIgnoreUndefinedC_x(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedC_x());\r
-               CXkeymacsDll::SetEnableCUA(nApplicationID, m_XkeymacsData[nApplicationID].GetEnableCUA());\r
-               CXkeymacsDll::Set326Compatible(nApplicationID, m_XkeymacsData[nApplicationID].Get326Compatible());\r
+               CXkeymacsDll::SetKillRingMax(nApplicationID, m_Data[nApplicationID].GetKillRingMax());\r
+               CXkeymacsDll::SetUseDialogSetting(nApplicationID, m_Data[nApplicationID].GetUseDialogSetting());\r
+               CXkeymacsDll::SetSettingStyle(nApplicationID, m_Data[nApplicationID].GetSettingStyle());\r
+               CXkeymacsDll::SetIgnoreUndefinedMetaCtrl(nApplicationID, m_Data[nApplicationID].GetIgnoreUndefinedMetaCtrl());\r
+               CXkeymacsDll::SetIgnoreUndefinedC_x(nApplicationID, m_Data[nApplicationID].GetIgnoreUndefinedC_x());\r
+               CXkeymacsDll::SetEnableCUA(nApplicationID, m_Data[nApplicationID].GetEnableCUA());\r
+               CXkeymacsDll::Set326Compatible(nApplicationID, m_Data[nApplicationID].Get326Compatible());\r
        }\r
        CXkeymacsApp *pApp = static_cast<CXkeymacsApp *>(AfxGetApp());\r
        if (!pApp->IsWow64())\r
@@ -1062,19 +1062,19 @@ void CProfile::LevelUp()
 \r
 void CProfile::InitDllData()\r
 {\r
-       LoadRegistryData();\r
+       LoadData();\r
        SetDllData();\r
 }\r
 \r
 void CProfile::ClearData(const CString szCurrentApplication)\r
 {\r
        for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
-               if (m_XkeymacsData[nApplicationID].GetApplicationName() == szCurrentApplication) {\r
+               if (m_Data[nApplicationID].GetApplicationName() == szCurrentApplication) {\r
                        break;\r
                }\r
        }\r
        if (nApplicationID < MAX_APP) {\r
-               m_XkeymacsData[nApplicationID].ClearAll();\r
+               m_Data[nApplicationID].ClearAll();\r
        }\r
 }\r
 \r
@@ -1085,7 +1085,7 @@ int CProfile::GetSavedSettingCount()
 \r
        for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
                CString szApplicationName;\r
-               szApplicationName = m_XkeymacsData[nApplicationID].GetApplicationName();\r
+               szApplicationName = m_Data[nApplicationID].GetApplicationName();\r
                if (!szApplicationName.IsEmpty()) {\r
                        ++nSavedSetting;\r
                }\r
@@ -1103,8 +1103,8 @@ void CProfile::InitApplicationList(CComboBox *const cApplicationList)
        EnumWindows(EnumWindowsProc, (LPARAM)cApplicationList);\r
 \r
        for (int i = 0; i < MAX_APP; ++i) {\r
-               CString szApplicationName       = m_XkeymacsData[i].GetApplicationName();\r
-               CString szApplicationTitle      = m_XkeymacsData[i].GetApplicationTitle();\r
+               CString szApplicationName       = m_Data[i].GetApplicationName();\r
+               CString szApplicationTitle      = m_Data[i].GetApplicationTitle();\r
 \r
                CString szListItem;\r
                szListItem.Format(IDS_APPLICATION_LIST_ITEM, szApplicationTitle, szApplicationName);\r
@@ -1195,9 +1195,9 @@ int CProfile::GetApplicationIndex(const CString szApplicationName, const BOOL bS
        if (nApplicationID == MAX_APP) {\r
                if (bSaveAndValidate) { // GetDialogData\r
                        for (nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
-                               CString sz = m_XkeymacsData[nApplicationID].GetApplicationName();\r
+                               CString sz = m_Data[nApplicationID].GetApplicationName();\r
                                if (sz.IsEmpty()) {\r
-                                       m_XkeymacsData[nApplicationID].SetApplicationName(szApplicationName);\r
+                                       m_Data[nApplicationID].SetApplicationName(szApplicationName);\r
                                        break;\r
                                }\r
                        }\r
@@ -1206,7 +1206,7 @@ int CProfile::GetApplicationIndex(const CString szApplicationName, const BOOL bS
                        }\r
                } else {                                // SetDialogData\r
                        for (nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
-                               if (IsDefault(m_XkeymacsData[nApplicationID].GetApplicationName())) {\r
+                               if (IsDefault(m_Data[nApplicationID].GetApplicationName())) {\r
                                        *nSettingStyle = SETTING_DEFAULT;\r
                                        break;\r
                                }\r
@@ -1218,10 +1218,10 @@ int CProfile::GetApplicationIndex(const CString szApplicationName, const BOOL bS
        }\r
 \r
        if (bSaveAndValidate) { // GetDialogData\r
-               m_XkeymacsData[nApplicationID].SetSettingStyle(*nSettingStyle);\r
+               m_Data[nApplicationID].SetSettingStyle(*nSettingStyle);\r
        } else {                                // SetDialogData\r
                if (*nSettingStyle == SETTING_UNDEFINED) {      // It means that *nSettingStyle != SETTING_DEFAULT.\r
-                       *nSettingStyle = m_XkeymacsData[nApplicationID].GetSettingStyle();\r
+                       *nSettingStyle = m_Data[nApplicationID].GetSettingStyle();\r
                }\r
        }\r
 \r
@@ -1301,7 +1301,7 @@ void CProfile::UpdateApplicationTitle(CComboBox *const cApplicationList, const C
        static CString szApplicationTitle;\r
        if (bSaveAndValidate) { // GetDialogData\r
                if (!CProfile::IsDefault(szCurrentApplication)) {\r
-                       m_XkeymacsData[nApplicationID].SetApplicationTitle(szApplicationTitle);\r
+                       m_Data[nApplicationID].SetApplicationTitle(szApplicationTitle);\r
                }\r
                szApplicationTitle.Empty();\r
        } else {                                // SetDialogData\r
@@ -1324,12 +1324,12 @@ void CProfile::SetCommandID(const int nApplicationID, const int nCommandType, co
                        }\r
                }\r
        }\r
-       m_XkeymacsData[nApplicationID].SetCommandID(nCommandType, nKey, nCommandID);\r
+       m_Data[nApplicationID].SetCommandID(nCommandType, nKey, nCommandID);\r
 }\r
 \r
 int CProfile::GetCommandID(const int nApplicationID, const int nCommandType, const int nKey)\r
 {\r
-       int nCommandID = m_XkeymacsData[nApplicationID].GetCommandID(nCommandType, nKey);\r
+       int nCommandID = m_Data[nApplicationID].GetCommandID(nCommandType, nKey);\r
        if (nKey == 0xf0 && Commands[nCommandID].fCommand == CCommands::C_Eisu) {\r
                // Change CommandID C_\r
                for (nCommandID = 1; nCommandID < MAX_COMMAND; ++nCommandID) {\r
@@ -1343,32 +1343,32 @@ int CProfile::GetCommandID(const int nApplicationID, const int nCommandType, con
 \r
 void CProfile::SetKillRingMax(const int nApplicationID, const int nKillRingMax)\r
 {\r
-       m_XkeymacsData[nApplicationID].SetKillRingMax(nKillRingMax);\r
+       m_Data[nApplicationID].SetKillRingMax(nKillRingMax);\r
 }\r
 \r
 int CProfile::GetKillRingMax(const int nApplicationID)\r
 {\r
-       return m_XkeymacsData[nApplicationID].GetKillRingMax();\r
+       return m_Data[nApplicationID].GetKillRingMax();\r
 }\r
 \r
 void CProfile::SetUseDialogSetting(const int nApplicationID, const BOOL bUseDialogSetting)\r
 {\r
-       m_XkeymacsData[nApplicationID].SetUseDialogSetting(bUseDialogSetting);\r
+       m_Data[nApplicationID].SetUseDialogSetting(bUseDialogSetting);\r
 }\r
 \r
 BOOL CProfile::GetUseDialogSetting(const int nApplicationID)\r
 {\r
-       return m_XkeymacsData[nApplicationID].GetUseDialogSetting();\r
+       return m_Data[nApplicationID].GetUseDialogSetting();\r
 }\r
 \r
 void CProfile::SetWindowText(const int nApplicationID, const CString szWindowText)\r
 {\r
-       m_XkeymacsData[nApplicationID].SetWindowText(szWindowText);\r
+       m_Data[nApplicationID].SetWindowText(szWindowText);\r
 }\r
 \r
 CString CProfile::GetWindowText(const int nApplicationID)\r
 {\r
-       return m_XkeymacsData[nApplicationID].GetWindowText();\r
+       return m_Data[nApplicationID].GetWindowText();\r
 }\r
 \r
 void CProfile::DeleteAllRegistryData()\r
@@ -1416,17 +1416,17 @@ void CProfile::CopyData(const CString szDestinationApplication, const CString sz
        int nDestinationApplication = GetApplicationIndex(szDestinationApplication, TRUE, &nSettingStyle);\r
        int nSourceApplication = GetApplicationIndex(szSourceApplication);\r
 \r
-       CString szApplicationName = m_XkeymacsData[nDestinationApplication].GetApplicationName();\r
-       CString szApplicationTitle = m_XkeymacsData[nDestinationApplication].GetApplicationTitle();\r
-       CString szWindowText = m_XkeymacsData[nDestinationApplication].GetWindowText();\r
-       int nWindowTextType = m_XkeymacsData[nDestinationApplication].GetWindowTextType();\r
+       CString szApplicationName = m_Data[nDestinationApplication].GetApplicationName();\r
+       CString szApplicationTitle = m_Data[nDestinationApplication].GetApplicationTitle();\r
+       CString szWindowText = m_Data[nDestinationApplication].GetWindowText();\r
+       int nWindowTextType = m_Data[nDestinationApplication].GetWindowTextType();\r
 \r
-       m_XkeymacsData[nDestinationApplication] = m_XkeymacsData[nSourceApplication];\r
+       m_Data[nDestinationApplication] = m_Data[nSourceApplication];\r
 \r
-       m_XkeymacsData[nDestinationApplication].SetApplicationName(szApplicationName);\r
-       m_XkeymacsData[nDestinationApplication].SetApplicationTitle(szApplicationTitle);\r
-       m_XkeymacsData[nDestinationApplication].SetWindowText(szWindowText);\r
-       m_XkeymacsData[nDestinationApplication].SetWindowTextType(nWindowTextType);\r
+       m_Data[nDestinationApplication].SetApplicationName(szApplicationName);\r
+       m_Data[nDestinationApplication].SetApplicationTitle(szApplicationTitle);\r
+       m_Data[nDestinationApplication].SetWindowText(szWindowText);\r
+       m_Data[nDestinationApplication].SetWindowTextType(nWindowTextType);\r
 }\r
 \r
 // return application index\r
@@ -1435,7 +1435,7 @@ int CProfile::GetApplicationIndex(const CString szApplicationName)
 {\r
        int nApplicationID = 0;\r
        for (nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
-               if (m_XkeymacsData[nApplicationID].GetApplicationName() == szApplicationName) {\r
+               if (m_Data[nApplicationID].GetApplicationName() == szApplicationName) {\r
                        break;\r
                }\r
        }\r
@@ -1543,12 +1543,12 @@ void CProfile::ImportProperties()
 \r
 BOOL CProfile::GetEnableCUA(const int nApplicationID)\r
 {\r
-       return m_XkeymacsData[nApplicationID].GetEnableCUA();\r
+       return m_Data[nApplicationID].GetEnableCUA();\r
 }\r
 \r
 void CProfile::SetEnableCUA(const int nApplicationID, const BOOL bEnableCUA)\r
 {\r
-       m_XkeymacsData[nApplicationID].SetEnableCUA(bEnableCUA);\r
+       m_Data[nApplicationID].SetEnableCUA(bEnableCUA);\r
 }\r
 \r
 int CProfile::GetKeyboardSpeed()\r

diff --git a/xkeymacs/profile.h b/xkeymacs/profile.h
index 0681b0c..f12552f 100644 (file)
--- a/xkeymacs/profile.h
+++ b/xkeymacs/profile.h
@@ -61,8 +61,8 @@ public:
        static int GetSavedSettingCount();\r
        static void ClearData(CString szCurrentApplication);\r
        static void InitDllData();\r
-       static void SaveRegistryData();\r
-       static void LoadRegistryData();\r
+       static void SaveData();\r
+       static void LoadData();\r
        CProfile();\r
        virtual ~CProfile();\r
 \r
@@ -82,7 +82,7 @@ private:
        static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam);\r
        static BOOL IsTheString(CString sz, UINT nID);\r
        static void SetDllData();\r
-       static CData m_XkeymacsData[MAX_APP];\r
+       static CData m_Data[MAX_APP];\r
        static void DeleteAllRegistryData();\r
        static TASK_LIST m_TaskList[MAX_TASKS];\r
        static DWORD m_dwTasks;\r

diff --git a/xkeymacs/properties.cpp b/xkeymacs/properties.cpp
index 7cc87ac..cf70d21 100644 (file)
--- a/xkeymacs/properties.cpp
+++ b/xkeymacs/properties.cpp
@@ -88,7 +88,7 @@ BOOL CProperties::OnInitDialog()
 \r
        InitApplicationList();\r
 \r
-       CProfile::LoadRegistryData();\r
+       CProfile::LoadData();\r
        m_szCurrentApplication.LoadString(IDS_DEFAULT);\r
        SetDialogData(m_szCurrentApplication);\r
        EnableUseDefaultButton(FALSE);\r
@@ -288,7 +288,7 @@ void CProperties::OnOK()
 \r
 void CProperties::OnCancel() \r
 {\r
-       CProfile::LoadRegistryData();\r
+       CProfile::LoadData();\r
 \r
        CDialog::OnCancel();\r
 }\r
@@ -296,7 +296,7 @@ void CProperties::OnCancel()
 void CProperties::OnApply() \r
 {\r
        GetDialogData();\r
-       CProfile::SaveRegistryData();\r
+       CProfile::SaveData();\r
 }\r
 \r
 void CProperties::OnLoadDefault() \r

diff --git a/xkeymacs/propertiesadvanced.cpp b/xkeymacs/propertiesadvanced.cpp
index 08b2129..cde583d 100644 (file)
--- a/xkeymacs/propertiesadvanced.cpp
+++ b/xkeymacs/propertiesadvanced.cpp
@@ -415,7 +415,7 @@ void CPropertiesAdvanced::OnRemove()
 \r
 void CPropertiesAdvanced::OnResetAll() \r
 {\r
-       CProfile::LoadRegistryData();\r
+       CProfile::LoadData();\r
        InitCommandIDs();\r
        SetCurrentKeys();\r
 }\r