summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorRitt Konstantin <ritt.ks@gmail.com>2010-02-24 19:13:55 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-05 15:58:10 (GMT)
commit5b05cdccda99d5889c6a3db41d5c494d25798840 (patch)
treecc22eb105a7a558fa24b761c9f1f87e2785c72c4 /util
parent05260bc05647b77da090e3d64ca38bbdb1533c58 (diff)
downloadQt-5b05cdccda99d5889c6a3db41d5c494d25798840.zip
Qt-5b05cdccda99d5889c6a3db41d5c494d25798840.tar.gz
Qt-5b05cdccda99d5889c6a3db41d5c494d25798840.tar.bz2
add some usefull definitions to qunicodetables_p.h
* CURRENT_VERSION macro in qunicodetables.cpp was renamed to UNICODE_DATA_VERSION and it's definition was moved to qunicodetables_p.h * LAST_UNICODE_CHAR macro in qchar.cpp was renamed to UNICODE_LAST_CODEPOINT and it's definition was moved to qunicodetables_p.h Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'util')
-rw-r--r--util/unicode/main.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp
index 5a2f45e..521dcb0 100644
--- a/util/unicode/main.cpp
+++ b/util/unicode/main.cpp
@@ -55,6 +55,7 @@
#define DATA_VERSION_STR "QChar::Unicode_5_0"
#define LAST_CODEPOINT 0x10ffff
+#define LAST_CODEPOINT_STR "0x10ffff"
static QHash<QByteArray, QChar::UnicodeVersion> age_map;
@@ -2167,8 +2168,6 @@ static QByteArray createPropertyInfo()
" return uc_properties + index;\n"
"}\n\n";
- out += "#define CURRENT_VERSION "DATA_VERSION_STR"\n\n";
-
out += "static const ushort specialCaseMap[] = {\n ";
for (int i = 0; i < specialCaseMap.size(); ++i) {
out += QByteArray(" 0x") + QByteArray::number(specialCaseMap.at(i), 16);
@@ -2644,6 +2643,8 @@ int main(int, char **)
"#define QUNICODETABLES_P_H\n\n"
"#include <QtCore/qchar.h>\n\n"
"QT_BEGIN_NAMESPACE\n\n");
+ f.write("#define UNICODE_DATA_VERSION "DATA_VERSION_STR"\n\n");
+ f.write("#define UNICODE_LAST_CODEPOINT "LAST_CODEPOINT_STR"\n\n");
f.write("namespace QUnicodeTables {\n\n");
f.write(property_string);
f.write("\n");