diff options
| author | Eike Ziller <[email protected]> | 2014-01-15 14:04:41 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2014-01-15 14:04:41 +0100 |
| commit | 851f255b9dfc81c667f02994c0cd3f9cda3f973c (patch) | |
| tree | 0bb41ddef303f0ae8a8635bca360ce4f2489e5fa /src/plugins/debugger/debuggerprotocol.cpp | |
| parent | 8ab5b7ec0bc10fc35651f3a1046b26d815c24810 (diff) | |
| parent | 8d04b65ae9d5d35e763146d12023c794c743a3fd (diff) | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
Diffstat (limited to 'src/plugins/debugger/debuggerprotocol.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerprotocol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/debugger/debuggerprotocol.cpp b/src/plugins/debugger/debuggerprotocol.cpp index 83fa67abe69..1897527e49e 100644 --- a/src/plugins/debugger/debuggerprotocol.cpp +++ b/src/plugins/debugger/debuggerprotocol.cpp @@ -56,7 +56,7 @@ uchar fromhex(uchar c) return 10 + c - 'a'; if (c >= 'A' && c <= 'Z') return 10 + c - 'A'; - return -1; + return UCHAR_MAX; } void skipCommas(const char *&from, const char *to) @@ -147,7 +147,7 @@ QByteArray GdbMi::parseCString(const char *&from, const char *to) uchar prod = 0; while (true) { uchar val = fromhex(c); - if (val == uchar(-1)) + if (val == UCHAR_MAX) break; prod = prod * 16 + val; if (++chars == 3 || src == end) |