diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-18 12:00:36 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-18 20:08:41 +0000 |
| commit | fcc05a43a422986bff0a5eeab0d47f0b318a50d9 (patch) | |
| tree | dd261d3b133aaf3857462b7af6accc65886297e0 | |
| parent | 3a79d04626f2ee1e03040c545fc996a4aec96a76 (diff) | |
Use plain old ASCII for the SimpleDialog delimiter.
Use a UUID for the SimpleDialog primary delimiter instead of trying to
leverage Unicode.
Bug: 10953
Change-Id: Ib518b32ef65b50f311b061ab5a267e7d1aa9f01b
Reviewed-on: https://code.wireshark.org/review/7240
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | ui/qt/simple_dialog.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ui/qt/simple_dialog.cpp b/ui/qt/simple_dialog.cpp index 2406178377..8996aebee1 100644 --- a/ui/qt/simple_dialog.cpp +++ b/ui/qt/simple_dialog.cpp @@ -47,15 +47,7 @@ QList<MessagePair> message_queue_; ESD_TYPE_E max_severity_ = ESD_TYPE_INFO; -#ifdef _MSC_VER -#pragma warning(push) -// Disable "warning C4566: character represented by universal-character-name '\uFFFF' cannot be represented in the current code page (1252)" -#pragma warning(disable:4566) -#endif -const char *primary_delimiter_ = "\uffff"; -#ifdef _MSC_VER -#pragma warning(pop) -#endif +const char *primary_delimiter_ = "__CB754A38-94A2-4E59-922D-DD87EDC80E22__"; const char * simple_dialog_primary_start(void) { |