Change CopyData to CopyDefault with one argument, and rewrite

ClearData and SetWindowText in CProfile.

diff --git a/xkeymacs/profile.cpp b/xkeymacs/profile.cpp
index 88655d6..ab168bb 100644 (file)
--- a/xkeymacs/profile.cpp
+++ b/xkeymacs/profile.cpp
@@ -461,23 +461,22 @@ void CProfile::AddIMEInfo(CProperties& cProperties)
 \r
 void CProfile::ClearData(LPCTSTR appName)\r
 {\r
-       for (int nAppID = 0; nAppID < MAX_APP; ++nAppID)\r
-               if (!_tcscmp(appName, m_Config.szSpecialApp[nAppID])) {\r
-                       ZeroMemory(m_Config.nCommandID[nAppID], sizeof(m_Config.nCommandID[nAppID]));\r
-                       ZeroMemory(m_Config.szSpecialApp[nAppID], CLASS_NAME_LENGTH);\r
-                       return;\r
-               }\r
+       int n = GetAppID(appName);\r
+       if (n == MAX_APP)\r
+               return;\r
+       ZeroMemory(m_Config.nCommandID[n], sizeof(m_Config.nCommandID[n]));\r
+       ZeroMemory(m_Config.szSpecialApp[n], CLASS_NAME_LENGTH);\r
 }\r
 \r
-void CProfile::CopyData(LPCTSTR dst, LPCTSTR src)\r
+void CProfile::CopyDefault(LPCTSTR appName)\r
 {\r
-       int nDstApp = AssignAppID(dst);\r
-       int nSrcApp = GetAppID(src);\r
-       if (nDstApp == MAX_APP || nSrcApp == MAX_APP)\r
+       int dst = AssignAppID(appName);\r
+       int src = DefaultAppID();\r
+       if (src == MAX_APP || dst == MAX_APP)\r
                return;\r
-       SetSettingStyle(nDstApp, SETTING_SPECIFIC);\r
+       SetSettingStyle(dst, SETTING_SPECIFIC);\r
 \r
-#define CopyMember(member) CopyMemory(&m_Config. ## member ## [nDstApp], &m_Config. ## member ## [nSrcApp], sizeof(m_Config. ## member ## [nSrcApp]))\r
+#define CopyMember(member) CopyMemory(&m_Config. ## member ## [dst], &m_Config. ## member ## [src], sizeof(m_Config. ## member ## [src]))\r
        CopyMember(b326Compatible);\r
        CopyMember(nFunctionID);\r
        CopyMember(bEnableCUA);\r
@@ -597,10 +596,8 @@ LPCTSTR CProfile::GetWindowText(int nAppID)
 \r
 void CProfile::SetWindowText(int nAppID, const CString& text)\r
 {\r
-       if (CUtils::GetWindowTextType(text) == IDS_WINDOW_TEXT_IGNORE)\r
-               _tcscpy_s(m_Config.szWindowText[nAppID], _T("*"));\r
-       else\r
-               _tcsncpy_s(m_Config.szWindowText[nAppID], text, _TRUNCATE);\r
+       _tcsncpy_s(m_Config.szWindowText[nAppID],\r
+               CUtils::GetWindowTextType(text) == IDS_WINDOW_TEXT_IGNORE ? _T("*") : text, _TRUNCATE);\r
 }\r
 \r
 BOOL CProfile::Is106Keyboard()\r

diff --git a/xkeymacs/profile.h b/xkeymacs/profile.h
index de78955..2e28163 100644 (file)
--- a/xkeymacs/profile.h
+++ b/xkeymacs/profile.h
@@ -36,7 +36,7 @@ public:
        static CString KeyToString(int type, int key);\r
        static void InitAppList(CProperties& cProperties);\r
        static void ClearData(LPCTSTR appName);\r
-       static void CopyData(LPCTSTR dstApp, LPCTSTR srcApp);\r
+       static void CopyDefault(LPCTSTR appName);\r
        static int AssignAppID(LPCTSTR appName);\r
        static int DefaultAppID();\r
        static int GetAppID(LPCTSTR appName);\r

diff --git a/xkeymacs/properties.cpp b/xkeymacs/properties.cpp
index eef0a77..85894f7 100644 (file)
--- a/xkeymacs/properties.cpp
+++ b/xkeymacs/properties.cpp
@@ -294,7 +294,7 @@ void CProperties::OnApply()
 \r
 void CProperties::OnLoadDefault() \r
 {\r
-       CProfile::CopyData(m_appName, CString(MAKEINTRESOURCE(IDS_DEFAULT)));\r
+       CProfile::CopyDefault(m_appName);\r
        SetDialogData();\r
 }\r
 \r
@@ -336,7 +336,7 @@ void CProperties::OnSettingSpecific()
        EnableControl(ACTIVE_TAB);\r
 \r
        if (CProfile::GetAppID(m_appName) == MAX_APP) {\r
-               CProfile::CopyData(m_appName, CString(MAKEINTRESOURCE(IDS_DEFAULT)));\r
+               CProfile::CopyDefault(m_appName);\r
                SetDialogData();\r
        }\r
 }\r