chenx221/Textractor_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

allow single char utf8 hooks

Browse Source
This commit is contained in:
Akash Mozumdar 2019-01-27 09:14:45 -05:00
parent 69f5522492
commit e398fdf94e
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
GUI/misc.cpp
View File

@ -183,11 +183,15 @@ namespace
QString RCode = "R"; QString RCode = "R";
QTextStream codeBuilder(&RCode); QTextStream codeBuilder(&RCode);
if (hp.type & USING_UNICODE) codeBuilder << "Q"; if (hp.type & USING_UNICODE)
else if (hp.type & USING_UTF8) codeBuilder << "V"; {
else codeBuilder << "S"; codeBuilder << "Q";
}
if (hp.codepage != 0 && hp.codepage != CP_UTF8) codeBuilder << hp.codepage << "#"; else
{
codeBuilder << "S";
if (hp.codepage != 0) codeBuilder << hp.codepage << "#";
}
codeBuilder.setIntegerBase(16); codeBuilder.setIntegerBase(16);
codeBuilder.setNumberFlags(QTextStream::UppercaseDigits); codeBuilder.setNumberFlags(QTextStream::UppercaseDigits);
@ -211,14 +215,14 @@ namespace
} }
else else
{ {
if (hp.type & USING_UTF8) codeBuilder << "V"; if (hp.type & USING_STRING) codeBuilder << "S";
else if (hp.type & USING_STRING) codeBuilder << "S";
else if (hp.type & BIG_ENDIAN) codeBuilder << "A"; else if (hp.type & BIG_ENDIAN) codeBuilder << "A";
else codeBuilder << "B"; else codeBuilder << "B";
} }
if (hp.type & NO_CONTEXT) codeBuilder << "N"; if (hp.type & NO_CONTEXT) codeBuilder << "N";
if (hp.text_fun || hp.filter_fun || hp.hook_fun) codeBuilder << "X"; // no AGTH equivalent
if (hp.codepage != 0 && hp.codepage != CP_UTF8) codeBuilder << hp.codepage << "#"; if (hp.codepage != 0 && !(hp.type & USING_UNICODE)) codeBuilder << hp.codepage << "#";
codeBuilder.setIntegerBase(16); codeBuilder.setIntegerBase(16);
codeBuilder.setNumberFlags(QTextStream::UppercaseDigits); codeBuilder.setNumberFlags(QTextStream::UppercaseDigits);
@ -226,7 +230,6 @@ namespace
if (hp.offset < 0) hp.offset += 4; if (hp.offset < 0) hp.offset += 4;
if (hp.split < 0) hp.split += 4; if (hp.split < 0) hp.split += 4;
if (hp.text_fun || hp.filter_fun || hp.hook_fun) codeBuilder << "X"; // no AGTH equivalent
codeBuilder << hp.offset; codeBuilder << hp.offset;
if (hp.type & DATA_INDIRECT) codeBuilder << "*" << hp.index; if (hp.type & DATA_INDIRECT) codeBuilder << "*" << hp.index;
if (hp.type & USING_SPLIT) codeBuilder << ":" << hp.split; if (hp.type & USING_SPLIT) codeBuilder << ":" << hp.split;