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

Fixes: debugger: revert change from " to ' style quoting

Browse Source 
Details:  ' was used interanlly sometimes
This commit is contained in:
hjk
2009-01-27 17:15:51 +01:00
parent 4b9f407845
commit 9772ab9904
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
share/qtcreator/gdbmacros/gdbmacros.cpp
View File

@@ -109,7 +109,7 @@ int qtGhVersion = QT_VERSION;
'P(d, name, value)' roughly expands to: 'P(d, name, value)' roughly expands to:
d << (name) << "='" << value << "'"; d << (name) << "=\"" << value << "\"";
Useful (i.e. understood by the IDE) names include: Useful (i.e. understood by the IDE) names include:
@@ -551,7 +551,7 @@ void QDumper::addCommaIfNeeded()
if (pos == 0) if (pos == 0)
return; return;
char c = qDumpOutBuffer[pos - 1]; char c = qDumpOutBuffer[pos - 1];
if (c == '}' || c == '\'' || c == ']') if (c == '}' || c == '"' || c == ']')
put(','); put(',');
} }
@@ -630,7 +630,7 @@ void QDumper::endHash()
void QDumper::putEllipsis() void QDumper::putEllipsis()
{ {
addCommaIfNeeded(); addCommaIfNeeded();
*this << "{name='<incomplete>',value='',type='" << innertype << "'}"; *this << "{name=\"<incomplete>\",value=\"\",type=\"" << innertype << "\"}";
} }
// //
@@ -642,7 +642,7 @@ void QDumper::putEllipsis()
#define P(dumper,name,value) \ #define P(dumper,name,value) \
do { \ do { \
dumper.addCommaIfNeeded(); \ dumper.addCommaIfNeeded(); \
dumper << (name) << "='" << value << "'"; \ dumper << (name) << "=\"" << value << '"'; \
} while (0) } while (0)
// simple string property // simple string property
@@ -740,7 +740,7 @@ static void qDumpInnerValueHelper(QDumper &d, const char *type, const void *addr
return; return;
case 'B': case 'B':
if (isEqual(type, "QByteArray")) { if (isEqual(type, "QByteArray")) {
d << key << "encoded='1',"; d << key << "encoded=\"1\",";
P(d, key, *(QByteArray*)addr); P(d, key, *(QByteArray*)addr);
} }
return; return;
@@ -769,7 +769,7 @@ static void qDumpInnerValueHelper(QDumper &d, const char *type, const void *addr
return; return;
case 'S': case 'S':
if (isEqual(type, "QString")) { if (isEqual(type, "QString")) {
d << key << "encoded='1',"; d << key << "encoded=\"1\",";
P(d, key, *(QString*)addr); P(d, key, *(QString*)addr);
} }
return; return;
@@ -2008,7 +2008,7 @@ static void qDumpQVariantHelper(const void *data, QString *value,
*numchild = 0; *numchild = 0;
break; break;
case QVariant::String: case QVariant::String:
*value = QLatin1Char('\'') + v.toString() + QLatin1Char('\''); *value = QLatin1Char('"') + v.toString() + QLatin1Char('"');
*numchild = 0; *numchild = 0;
break; break;
case QVariant::StringList: case QVariant::StringList:
@@ -2240,9 +2240,9 @@ static void qDumpStdString(QDumper &d)
qCheckAccess(str.c_str() + str.size() - 1); qCheckAccess(str.c_str() + str.size() - 1);
} }
d << ",value='"; d << ",value=\"";
d.putBase64Encoded(str.c_str(), str.size()); d.putBase64Encoded(str.c_str(), str.size());
d << "'"; d << "\"";
P(d, "valueencoded", "1"); P(d, "valueencoded", "1");
P(d, "type", "std::string"); P(d, "type", "std::string");
P(d, "numchild", "0"); P(d, "numchild", "0");

20
tests/manual/gdbdebugger/simple/app.cpp
View File

@@ -145,14 +145,33 @@ void testQByteArray()
void testQHash() void testQHash()
{ {
#if 0
QHash<int, float> hgg0; QHash<int, float> hgg0;
hgg0[11] = 11.0; hgg0[11] = 11.0;
hgg0[22] = 22.0; hgg0[22] = 22.0;
hgg0[22] = 22.0;
hgg0[22] = 22.0;
hgg0[22] = 22.0;
hgg0[22] = 22.0;
hgg0[22] = 22.0;
#endif
#if 1
QHash<QString, float> hgg1; QHash<QString, float> hgg1;
hgg1["22.0"] = 22.0; hgg1["22.0"] = 22.0;
hgg1["23.0"] = 22.0;
hgg1["24.0"] = 22.0;
hgg1["25.0"] = 22.0;
hgg1["26.0"] = 22.0;
hgg1["27.0"] = 27.0;
hgg1["28.0"] = 28.0;
hgg1["29.0"] = 29.0;
#endif
#if 0
QHash<int, QString> hgg2; QHash<int, QString> hgg2;
hgg2[22] = "22.0"; hgg2[22] = "22.0";
@@ -165,6 +184,7 @@ void testQHash()
hash.insert("Hallo", QPointer<QObject>(&ob)); hash.insert("Hallo", QPointer<QObject>(&ob));
hash.insert("Welt", QPointer<QObject>(&ob)); hash.insert("Welt", QPointer<QObject>(&ob));
hash.insert(".", QPointer<QObject>(&ob)); hash.insert(".", QPointer<QObject>(&ob));
#endif
} }
void testQImage() void testQImage()