diff options
author | George Hazan <ghazan@miranda.im> | 2018-07-09 13:03:28 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2018-07-09 13:03:28 +0300 |
commit | 4b99b5b4abad1cf12ac5c7bbb8788899ba6a48ab (patch) | |
tree | e0948136799223ad497814ff1acb9928d5267514 /plugins/Variables/src/parse_variables.cpp | |
parent | aa859cd9b0034a3e54e422868018e1714b743156 (diff) |
massive Variables-related code cleaning (removed TCHAR, manually created unions replaced with MAllString etc)
Diffstat (limited to 'plugins/Variables/src/parse_variables.cpp')
-rw-r--r-- | plugins/Variables/src/parse_variables.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Variables/src/parse_variables.cpp b/plugins/Variables/src/parse_variables.cpp index 6fce6cd3fb..449352abd0 100644 --- a/plugins/Variables/src/parse_variables.cpp +++ b/plugins/Variables/src/parse_variables.cpp @@ -67,13 +67,13 @@ static wchar_t *parsePut(ARGUMENTSINFO *ai) return nullptr;
// ai->flags |= AIF_DONTPARSE;
- if (addToVariablesRegister(ai->targv[1], ai->targv[2]))
+ if (addToVariablesRegister(ai->argv.w[1], ai->argv.w[2]))
return nullptr;
FORMATINFO fi;
memcpy(&fi, ai->fi, sizeof(fi));
- fi.tszFormat = ai->targv[2];
- fi.flags |= FIF_TCHAR;
+ fi.szFormat.w = ai->argv.w[2];
+ fi.flags |= FIF_UNICODE;
return formatString(&fi);
}
@@ -82,7 +82,7 @@ static wchar_t *parsePuts(ARGUMENTSINFO *ai) if (ai->argc != 3)
return nullptr;
- if (addToVariablesRegister(ai->targv[1], ai->targv[2]))
+ if (addToVariablesRegister(ai->argv.w[1], ai->argv.w[2]))
return nullptr;
return mir_wstrdup(L"");
@@ -93,7 +93,7 @@ static wchar_t *parseGet(ARGUMENTSINFO *ai) if (ai->argc != 2)
return nullptr;
- return searchVariableRegister(ai->targv[1]);
+ return searchVariableRegister(ai->argv.w[1]);
}
void registerVariablesTokens()
|