chore(common): replace DEBUGSTORE_, DEBUGSTORE_...C with DEBUGSTORE_.…

….._L , DEBUGSTORE_..._U
keymanapp · Aug 13, 2024 · 30493f9 · 30493f9
1 parent 07c8d13
commit 30493f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/developer/src/kmcmplib/src/Compiler.cpp b/developer/src/kmcmplib/src/Compiler.cpp
@@ -580,7 +580,7 @@ KMX_BOOL ParseLine(PFILE_KEYBOARD fk, PKMX_WCHAR str) {
         //swprintf(tstr, "%d", fk->currentGroup);
         /* Record a system store for the line number of the begin statement */
         //wcscpy(tstr, DEBUGSTORE_MATCH);
-        u16sprintf(tstr, _countof(tstr), L"%ls%d ", wstring_from_u16string(DEBUGSTORE_MATCH).c_str(), (int) fk->currentGroup);
+        u16sprintf(tstr, _countof(tstr), L"%ls%d ", DEBUGSTORE_MATCH_L, (int) fk->currentGroup);
         u16ncat(tstr, gp->szName, _countof(tstr));
 
         AddDebugStore(fk, tstr);
@@ -619,7 +619,7 @@ KMX_BOOL ParseLine(PFILE_KEYBOARD fk, PKMX_WCHAR str) {
       {
         KMX_WCHAR tstr[128];
         /* Record a system store for the line number of the begin statement */
-        u16sprintf(tstr, _countof(tstr), L"%ls%d ", wstring_from_u16string(DEBUGSTORE_NOMATCH).c_str(), (int) fk->currentGroup);
+        u16sprintf(tstr, _countof(tstr), L"%ls%d ", DEBUGSTORE_NOMATCH_L, (int) fk->currentGroup);
         u16ncat(tstr, gp->szName, _countof(tstr));
         AddDebugStore(fk, tstr);
       }
@@ -683,7 +683,7 @@ KMX_BOOL ProcessGroupLine(PFILE_KEYBOARD fk, PKMX_WCHAR p)
   {
     KMX_WCHAR tstr[128];
     /* Record a system store for the line number of the begin statement */
-    u16sprintf(tstr, _countof(tstr), L"%ls%d ", wstring_from_u16string(DEBUGSTORE_GROUP).c_str(), fk->cxGroupArray - 1);
+    u16sprintf(tstr, _countof(tstr), L"%ls%d ", DEBUGSTORE_GROUP_L, fk->cxGroupArray - 1);
     u16ncat(tstr, gp->szName, _countof(tstr));
     AddDebugStore(fk, tstr);
   }
@@ -3761,7 +3761,7 @@ void kmcmp::RecordDeadkeyNames(PFILE_KEYBOARD fk)
   KMX_DWORD i;
   for (i = 0; i < fk->cxDeadKeyArray; i++)
   {
-    u16sprintf(buf, _countof(buf), L"%ls%d ", wstring_from_u16string(DEBUGSTORE_DEADKEY).c_str(), (int)i);
+    u16sprintf(buf, _countof(buf), L"%ls%d ", DEBUGSTORE_DEADKEY_L, (int)i);
     u16ncat(buf, fk->dpDeadKeyArray[i].szName, _countof(buf));
 
     AddDebugStore(fk, buf);

diff --git a/developer/src/kmcmplib/src/debugstore.h b/developer/src/kmcmplib/src/debugstore.h
@@ -5,16 +5,16 @@
 #define DEBUGSTORE_BEGIN	u"B"
 #define DEBUGSTORE_BEGIN_C	u'B'
 
-#define DEBUGSTORE_MATCH		u"M"
-#define DEBUGSTORE_MATCH_C		u'M'
+#define DEBUGSTORE_MATCH_U		u"M"
+#define DEBUGSTORE_MATCH_L		L"M"
 
-#define DEBUGSTORE_NOMATCH		u"N"
-#define DEBUGSTORE_NOMATCH_C	u'N'
+#define DEBUGSTORE_NOMATCH_U	u"M"
+#define DEBUGSTORE_NOMATCH_L	L"M"
 
-#define DEBUGSTORE_GROUP		u"G"
-#define DEBUGSTORE_GROUP_C		u'G'
+#define DEBUGSTORE_GROUP_U		u"G"
+#define DEBUGSTORE_GROUP_L		L"G"
 
-#define DEBUGSTORE_DEADKEY		u"D"
-#define DEBUGSTORE_DEADKEY_C	u'D'
+#define DEBUGSTORE_DEADKEY_U	u"D"
+#define DEBUGSTORE_DEADKEY_L	L"D"
 
 #endif /* DEBUGSTORE_H */