feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: unbreak display of non-7bit-clean data

Browse Source 
Task-number: QTCREATORBUG-7086
Change-Id: Ia38c27b66dcd98b84c09bb0dc50bd2cd19470400
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-03-13 10:38:44 +01:00
committed by hjk
parent 1c2272772e
commit 5a3473fe96
2 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/debugger/watchdata.cpp
View File

@@ -83,10 +83,11 @@ bool isIntType(const QByteArray &type)
case 'c':
return type == "char";
case 'i':
return type == "int" || type == "int64";
return type == "int";
case 'l':
return type == "long"
|| type.startsWith("long ");
|| type == "long int"
|| type == "long unsigned int";
case 'p':
return type == "ptrdiff_t";
case 'q':
@@ -100,10 +101,24 @@ bool isIntType(const QByteArray &type)
|| type == "size_t"
|| type == "std::size_t"
|| type == "std::ptrdiff_t"
|| type.startsWith("signed ");
|| (type.startsWith("signed") &&
( type == "signed char"
|| type == "signed short"
|| type == "signed short int"
|| type == "signed long"
|| type == "signed long int"
|| type == "signed long long"
|| type == "signed long long int"));
case 'u':
return type == "unsigned"
|| type.startsWith("unsigned ");
|| (type.startsWith("unsigned") &&
( type == "unsigned char"
|| type == "unsigned short"
|| type == "unsigned short int"
|| type == "unsigned long"
|| type == "unsigned long int"
|| type == "unsigned long long"
|| type == "unsigned long long int"));
default:
return false;
}