diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-10-01 14:16:50 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-10-01 21:22:19 +0000 |
| commit | afa8c02e6fef5b575cb626e3e608c22856ebaad4 (patch) | |
| tree | 7eee83bc987eecd49fc68c8060316db9939b077c | |
| parent | 2a2d75ef9a7b3b6a1e072467f73ad9c8cfb86cf0 (diff) | |
Qt: Try to fix a Visual C++ encoding warning.
Try to fix
.\simple_dialog.cpp(49) : warning C4566: character represented by universal-character-name '\uFFFF' cannot be represented in the current code page (1252)
We're assigning a delimiter. "Cannot be represented" is a feature,
not a bug.
Change-Id: Iba8bc5f5b42a43ec971d822b0e00f932787c7b16
Reviewed-on: https://code.wireshark.org/review/4409
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | ui/qt/simple_dialog.cpp | 2 | ||||
| -rw-r--r-- | ui/utf8_entities.h | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ui/qt/simple_dialog.cpp b/ui/qt/simple_dialog.cpp index 9f6335fd20..ea3ef218e4 100644 --- a/ui/qt/simple_dialog.cpp +++ b/ui/qt/simple_dialog.cpp @@ -46,7 +46,7 @@ QList<MessagePair> message_queue_; ESD_TYPE_E max_severity_ = ESD_TYPE_INFO; -const char *primary_delimiter_ = "\uffff"; +const char *primary_delimiter_ = UTF8_NONCHARACTER; const char * simple_dialog_primary_start(void) { diff --git a/ui/utf8_entities.h b/ui/utf8_entities.h index 18b0fc1a59..06eb486ea5 100644 --- a/ui/utf8_entities.h +++ b/ui/utf8_entities.h @@ -31,14 +31,17 @@ * and other places */ -#define UTF8_MIDDLE_DOT "\xc2\xb7" /* 183 / 0xb7 */ +#define UTF8_MIDDLE_DOT "\xc2\xb7" /* 183 / 0xb7 */ -#define UTF8_HORIZONTAL_ELLIPSIS "\xe2\x80\xa6" /* 8230 / 0x2026 */ -#define UTF8_LEFTWARDS_ARROW "\xe2\x86\x90" /* 8592 / 0x2190 */ -#define UTF8_RIGHTWARDS_ARROW "\xe2\x86\x92" /* 8594 / 0x2192 */ -#define UTF8_LEFT_RIGHT_ARROW "\xe2\x86\x94" /* 8596 / 0x2194 */ +#define UTF8_HORIZONTAL_ELLIPSIS "\xe2\x80\xa6" /* 8230 / 0x2026 */ +#define UTF8_LEFTWARDS_ARROW "\xe2\x86\x90" /* 8592 / 0x2190 */ +#define UTF8_RIGHTWARDS_ARROW "\xe2\x86\x92" /* 8594 / 0x2192 */ +#define UTF8_LEFT_RIGHT_ARROW "\xe2\x86\x94" /* 8596 / 0x2194 */ + +#define UTF8_PLACE_OF_INTEREST_SIGN "\xe2\x8c\x98" /* 8984 / 0x2318 */ + +#define UTF8_NONCHARACTER "\xef\xbf\xbf" /* 65535 / 0xffff */ -#define UTF8_PLACE_OF_INTEREST_SIGN "\xe2\x8c\x98" /* 8984 / 0x2318 */ #endif /* __UTF8_ENTITIES_H__ */ /* |