diff --git a/share/qtcreator/dumper/dumper.cpp b/share/qtcreator/dumper/dumper.cpp
index 09f6f5d603c25e68bd6ffda3b95412087807d02b..32f0ac21150491e0df2f450d7c3ab74ccba48be6 100644
--- a/share/qtcreator/dumper/dumper.cpp
+++ b/share/qtcreator/dumper/dumper.cpp
@@ -1336,8 +1336,8 @@ static void qDumpQDateTime(QDumper &d)
# if 0
d.beginHash();
d.putItem("name", "toUTC");
- d.putItem("exp", "(("NSX"QDateTime"NSY"*)").put(d.data).put(")"
- "->toTimeSpec('"NS"Qt::UTC')");
+ d.putItem("exp", "((" NSX "QDateTime" NSY "*)").put(d.data).put(")"
+ "->toTimeSpec('" NS "Qt::UTC')");
d.putItem("type", NS"QDateTime");
d.putItem("numchild", "1");
d.endHash();
@@ -1346,8 +1346,8 @@ static void qDumpQDateTime(QDumper &d)
# if 0
d.beginHash();
d.putItem("name", "toLocalTime");
- d.putItem("exp", "(("NSX"QDateTime"NSY"*)").put(d.data).put(")"
- "->toTimeSpec('"NS"Qt::LocalTime')");
+ d.putItem("exp", "((" NSX "QDateTime" NSY "*)").put(d.data).put(")"
+ "->toTimeSpec('" NS "Qt::LocalTime')");
d.putItem("type", NS"QDateTime");
d.putItem("numchild", "1");
d.endHash();
@@ -1461,7 +1461,7 @@ static void qDumpQFileInfo(QDumper &d)
d.putItem("value", info.created().toString());
d.putItem("valueencoded", "2");
d.beginItem("exp");
- d.put("(("NSX"QFileInfo"NSY"*)").put(d.data).put(")->created()");
+ d.put("((" NSX "QFileInfo" NSY "*)").put(d.data).put(")->created()");
d.endItem();
d.putItem("type", NS"QDateTime");
d.putItem("numchild", "1");
@@ -1472,7 +1472,7 @@ static void qDumpQFileInfo(QDumper &d)
d.putItem("value", info.lastModified().toString());
d.putItem("valueencoded", "2");
d.beginItem("exp");
- d.put("(("NSX"QFileInfo"NSY"*)").put(d.data).put(")->lastModified()");
+ d.put("((" NSX "QFileInfo" NSY "*)").put(d.data).put(")->lastModified()");
d.endItem();
d.putItem("type", NS"QDateTime");
d.putItem("numchild", "1");
@@ -1483,7 +1483,7 @@ static void qDumpQFileInfo(QDumper &d)
d.putItem("value", info.lastRead().toString());
d.putItem("valueencoded", "2");
d.beginItem("exp");
- d.put("(("NSX"QFileInfo"NSY"*)").put(d.data).put(")->lastRead()");
+ d.put("((" NSX "QFileInfo" NSY "*)").put(d.data).put(")->lastRead()");
d.endItem();
d.putItem("type", NS"QDateTime");
d.putItem("numchild", "1");
@@ -1826,28 +1826,28 @@ static void qDumpQLocale(QDumper &d)
d.beginHash();
d.putItem("name", "country");
d.beginItem("exp");
- d.put("(("NSX"QLocale"NSY"*)").put(d.data).put(")->country()");
+ d.put("((" NSX "QLocale" NSY "*)").put(d.data).put(")->country()");
d.endItem();
d.endHash();
d.beginHash();
d.putItem("name", "language");
d.beginItem("exp");
- d.put("(("NSX"QLocale"NSY"*)").put(d.data).put(")->language()");
+ d.put("((" NSX "QLocale" NSY "*)").put(d.data).put(")->language()");
d.endItem();
d.endHash();
d.beginHash();
d.putItem("name", "measurementSystem");
d.beginItem("exp");
- d.put("(("NSX"QLocale"NSY"*)").put(d.data).put(")->measurementSystem()");
+ d.put("((" NSX "QLocale" NSY "*)").put(d.data).put(")->measurementSystem()");
d.endItem();
d.endHash();
d.beginHash();
d.putItem("name", "numberOptions");
d.beginItem("exp");
- d.put("(("NSX"QLocale"NSY"*)").put(d.data).put(")->numberOptions()");
+ d.put("((" NSX "QLocale" NSY "*)").put(d.data).put(")->numberOptions()");
d.endItem();
d.endHash();
@@ -1963,7 +1963,7 @@ static void qDumpQMap(QDumper &d)
d.put(valueType).put(" >");
d.endItem();
d.beginItem("exp");
- d.put("*('"NS"QMapData::Node<").put(keyType).put(",");
+ d.put("*('" NS "QMapData::Node<").put(keyType).put(",");
d.put(valueType).put(" >'*)").put(node);
d.endItem();
#endif
@@ -2010,7 +2010,7 @@ static void qDumpQModelIndex(QDumper &d)
d.put("<invalid>");
d.endItem();
d.beginItem("exp");
- d.put("(("NSX"QModelIndex"NSY"*)").put(d.data).put(")->parent()");
+ d.put("((" NSX "QModelIndex" NSY "*)").put(d.data).put(")->parent()");
d.endItem();
d.putItem("type", NS"QModelIndex");
d.putItem("numchild", "1");
@@ -2154,7 +2154,7 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
break;
# if QT_VERSION >= 0x040500
case QVariant::StringList:
- *exp = QString(QLatin1String("(*('"NS"QStringList'*)%1)"))
+ *exp = QString(QLatin1String("(*('" NS "QStringList'*)%1)"))
.arg((quintptr)v);
*numchild = v->toStringList().size();
break;
@@ -2232,11 +2232,11 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
# endif
default: {
static const char *qTypeFormat = sizeof(void *) == sizeof(long)
- ? "'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%lx)"
- : "'"NS"%s "NS"qVariantValue<"NS"%s >'(*('"NS"QVariant'*)0x%llx)";
+ ? "'" NS "%s " NS "qVariantValue<" NS "%s >'(*('" NS "QVariant'*)0x%lx)"
+ : "'" NS "%s " NS "qVariantValue<" NS "%s >'(*('" NS "QVariant'*)0x%llx)";
static const char *nonQTypeFormat = sizeof(void *) == sizeof(long)
- ? "'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%lx)"
- : "'%s "NS"qVariantValue<%s >'(*('"NS"QVariant'*)0x%llx)";
+ ? "'%s " NS "qVariantValue<%s >'(*('" NS "QVariant'*)0x%lx)"
+ : "'%s " NS "qVariantValue<%s >'(*('" NS "QVariant'*)0x%llx)";
char buf[1000];
const char *format = (v->typeName()[0] == 'Q') ? qTypeFormat : nonQTypeFormat;
qsnprintf(buf, sizeof(buf) - 1, format, v->typeName(), v->typeName(), v);
@@ -2852,8 +2852,8 @@ static void qDumpQSet(QDumper &d)
d.beginHash();
d.putItem("type", d.innerType);
d.beginItem("exp");
- d.put("(('"NS"QHashNode<").put(d.innerType
- ).put(","NS"QHashDummyValue>'*)"
+ d.put("(('" NS "QHashNode<").put(d.innerType
+ ).put("," NS "QHashDummyValue>'*)"
).put(static_cast<const void*>(node)).put(")->key");
d.endItem();
d.endHash();
@@ -3646,58 +3646,58 @@ void *qDumpObjectData440(
// They are mentioned here nevertheless. For types that are not listed
// here, dumpers won't be used.
d.put("dumpers=["
- "\""NS"QAbstractItem\","
- "\""NS"QAbstractItemModel\","
- "\""NS"QByteArray\","
- "\""NS"QChar\","
- "\""NS"QDate\","
- "\""NS"QDateTime\","
- "\""NS"QDir\","
- "\""NS"QFile\","
- "\""NS"QFileInfo\","
- "\""NS"QHash\","
- "\""NS"QHashNode\","
- "\""NS"QImage\","
- //"\""NS"QImageData\","
- "\""NS"QLinkedList\","
- "\""NS"QList\","
- "\""NS"QLocale\","
- "\""NS"QMap\","
- "\""NS"QMapNode\","
- "\""NS"QModelIndex\","
- "\""NS"QObject\","
- "\""NS"QObjectMethodList\"," // hack to get nested properties display
- "\""NS"QObjectProperty\","
- "\""NS"QObjectPropertyList\","
- "\""NS"QObjectSignal\","
- "\""NS"QObjectSignalList\","
- "\""NS"QObjectSlot\","
- "\""NS"QObjectSlotList\","
- "\""NS"QObjectChildList\","
- "\""NS"QPoint\","
- "\""NS"QPointF\","
- "\""NS"QRect\","
- "\""NS"QRectF\","
- //"\""NS"QRegion\","
- "\""NS"QSet\","
- "\""NS"QSize\","
- "\""NS"QSizeF\","
- "\""NS"QStack\","
- "\""NS"QString\","
- "\""NS"QStringList\","
- "\""NS"QTextCodec\","
- "\""NS"QTime\","
- "\""NS"QVariant\","
- "\""NS"QVariantList\","
- "\""NS"QVector\","
+ "\"" NS "QAbstractItem\","
+ "\"" NS "QAbstractItemModel\","
+ "\"" NS "QByteArray\","
+ "\"" NS "QChar\","
+ "\"" NS "QDate\","
+ "\"" NS "QDateTime\","
+ "\"" NS "QDir\","
+ "\"" NS "QFile\","
+ "\"" NS "QFileInfo\","
+ "\"" NS "QHash\","
+ "\"" NS "QHashNode\","
+ "\"" NS "QImage\","
+ //"\"" NS "QImageData\","
+ "\"" NS "QLinkedList\","
+ "\"" NS "QList\","
+ "\"" NS "QLocale\","
+ "\"" NS "QMap\","
+ "\"" NS "QMapNode\","
+ "\"" NS "QModelIndex\","
+ "\"" NS "QObject\","
+ "\"" NS "QObjectMethodList\"," // hack to get nested properties display
+ "\"" NS "QObjectProperty\","
+ "\"" NS "QObjectPropertyList\","
+ "\"" NS "QObjectSignal\","
+ "\"" NS "QObjectSignalList\","
+ "\"" NS "QObjectSlot\","
+ "\"" NS "QObjectSlotList\","
+ "\"" NS "QObjectChildList\","
+ "\"" NS "QPoint\","
+ "\"" NS "QPointF\","
+ "\"" NS "QRect\","
+ "\"" NS "QRectF\","
+ //"\"" NS "QRegion\","
+ "\"" NS "QSet\","
+ "\"" NS "QSize\","
+ "\"" NS "QSizeF\","
+ "\"" NS "QStack\","
+ "\"" NS "QString\","
+ "\"" NS "QStringList\","
+ "\"" NS "QTextCodec\","
+ "\"" NS "QTime\","
+ "\"" NS "QVariant\","
+ "\"" NS "QVariantList\","
+ "\"" NS "QVector\","
#if QT_VERSION >= 0x040500
- "\""NS"QMultiMap\","
- "\""NS"QSharedPointer\","
- "\""NS"QWeakPointer\","
+ "\"" NS "QMultiMap\","
+ "\"" NS "QSharedPointer\","
+ "\"" NS "QWeakPointer\","
#endif
#if USE_QT_GUI
- "\""NS"QPixmap\","
- "\""NS"QWidget\","
+ "\"" NS "QPixmap\","
+ "\"" NS "QWidget\","
#endif
#ifdef Q_OS_WIN
"\"basic_string\","
@@ -3720,7 +3720,7 @@ void *qDumpObjectData440(
"\"").put(((QT_VERSION >> 16) & 255)).put("\","
"\"").put(((QT_VERSION >> 8) & 255)).put("\","
"\"").put(((QT_VERSION) & 255)).put("\"]");
- d.put(",namespace=\""NS"\",");
+ d.put(",namespace=\"" NS "\",");
d.put("dumperversion=\"1.3\",");
d.disarm();
}
diff --git a/src/plugins/bazaar/bazaareditor.cpp b/src/plugins/bazaar/bazaareditor.cpp
index 0acd91b5246e2c0b7f65a84beb0fcab5d38ed6cd..95e91a40ad168963b7d2e3b6b1cffa4a99021ed1 100644
--- a/src/plugins/bazaar/bazaareditor.cpp
+++ b/src/plugins/bazaar/bazaareditor.cpp
@@ -69,11 +69,11 @@ QSet<QString> BazaarEditor::annotationChanges() const
if (txt.isEmpty())
return changes;
- QRegExp changeNumRx(QLatin1String("^("BZR_CHANGE_PATTERN") "));
+ QRegExp changeNumRx(QLatin1String("^(" BZR_CHANGE_PATTERN ") "));
QTC_ASSERT(changeNumRx.isValid(), return changes);
if (changeNumRx.indexIn(txt) != -1) {
changes.insert(changeNumRx.cap(1));
- changeNumRx.setPattern(QLatin1String("\n("BZR_CHANGE_PATTERN") "));
+ changeNumRx.setPattern(QLatin1String("\n(" BZR_CHANGE_PATTERN ") "));
QTC_ASSERT(changeNumRx.isValid(), return changes);
int pos = 0;
while ((pos = changeNumRx.indexIn(txt, pos)) != -1) {
diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp
index f0292a15d4ddbf4aa5cfdd36d160a4093a8f2b7f..5c94bff43ed93bc5b0a4efee3eef209623f12c0e 100644
--- a/src/plugins/cvs/cvseditor.cpp
+++ b/src/plugins/cvs/cvseditor.cpp
@@ -48,13 +48,13 @@ namespace Internal {
// Match a CVS revision ("1.1.1.1")
#define CVS_REVISION_PATTERN "[\\d\\.]+"
-#define CVS_REVISION_AT_START_PATTERN "^("CVS_REVISION_PATTERN") "
+#define CVS_REVISION_AT_START_PATTERN "^(" CVS_REVISION_PATTERN ") "
CVSEditor::CVSEditor(const VCSBase::VCSBaseEditorParameters *type,
QWidget *parent) :
VCSBase::VCSBaseEditorWidget(type, parent),
m_revisionAnnotationPattern(QLatin1String(CVS_REVISION_AT_START_PATTERN".*$")),
- m_revisionLogPattern(QLatin1String("^revision *("CVS_REVISION_PATTERN")$"))
+ m_revisionLogPattern(QLatin1String("^revision *(" CVS_REVISION_PATTERN ")$"))
{
QTC_ASSERT(m_revisionAnnotationPattern.isValid(), return);
QTC_ASSERT(m_revisionLogPattern.isValid(), return);
@@ -72,7 +72,7 @@ QSet<QString> CVSEditor::annotationChanges() const
QTC_ASSERT(r.isValid(), return changes);
if (r.indexIn(txt) != -1) {
changes.insert(r.cap(1));
- r.setPattern(QLatin1String("\n("CVS_REVISION_PATTERN") "));
+ r.setPattern(QLatin1String("\n(" CVS_REVISION_PATTERN ") "));
QTC_ASSERT(r.isValid(), return changes);
int pos = 0;
while ((pos = r.indexIn(txt, pos)) != -1) {
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 6256a8440aef760880f130500e8dc3bf87bc8711..25e149af2397aaa5f69c039111f0a3a4f748b570 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -442,7 +442,7 @@ CdbEngine::CdbEngine(const DebuggerStartParameters &sp,
m_specialStopMode(NoSpecialStop),
m_nextCommandToken(0),
m_currentBuiltinCommandIndex(-1),
- m_extensionCommandPrefixBA("!"QT_CREATOR_CDB_EXT"."),
+ m_extensionCommandPrefixBA("!" QT_CREATOR_CDB_EXT "."),
m_operateByInstructionPending(true),
m_operateByInstruction(true), // Default CDB setting
m_notifyEngineShutdownOnTermination(false),
@@ -573,7 +573,7 @@ QString CdbEngine::extensionLibraryName(bool is64Bit)
// Determine extension lib name and path to use
QString rc;
QTextStream(&rc) << QFileInfo(QCoreApplication::applicationDirPath()).path()
- << "/lib/" << (is64Bit ? QT_CREATOR_CDB_EXT"64" : QT_CREATOR_CDB_EXT"32")
+ << "/lib/" << (is64Bit ? QT_CREATOR_CDB_EXT "64" : QT_CREATOR_CDB_EXT "32")
<< '/' << QT_CREATOR_CDB_EXT << ".dll";
return rc;
}
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index 686acb971a3bd92e5ee5c9906021f6c28c09cb5a..8c933a8ee4a37fe85544610c00cf0f7c917b12a4 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -80,11 +80,11 @@ QSet<QString> GitEditor::annotationChanges() const
if (txt.isEmpty())
return changes;
// Hunt for first change number in annotation: "<change>:"
- QRegExp r(QLatin1String("^("CHANGE_PATTERN_8C") "));
+ QRegExp r(QLatin1String("^(" CHANGE_PATTERN_8C ") "));
QTC_ASSERT(r.isValid(), return changes);
if (r.indexIn(txt) != -1) {
changes.insert(r.cap(1));
- r.setPattern(QLatin1String("\n("CHANGE_PATTERN_8C") "));
+ r.setPattern(QLatin1String("\n(" CHANGE_PATTERN_8C ") "));
QTC_ASSERT(r.isValid(), return changes);
int pos = 0;
while ((pos = r.indexIn(txt, pos)) != -1) {
diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
index 463f0154c8e64a23d9b380f7732cc62edf36bbea..03b5de19ff0cce9886d118b94ba71b45a01135a1 100644
--- a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
@@ -43,18 +43,18 @@
#define LIBRARY_MACRO_VARIABLE "<LIBRARY_MACRO>"
static const char *globalHeaderContentsC =
-"#ifndef "GUARD_VARIABLE"\n"
-"#define "GUARD_VARIABLE"\n"
+"#ifndef " GUARD_VARIABLE "\n"
+"#define " GUARD_VARIABLE "\n"
"\n"
"#include <QtCore/qglobal.h>\n"
"\n"
-"#if defined("LIBRARY_MACRO_VARIABLE")\n"
-"# define "EXPORT_MACRO_VARIABLE" Q_DECL_EXPORT\n"
+"#if defined(" LIBRARY_MACRO_VARIABLE ")\n"
+"# define " EXPORT_MACRO_VARIABLE " Q_DECL_EXPORT\n"
"#else\n"
-"# define "EXPORT_MACRO_VARIABLE" Q_DECL_IMPORT\n"
+"# define " EXPORT_MACRO_VARIABLE " Q_DECL_IMPORT\n"
"#endif\n"
"\n"
-"#endif // "GUARD_VARIABLE"\n";
+"#endif // " GUARD_VARIABLE "\n";
namespace Qt4ProjectManager {
namespace Internal {
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 42427202f91bad2f56937a114d1fa5b69589e80d..5072d7f4c408304f793a4942375d1e703cdaffe9 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -516,15 +516,15 @@ static const QByteArray generateQStringSpec(const QString &str, bool isNull = fa
{
if (isNull)
return QByteArray("value='IiIgKG51bGwp',valueencoded='5',"
- "type='"NS"QString',numchild='0'");
+ "type='" NS "QString',numchild='0'");
return
- QByteArray("value='%',valueencoded='2',type='"NS"QString',numchild='0'")
+ QByteArray("value='%',valueencoded='2',type='" NS "QString',numchild='0'")
<< utfToBase64(str);
}
static const QByteArray generateQCharSpec(const QChar& ch)
{
- return QByteArray("value='%',valueencoded='2',type='"NS"QChar',numchild='0'")
+ return QByteArray("value='%',valueencoded='2',type='" NS "QChar',numchild='0'")
<< utfToBase64(QString(QLatin1String("'%1' (%2, 0x%3)")).
arg(ch).arg(ch.unicode()).arg(ch.unicode(), 0, 16));
}
@@ -550,7 +550,7 @@ static const QByteArray generateIntSpec(int n)
const QByteArray createExp(const void *ptr,
const QByteArray &type, const QByteArray &method)
{
- return QByteArray("exp='(("NSX"%"NSY"*)%)->%'")
+ return QByteArray("exp='((" NSX "%" NSY "*)%)->%'")
<< type << ptrToBa(ptr) << method;
}
@@ -661,7 +661,7 @@ void tst_Dumpers::dumpQAbstractItemHelper(QModelIndex &index)
QByteArray indexSpecValue = QByteArray().append(rowStr + "," + colStr + ",").
append(internalPtrStrValue + "," + modelPtrStr);
QByteArray expected = QByteArray("tiname='iname',addr='").append(ptrToBa(&index)).
- append("',type='"NS"QAbstractItem',addr='$").append(indexSpecSymbolic).
+ append("',type='" NS "QAbstractItem',addr='$").append(indexSpecSymbolic).
append("',value='").append(valToString(model->data(index).toString())).
append("',numchild='%',children=[");
int rowCount = model->rowCount(index);
@@ -675,7 +675,7 @@ void tst_Dumpers::dumpQAbstractItemHelper(QModelIndex &index)
append(N(childIndex.row())).append(",").
append(N(childIndex.column())).append(",").
append(ptrToBa(childIndex.internalPointer())).append(",").
- append(modelPtrStr).append("',type='"NS"QAbstractItem',value='").
+ append(modelPtrStr).append("',type='" NS "QAbstractItem',value='").
append(valToString(model->data(childIndex).toString())).append("'}");
expected <<= N(model->rowCount(childIndex)
* model->columnCount(childIndex));
@@ -773,7 +773,7 @@ void tst_Dumpers::dumpQAbstractItemAndModelIndex()
"{name='parent',value='<invalid>',exp='(('$T'*)$A)->parent()',"
"type='$T',numchild='1'},"
"{name='internalId',%},"
- "{name='model',value='%',type='"NS"QAbstractItemModel*',"
+ "{name='model',value='%',type='" NS "QAbstractItemModel*',"
"numchild='1'}]")
<< generateQStringSpec(N(index.internalId()))
<< ptrToBa(&m),
@@ -790,7 +790,7 @@ void tst_Dumpers::dumpQAbstractItemAndModelIndex()
"{name='parent',value='<invalid>',exp='(('$T'*)$A)->parent()',"
"type='$T',numchild='1'},"
"{name='internalId',%},"
- "{name='model',value='%',type='"NS"QAbstractItemModel*',"
+ "{name='model',value='%',type='" NS "QAbstractItemModel*',"
"numchild='1'}]")
<< generateQStringSpec(N(index2.internalId()))
<< ptrToBa(&m2),
@@ -807,7 +807,7 @@ void tst_Dumpers::dumpQAbstractItemAndModelIndex()
"{name='parent',value='<invalid>',exp='(('$T'*)$A)->parent()',"
"type='$T',numchild='1'},"
"{name='internalId',%},"
- "{name='model',value='%',type='"NS"QAbstractItemModel*',"
+ "{name='model',value='%',type='" NS "QAbstractItemModel*',"
"numchild='1'}]")
<< generateQStringSpec(N(index3.internalId()))
<< ptrToBa(&m2),
@@ -822,7 +822,7 @@ void tst_Dumpers::dumpQAbstractItemAndModelIndex()
"{name='parent',value='(1, 0)',exp='(('$T'*)$A)->parent()',"
"type='$T',numchild='1'},"
"{name='internalId',%},"
- "{name='model',value='%',type='"NS"QAbstractItemModel*',"
+ "{name='model',value='%',type='" NS "QAbstractItemModel*',"
"numchild='1'}]")
<< generateQStringSpec(N(index.internalId()))
<< ptrToBa(&m2),
@@ -839,9 +839,9 @@ void tst_Dumpers::dumpQAbstractItemModelHelper(QAbstractItemModel &m)
{
QByteArray address = ptrToBa(&m);
QByteArray expected = QByteArray("tiname='iname',addr='%',"
- "type='"NS"QAbstractItemModel',value='(%,%)',numchild='1',children=["
- "{numchild='1',name='"NS"QObject',addr='%',value='%',"
- "valueencoded='2',type='"NS"QObject',displayedtype='%'}")
+ "type='" NS "QAbstractItemModel',value='(%,%)',numchild='1',children=["
+ "{numchild='1',name='" NS "QObject',addr='%',value='%',"
+ "valueencoded='2',type='" NS "QObject',displayedtype='%'}")
<< address
<< N(m.rowCount())
<< N(m.columnCount())
@@ -854,7 +854,7 @@ void tst_Dumpers::dumpQAbstractItemModelHelper(QAbstractItemModel &m)
QModelIndex mi = m.index(row, column);
expected.append(QByteArray(",{name='[%,%]',value='%',"
"valueencoded='2',numchild='%',addr='$%,%,%,%',"
- "type='"NS"QAbstractItem'}")
+ "type='" NS "QAbstractItem'}")
<< N(row)
<< N(column)
<< utfToBase64(m.data(mi).toString())
@@ -907,19 +907,19 @@ void tst_Dumpers::dumpQByteArray()
{
// Case 1: Empty object.
QByteArray ba;
- testDumper("value='',valueencoded='1',type='"NS"QByteArray',numchild='0',"
+ testDumper("value='',valueencoded='1',type='" NS "QByteArray',numchild='0',"
"childtype='char',childnumchild='0',children=[]",
&ba, NS"QByteArray", true);
// Case 2: One element.
ba.append('a');
- testDumper("value='YQ==',valueencoded='1',type='"NS"QByteArray',numchild='1',"
+ testDumper("value='YQ==',valueencoded='1',type='" NS "QByteArray',numchild='1',"
"childtype='char',childnumchild='0',children=[{value='61 (97 'a')'}]",
&ba, NS"QByteArray", true);
// Case 3: Two elements.
ba.append('b');
- testDumper("value='YWI=',valueencoded='1',type='"NS"QByteArray',numchild='2',"
+ testDumper("value='YWI=',valueencoded='1',type='" NS "QByteArray',numchild='2',"
"childtype='char',childnumchild='0',children=["
"{value='61 (97 'a')'},{value='62 (98 'b')'}]",
&ba, NS"QByteArray", true);
@@ -933,13 +933,13 @@ void tst_Dumpers::dumpQByteArray()
testDumper(QByteArray("value='YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh"
"YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh"
"YWFhYWFhYWFhYWFhYWFhYWFhYWFhYQ== <size: 101, cut...>',"
- "valueencoded='1',type='"NS"QByteArray',numchild='101',"
+ "valueencoded='1',type='" NS "QByteArray',numchild='101',"
"childtype='char',childnumchild='0',children=[%]") << children,
&ba, NS"QByteArray", true);
// Case 5: Regular and special characters and the replacement character.
ba = QByteArray("abc\a\n\r\033\'\"?");
- testDumper("value='YWJjBwoNGyciPw==',valueencoded='1',type='"NS"QByteArray',"
+ testDumper("value='YWJjBwoNGyciPw==',valueencoded='1',type='" NS "QByteArray',"
"numchild='10',childtype='char',childnumchild='0',children=["
"{value='61 (97 'a')'},{value='62 (98 'b')'},"
"{value='63 (99 'c')'},{value='07 (7 '?')'},"
@@ -1007,7 +1007,7 @@ void tst_Dumpers::dumpQDir()
{
// Case 1: Current working directory.
QDir dir = QDir::current();
- testDumper(QByteArray("value='%',valueencoded='2',type='"NS"QDir',numchild='3',"
+ testDumper(QByteArray("value='%',valueencoded='2',type='" NS "QDir',numchild='3',"
"children=[{name='absolutePath',%},{name='canonicalPath',%}]")
<< utfToBase64(dir.absolutePath())
<< generateQStringSpec(dir.absolutePath())
@@ -1016,7 +1016,7 @@ void tst_Dumpers::dumpQDir()
// Case 2: Root directory.
dir = QDir::root();
- testDumper(QByteArray("value='%',valueencoded='2',type='"NS"QDir',numchild='3',"
+ testDumper(QByteArray("value='%',valueencoded='2',type='" NS "QDir',numchild='3',"
"children=[{name='absolutePath',%},{name='canonicalPath',%}]")
<< utfToBase64(dir.absolutePath())
<< generateQStringSpec(dir.absolutePath())
@@ -1030,7 +1030,7 @@ void tst_Dumpers::dumpQFile()
// Case 1: Empty file name => Does not exist.
QFile file1("");
testDumper(QByteArray("value='',valueencoded='2',type='$T',numchild='2',"
- "children=[{name='fileName',value='',valueencoded='2',type='"NS"QString',"
+ "children=[{name='fileName',value='',valueencoded='2',type='" NS "QString',"
"numchild='0'},"
"{name='exists',value='false',type='bool',numchild='0'}]"),
&file1, NS"QFile", true);
@@ -1039,7 +1039,7 @@ void tst_Dumpers::dumpQFile()
QTemporaryFile file2;
file2.open();
testDumper(QByteArray("value='%',valueencoded='2',type='$T',numchild='2',"
- "children=[{name='fileName',value='%',valueencoded='2',type='"NS"QString',"
+ "children=[{name='fileName',value='%',valueencoded='2',type='" NS "QString',"
"numchild='0'},"
"{name='exists',value='true',type='bool',numchild='0'}]")
<< utfToBase64(file2.fileName()) << utfToBase64(file2.fileName()),
@@ -1048,7 +1048,7 @@ void tst_Dumpers::dumpQFile()
// Case 3: File with a name that most likely does not exist.
QFile file3("jfjfdskjdflsdfjfdls");
testDumper(QByteArray("value='%',valueencoded='2',type='$T',numchild='2',"
- "children=[{name='fileName',value='%',valueencoded='2',type='"NS"QString',"
+ "children=[{name='fileName',value='%',valueencoded='2',type='" NS "QString',"
"numchild='0'},"
"{name='exists',value='false',type='bool',numchild='0'}]")
<< utfToBase64(file3.fileName()) << utfToBase64(file3.fileName()),
@@ -1097,11 +1097,11 @@ void tst_Dumpers::dumpQFileInfo()
"{name='isSymLink',%},"
"{name='isWritable',%},"
"{name='created',value='%',valueencoded='2',%,"
- "type='"NS"QDateTime',numchild='1'},"
+ "type='" NS "QDateTime',numchild='1'},"
"{name='lastModified',value='%',valueencoded='2',%,"
- "type='"NS"QDateTime',numchild='1'},"
+ "type='" NS "QDateTime',numchild='1'},"
"{name='lastRead',value='%',valueencoded='2',%,"
- "type='"NS"QDateTime',numchild='1'}]");
+ "type='" NS "QDateTime',numchild='1'}]");
expected <<= utfToBase64(fi.filePath());
expected <<= generateQStringSpec(fi.absolutePath());
expected <<= generateQStringSpec(fi.absoluteFilePath());
@@ -1213,7 +1213,7 @@ void tst_Dumpers::dumpQHashNode()
void tst_Dumpers::dumpQImageHelper(const QImage &img)
{
- QByteArray expected = "value='(%x%)',type='"NS"QImage',numchild='0'"
+ QByteArray expected = "value='(%x%)',type='" NS "QImage',numchild='0'"
<< N(img.width())
<< N(img.height());
testDumper(expected, &img, NS"QImage", true);
@@ -1237,7 +1237,7 @@ void tst_Dumpers::dumpQImage()
void tst_Dumpers::dumpQImageDataHelper(QImage &img)
{
const QByteArray ba(QByteArray::fromRawData((const char*) img.bits(), img.numBytes()));
- QByteArray expected = QByteArray("tiname='$I',addr='$A',type='"NS"QImageData',").
+ QByteArray expected = QByteArray("tiname='$I',addr='$A',type='" NS "QImageData',").
append("numchild='0',value='<hover here>',valuetooltipencoded='1',").
append("valuetooltipsize='").append(N(ba.size())).append("',").
append("valuetooltip='").append(ba.toBase64()).append("'");
@@ -1373,7 +1373,7 @@ void tst_Dumpers::dumpQLinkedList()
// Case 2.1: Empty list.
testDumper("value='<0 items>',valueeditable='false',numchild='0',"
- "childtype='"NS"QString',childnumchild='0',children=[]",
+ "childtype='" NS "QString',childnumchild='0',children=[]",
&l2, NS"QLinkedList", true, NS"QString");
// Case 2.2: One element.
@@ -1381,7 +1381,7 @@ void tst_Dumpers::dumpQLinkedList()
iter = l2.constBegin();
qDebug() << *iter;
testDumper("value='<1 items>',valueeditable='false',numchild='1',"
- "childtype='"NS"QString',childnumchild='0',children=[{addr='%',value='%',}]"
+ "childtype='" NS "QString',childnumchild='0',children=[{addr='%',value='%',}]"
<< ptrToBa(iter.operator->()) << utfToBase64(*iter),
&l2, NS"QLinkedList", true, NS"QString");
@@ -1402,7 +1402,7 @@ void tst_Dumpers::dumpQLinkedList()
l2.append("Test " + N(i));
expected = "value='<1002 items>',valueeditable='false',"
- "numchild='1002',childtype='"NS"QString',childnumchild='0',children=['";
+ "numchild='1002',childtype='" NS "QString',childnumchild='0',children=['";
iter = l2.constBegin();
for (int i = 0; i < 1002; ++i, ++iter)
expected.append("{addr='%',value='%'},"
@@ -1476,7 +1476,7 @@ void tst_Dumpers::dumpQList_QString()
slist.append("a");
slist.append("b");
testDumper("value='<2 items>',valueeditable='false',numchild='2',"
- "internal='1',childtype='"NS"QString',childnumchild='0',children=["
+ "internal='1',childtype='" NS "QString',childnumchild='0',children=["
"{addr='" + str(&slist.at(0)) + "',value='YQA=',valueencoded='2'},"
"{addr='" + str(&slist.at(1)) + "',value='YgA=',valueencoded='2'}]",
&slist, NS"QList", true, NS"QString");
@@ -1594,12 +1594,12 @@ template <typename K, typename V>
size_t backwardOffset = size_t(&node->backward) - valOff;
char *addr = reinterpret_cast<char *>(&(*it)) + backwardOffset;
expected.append("addr='").append(ptrToBa(addr)).
- append("',type='"NS"QMapNode<").append(keyTypeStr).append(",").
+ append("',type='" NS "QMapNode<").append(keyTypeStr).append(",").
append(valTypeStr).append(" >").append("'");
#else
- expected.append("type='"NS"QMapData::Node<").append(keyTypeStr).
+ expected.append("type='" NS "QMapData::Node<").append(keyTypeStr).
append(",").append(valTypeStr).append(" >").
- append("',exp='*('"NS"QMapData::Node<").append(keyTypeStr).
+ append("',exp='*('" NS "QMapData::Node<").append(keyTypeStr).
append(",").append(valTypeStr).append(" >").
append(" >'*)").append(ptrToBa(&(*it))).append("'");
#endif
@@ -1787,12 +1787,12 @@ void tst_Dumpers::dumpQObjectChildListHelper(QObject &o)
const int size = children.size();
const QString sizeStr = N(size);
QByteArray expected = QByteArray("numchild='").append(sizeStr).append("',value='<").
- append(sizeStr).append(" items>',type='"NS"QObjectChildList',children=[");
+ append(sizeStr).append(" items>',type='" NS "QObjectChildList',children=[");
for (int i = 0; i < size; ++i) {
const QObject *child = children.at(i);
expected.append("{addr='").append(ptrToBa(child)).append("',value='").
append(utfToBase64(child->objectName())).
- append("',valueencoded='2',type='"NS"QObject',displayedtype='").
+ append("',valueencoded='2',type='" NS "QObject',displayedtype='").
append(child->metaObject()->className()).append("',numchild='1'}");
if (i < size - 1)
expected.append(",");
@@ -1820,7 +1820,7 @@ void tst_Dumpers::dumpQObjectMethodList()
{
QStringListModel m;
testDumper("addr='<synthetic>',type='$T',numchild='24',"
- "childtype='"NS"QMetaMethod::Method',childnumchild='0',children=["
+ "childtype='" NS "QMetaMethod::Method',childnumchild='0',children=["
"{name='0 0 destroyed(QObject*)',value='<Signal> (1)'},"
"{name='1 1 destroyed()',value='<Signal> (1)'},"
"{name='2 2 deleteLater()',value='<Slot> (2)'},"
@@ -1904,7 +1904,7 @@ typedef QVector<QObjectPrivate::ConnectionList> ConnLists;
void tst_Dumpers::dumpQObjectSignalHelper(QObject &o, int sigNum)
{
//qDebug() << o.objectName() << sigNum;
- QByteArray expected("addr='<synthetic>',numchild='1',type='"NS"QObjectSignal'");
+ QByteArray expected("addr='<synthetic>',numchild='1',type='" NS "QObjectSignal'");
#if QT_VERSION >= 0x040400 && QT_VERSION <= 0x040700
expected.append(",children=[");
const QObjectPrivate *p = Cheater::getPrivate(o);
@@ -1924,11 +1924,11 @@ void tst_Dumpers::dumpQObjectSignalHelper(QObject &o, int sigNum)
append(o.metaObject()->className()).
append("',numchild='0',addr='").append(ptrToBa(&o)).append("'");
else if (conn->receiver == 0)
- expected.append("value='0x0',type='"NS"QObject *',numchild='0'");
+ expected.append("value='0x0',type='" NS "QObject *',numchild='0'");
else
expected.append("addr='").append(ptrToBa(conn->receiver)).append("',value='").
append(utfToBase64(conn->receiver->objectName())).append("',valueencoded='2',").
- append("type='"NS"QObject',displayedtype='").
+ append("type='" NS "QObject',displayedtype='").
append(conn->receiver->metaObject()->className()).append("',numchild='1'");
expected.append("},{name='").append(iStr).append(" slot',type='',value='");
if (conn->receiver != 0)
@@ -1951,7 +1951,7 @@ void tst_Dumpers::dumpQObjectSignal()
// Case 1: Simple QObject.
QObject o;
o.setObjectName("Test");
- testDumper("addr='<synthetic>',numchild='1',type='"NS"QObjectSignal',"
+ testDumper("addr='<synthetic>',numchild='1',type='" NS "QObjectSignal',"
"children=[],numchild='0'",
&o, NS"QObjectSignal", true, "", "", 0);
@@ -1987,58 +1987,58 @@ void tst_Dumpers::dumpQObjectSignalList()
QObject o;
o.setObjectName("Test");
- testDumper("type='"NS"QObjectSignalList',value='<2 items>',"
+ testDumper("type='" NS "QObjectSignalList',value='<2 items>',"
"addr='$A',numchild='2',children=["
"{name='0',value='destroyed(QObject*)',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='1',value='destroyed()',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'}]",
+ "addr='$A',type='" NS "QObjectSignal'}]",
&o, NS"QObjectSignalList", true);
// Case 2: QAbstractItemModel with no connections.
QStringListModel m(QStringList() << "Test1" << "Test2");
- QByteArray expected = "type='"NS"QObjectSignalList',value='<20 items>',"
+ QByteArray expected = "type='" NS "QObjectSignalList',value='<20 items>',"
"addr='$A',numchild='20',children=["
"{name='0',value='destroyed(QObject*)',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='1',value='destroyed()',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='4',value='dataChanged(QModelIndex,QModelIndex)',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='5',value='headerDataChanged(Qt::Orientation,int,int)',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='6',value='layoutChanged()',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='7',value='layoutAboutToBeChanged()',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='8',value='rowsAboutToBeInserted(QModelIndex,int,int)',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='9',value='rowsInserted(QModelIndex,int,int)',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='10',value='rowsAboutToBeRemoved(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='11',value='rowsRemoved(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='12',value='columnsAboutToBeInserted(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='13',value='columnsInserted(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='14',value='columnsAboutToBeRemoved(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='15',value='columnsRemoved(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='16',value='modelAboutToBeReset()',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='17',value='modelReset()',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='18',value='rowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='19',value='rowsMoved(QModelIndex,int,int,QModelIndex,int)',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='20',value='columnsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='21',value='columnsMoved(QModelIndex,int,int,QModelIndex,int)',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'}]";
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'}]";
testDumper(expected << "0" << "0" << "0" << "0" << "0" << "0",
@@ -2143,22 +2143,22 @@ void tst_Dumpers::dumpQObjectSlotList()
o.setObjectName("Test");
testDumper("numchild='2',value='<2 items>',type='$T',"
"children=[{name='2',value='deleteLater()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='3',value='_q_reregisterTimers(void*)',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'}]",
+ "addr='$A',type='" NS "QObjectSlot'}]",
&o, NS"QObjectSlotList", true);
// Case 2: QAbstractItemModel with no connections.
QStringListModel m(QStringList() << "Test1" << "Test2");
testDumper("numchild='4',value='<4 items>',type='$T',"
"children=[{name='2',value='deleteLater()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='3',value='_q_reregisterTimers(void*)',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='22',value='submit()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='23',value='revert()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'}]",
+ "addr='$A',type='" NS "QObjectSlot'}]",
&m, NS"QObjectSlotList", true);
// Case 3: QAbstractItemModel with connections to itself and to another
@@ -2177,13 +2177,13 @@ void tst_Dumpers::dumpQObjectSlotList()
connect(&o, SIGNAL(destroyed(QObject *)), &m, SLOT(submit()));
testDumper("numchild='4',value='<4 items>',type='$T',"
"children=[{name='2',value='deleteLater()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='3',value='_q_reregisterTimers(void*)',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='22',value='submit()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='23',value='revert()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'}]",
+ "addr='$A',type='" NS "QObjectSlot'}]",
&m, NS"QObjectSlotList", true);
}
@@ -2330,7 +2330,7 @@ void tst_Dumpers::dumpQVariant_QStringList()
{
QVariant v = QStringList() << "Hi";
testDumper("value='(QStringList) ',type='$T',numchild='1',"
- "children=[{name='value',exp='(*('"NS"QStringList'*)%)',"
+ "children=[{name='value',exp='(*('" NS "QStringList'*)%)',"
"type='QStringList',numchild='1'}]"
<< QByteArray::number(quintptr(&v)),
&v, NS"QVariant", true);
@@ -2369,7 +2369,7 @@ void tst_Dumpers::dumpQTextCodecHelper(QTextCodec *codec)
{
const QByteArray name = codec->name().toBase64();
QByteArray expected = QByteArray("value='%',valueencoded='1',type='$T',"
- "numchild='2',children=[{name='name',value='%',type='"NS"QByteArray',"
+ "numchild='2',children=[{name='name',value='%',type='" NS "QByteArray',"
"numchild='0',valueencoded='1'},{name='mibEnum',%}]")
<< name << name << generateIntSpec(codec->mibEnum());
testDumper(expected, codec, NS"QTextCodec", true);
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index bc1dd1b809556fc01be3c32bb41265bca8145945..85d481a2d67247f470ffb2d0cde3b748095972cb 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -720,10 +720,10 @@ void tst_Gdb::dump_Foo()
"{name='b',type='int',value='2',numchild='0'},"
"{name='x',type='char [6]',"
"value='{...}',numchild='1'},"
- "{name='m',type='"NS"QMap<"NS"QString, "NS"QString>',"
+ "{name='m',type='" NS "QMap<" NS "QString, " NS "QString>',"
"value='{...}',numchild='1'},"
- "{name='h',type='"NS"QHash<"NS"QObject*, "
- ""NS"QMap<"NS"QString, "NS"QString>::iterator>',"
+ "{name='h',type='" NS "QHash<" NS "QObject*, "
+ "" NS "QMap<" NS "QString, " NS "QString>::iterator>',"
"value='{...}',numchild='1'}]}",
"local.f", 0);
}
@@ -858,7 +858,7 @@ void tst_Gdb::dump_typedef()
prepare("dump_typedef");
next(2);
check("D","{iname='local.t',name='t',type='T',"
- //"basetype='"NS"QMap<unsigned int, double>',"
+ //"basetype='" NS "QMap<unsigned int, double>',"
"value='-',numchild='1',"
"childtype='double',childnumchild='0',"
"children=[{name='11',value='13'}]}", "local.t");
@@ -878,7 +878,7 @@ void tst_Gdb::dump_QAbstractItemHelper(QModelIndex &index)
QByteArray indexSpecValue = QByteArray().append(rowStr + "," + colStr + ",").
append(internalPtrStrValue + "," + modelPtrStr);
QByteArray expected = QByteArray("tiname='iname',addr='").append(ptrToBa(&index)).
- append("',type='"NS"QAbstractItem',addr='$").append(indexSpecSymbolic).
+ append("',type='" NS "QAbstractItem',addr='$").append(indexSpecSymbolic).
append("',value='").append(valToString(model->data(index).toString())).
append("',numchild='1',children=[");
int rowCount = model->rowCount(index);
@@ -891,7 +891,7 @@ void tst_Gdb::dump_QAbstractItemHelper(QModelIndex &index)
append(N(childIndex.row())).append(",").
append(N(childIndex.column())).append(",").
append(ptrToBa(childIndex.internalPointer())).append(",").
- append(modelPtrStr).append("',type='"NS"QAbstractItem',value='").
+ append(modelPtrStr).append("',type='" NS "QAbstractItem',value='").
append(valToString(model->data(childIndex).toString())).append("'}");
if (col < columnCount - 1 || row < rowCount - 1)
expected.append(",");
@@ -997,38 +997,38 @@ void tst_Gdb::dump_QAbstractItemAndModelIndex()
next();
check("C", "{iname='local.m2',name='m2',type='PseudoTreeItemModel',"
"value='{...}',numchild='6'},"
- "{iname='local.index',name='index',type='"NS"QModelIndex',"
+ "{iname='local.index',name='index',type='" NS "QModelIndex',"
"value='(invalid)',numchild='0'}",
"local.index");
next();
check("D", "{iname='local.m2',name='m2',type='PseudoTreeItemModel',"
"value='{...}',numchild='6'},"
- "{iname='local.index',name='index',type='"NS"QModelIndex',"
+ "{iname='local.index',name='index',type='" NS "QModelIndex',"
"value='(0, 0)',numchild='5',children=["
"{name='row',value='0',type='int',numchild='0'},"
"{name='column',value='0',type='int',numchild='0'},"
- "{name='parent',type='"NS"QModelIndex',value='(invalid)',numchild='0'},"
- "{name='model',value='-',type='"NS"QAbstractItemModel*',numchild='1'}]}",
+ "{name='parent',type='" NS "QModelIndex',value='(invalid)',numchild='0'},"
+ "{name='model',value='-',type='" NS "QAbstractItemModel*',numchild='1'}]}",
"local.index");
next();
check("E", "{iname='local.m2',name='m2',type='PseudoTreeItemModel',"
"value='{...}',numchild='6'},"
- "{iname='local.index',name='index',type='"NS"QModelIndex',"
+ "{iname='local.index',name='index',type='" NS "QModelIndex',"
"value='(1, 0)',numchild='5',children=["
"{name='row',value='1',type='int',numchild='0'},"
"{name='column',value='0',type='int',numchild='0'},"
- "{name='parent',type='"NS"QModelIndex',value='(invalid)',numchild='0'},"
- "{name='model',value='-',type='"NS"QAbstractItemModel*',numchild='1'}]}",
+ "{name='parent',type='" NS "QModelIndex',value='(invalid)',numchild='0'},"
+ "{name='model',value='-',type='" NS "QAbstractItemModel*',numchild='1'}]}",
"local.index");
next();
check("F", "{iname='local.m2',name='m2',type='PseudoTreeItemModel',"
"value='{...}',numchild='6'},"
- "{iname='local.index',name='index',type='"NS"QModelIndex',"
+ "{iname='local.index',name='index',type='" NS "QModelIndex',"
"value='(0, 0)',numchild='5',children=["
"{name='row',value='0',type='int',numchild='0'},"
"{name='column',value='0',type='int',numchild='0'},"
- "{name='parent',type='"NS"QModelIndex',value='(1, 0)',numchild='5'},"
- "{name='model',value='-',type='"NS"QAbstractItemModel*',numchild='1'}]}",
+ "{name='parent',type='" NS "QModelIndex',value='(1, 0)',numchild='5'},"
+ "{name='model',value='-',type='" NS "QAbstractItemModel*',numchild='1'}]}",
"local.index");
}
@@ -1037,9 +1037,9 @@ QByteArray dump_QAbstractItemModelHelper(QAbstractItemModel &m)
{
QByteArray address = ptrToBa(&m);
QByteArray expected = QByteArray("tiname='iname',"
- "type='"NS"QAbstractItemModel',value='(%,%)',numchild='1',children=["
- "{numchild='1',name='"NS"QObject',value='%',"
- "valueencoded='2',type='"NS"QObject',displayedtype='%'}")
+ "type='" NS "QAbstractItemModel',value='(%,%)',numchild='1',children=["
+ "{numchild='1',name='" NS "QObject',value='%',"
+ "valueencoded='2',type='" NS "QObject',displayedtype='%'}")
<< address
<< N(m.rowCount())
<< N(m.columnCount())
@@ -1052,7 +1052,7 @@ QByteArray dump_QAbstractItemModelHelper(QAbstractItemModel &m)
QModelIndex mi = m.index(row, column);
expected.append(QByteArray(",{name='[%,%]',value='%',"
"valueencoded='2',numchild='1',%,%,%',"
- "type='"NS"QAbstractItem'}")
+ "type='" NS "QAbstractItem'}")
<< N(row)
<< N(column)
<< utfToHex(m.data(mi).toString())
@@ -1088,11 +1088,11 @@ void tst_Gdb::dump_QAbstractItemModel()
# ifdef QT_GUI_LIB
/* A */ QStringList strList;
QString template_ =
- "{iname='local.strList',name='strList',type='"NS"QStringList',"
+ "{iname='local.strList',name='strList',type='" NS "QStringList',"
"value='<%1 items>',numchild='%1'},"
- "{iname='local.model1',name='model1',type='"NS"QStringListModel',"
+ "{iname='local.model1',name='model1',type='" NS "QStringListModel',"
"value='{...}',numchild='3'},"
- "{iname='local.model2',name='model2',type='"NS"QStandardItemModel',"
+ "{iname='local.model2',name='model2',type='" NS "QStandardItemModel',"
"value='{...}',numchild='2'}";
prepare("dump_QAbstractItemModel");
@@ -1120,27 +1120,27 @@ void tst_Gdb::dump_QByteArray()
{
prepare("dump_QByteArray");
if (checkUninitialized)
- check("A","{iname='local.ba',name='ba',type='"NS"QByteArray',"
+ check("A","{iname='local.ba',name='ba',type='" NS "QByteArray',"
"value='<invalid>',numchild='0'}");
next();
- check("B","{iname='local.ba',name='ba',type='"NS"QByteArray',"
+ check("B","{iname='local.ba',name='ba',type='" NS "QByteArray',"
"valueencoded='6',value='',numchild='0'}");
next();
- check("C","{iname='local.ba',name='ba',type='"NS"QByteArray',"
+ check("C","{iname='local.ba',name='ba',type='" NS "QByteArray',"
"valueencoded='6',value='61',numchild='1'}");
next();
- check("D","{iname='local.ba',name='ba',type='"NS"QByteArray',"
+ check("D","{iname='local.ba',name='ba',type='" NS "QByteArray',"
"valueencoded='6',value='6162',numchild='2'}");
next();
- check("E","{iname='local.ba',name='ba',type='"NS"QByteArray',"
+ check("E","{iname='local.ba',name='ba',type='" NS "QByteArray',"
"valueencoded='6',value='616161616161616161616161616161616161"
"616161616161616161616161616161616161616161616161616161616161"
"616161616161616161616161616161616161616161616161616161616161"
"6161616161616161616161616161616161616161616161',numchild='101'}");
next();
- check("F","{iname='local.ba',name='ba',type='"NS"QByteArray',"
+ check("F","{iname='local.ba',name='ba',type='" NS "QByteArray',"
"valueencoded='6',value='616263070a0d1b27223f',numchild='10'}");
- check("F","{iname='local.ba',name='ba',type='"NS"QByteArray',"
+ check("F","{iname='local.ba',name='ba',type='" NS "QByteArray',"
"valueencoded='6',value='616263070a0d1b27223f',numchild='10',"
"childtype='char',childnumchild='0',"
"children=[{value='97 'a''},{value='98 'b''},"
@@ -1169,27 +1169,27 @@ void tst_Gdb::dump_QChar()
next();
// Case 1: Printable ASCII character.
- check("B","{iname='local.c',name='c',type='"NS"QChar',"
+ check("B","{iname='local.c',name='c',type='" NS "QChar',"
"value=''X' (88)',numchild='0'}");
next();
// Case 2: Printable non-ASCII character.
- check("C","{iname='local.c',name='c',type='"NS"QChar',"
+ check("C","{iname='local.c',name='c',type='" NS "QChar',"
"value=''?' (1536)',numchild='0'}");
next();
// Case 3: Non-printable ASCII character.
- check("D","{iname='local.c',name='c',type='"NS"QChar',"
+ check("D","{iname='local.c',name='c',type='" NS "QChar',"
"value=''?' (7)',numchild='0'}");
next();
// Case 4: Non-printable non-ASCII character.
- check("E","{iname='local.c',name='c',type='"NS"QChar',"
+ check("E","{iname='local.c',name='c',type='" NS "QChar',"
"value=''?' (159)',numchild='0'}");
next();
// Case 5: Printable ASCII Character that looks like the replacement character.
- check("F","{iname='local.c',name='c',type='"NS"QChar',"
+ check("F","{iname='local.c',name='c',type='" NS "QChar',"
"value=''?' (63)',numchild='0'}");
}
@@ -1211,10 +1211,10 @@ void tst_Gdb::dump_QDateTime()
prepare("dump_QDateTime");
if (checkUninitialized)
check("A","{iname='local.d',name='d',"
- "type='"NS"QDateTime',value='<invalid>',"
+ "type='" NS "QDateTime',value='<invalid>',"
"numchild='0'}");
next();
- check("B", "{iname='local.d',name='d',type='"NS"QDateTime',"
+ check("B", "{iname='local.d',name='d',type='" NS "QDateTime',"
"valueencoded='7',value='-',numchild='3',children=["
"{name='isNull',type='bool',value='true',numchild='0'},"
"{name='toTime_t',type='unsigned int',value='4294967295',numchild='0'},"
@@ -1233,7 +1233,7 @@ void tst_Gdb::dump_QDateTime()
"]}",
"local.d");
next();
- check("C", "{iname='local.d',name='d',type='"NS"QDateTime',"
+ check("C", "{iname='local.d',name='d',type='" NS "QDateTime',"
"valueencoded='7',value='-',"
"numchild='3',children=["
"{name='isNull',type='bool',value='false',numchild='0'},"
@@ -1269,22 +1269,22 @@ void tst_Gdb::dump_QDir()
prepare("dump_QDir");
if (checkUninitialized)
check("A","{iname='local.dir',name='dir',"
- "type='"NS"QDir',value='<invalid>',"
+ "type='" NS "QDir',value='<invalid>',"
"numchild='0'}");
next();
- check("B", "{iname='local.dir',name='dir',type='"NS"QDir',"
+ check("B", "{iname='local.dir',name='dir',type='" NS "QDir',"
"valueencoded='7',value='-',numchild='2',children=["
- "{name='absolutePath',type='"NS"QString',"
+ "{name='absolutePath',type='" NS "QString',"
"valueencoded='7',value='-',numchild='0'},"
- "{name='canonicalPath',type='"NS"QString',"
+ "{name='canonicalPath',type='" NS "QString',"
"valueencoded='7',value='-',numchild='0'}]}",
"local.dir");
next();
- check("C", "{iname='local.dir',name='dir',type='"NS"QDir',"
+ check("C", "{iname='local.dir',name='dir',type='" NS "QDir',"
"valueencoded='7',value='-',numchild='2',children=["
- "{name='absolutePath',type='"NS"QString',"
+ "{name='absolutePath',type='" NS "QString',"
"valueencoded='7',value='-',numchild='0'},"
- "{name='canonicalPath',type='"NS"QString',"
+ "{name='canonicalPath',type='" NS "QString',"
"valueencoded='7',value='-',numchild='0'}]}",
"local.dir");
}
@@ -1304,21 +1304,21 @@ void tst_Gdb::dump_QFile()
{
prepare("dump_QFile");
next(4);
- check("D", "{iname='local.file1',name='file1',type='"NS"QFile',"
+ check("D", "{iname='local.file1',name='file1',type='" NS "QFile',"
"valueencoded='7',value='',numchild='2',children=["
- "{name='fileName',type='"NS"QString',"
+ "{name='fileName',type='" NS "QString',"
"valueencoded='7',value='',numchild='0'},"
"{name='exists',type='bool',value='false',numchild='0'}"
"]},"
- "{iname='local.file2',name='file2',type='"NS"QTemporaryFile',"
+ "{iname='local.file2',name='file2',type='" NS "QTemporaryFile',"
"valueencoded='7',value='-',numchild='2',children=["
- "{name='fileName',type='"NS"QString',"
+ "{name='fileName',type='" NS "QString',"
"valueencoded='7',value='-',numchild='0'},"
"{name='exists',type='bool',value='true',numchild='0'}"
"]},"
- "{iname='local.file3',name='file3',type='"NS"QFile',"
+ "{iname='local.file3',name='file3',type='" NS "QFile',"
"valueencoded='7',value='-',numchild='2',children=["
- "{name='fileName',type='"NS"QString',"
+ "{name='fileName',type='" NS "QString',"
"valueencoded='7',value='-',numchild='0'},"
"{name='exists',type='bool',value='false',numchild='0'}"
"]}",
@@ -1339,9 +1339,9 @@ void tst_Gdb::dump_QFileInfo()
QFileInfo fi(".");
prepare("dump_QFileInfo");
next();
- check("B", "{iname='local.fi',name='fi',type='"NS"QFileInfo',"
+ check("B", "{iname='local.fi',name='fi',type='" NS "QFileInfo',"
"valueencoded='7',value='" + utfToHex(fi.filePath()) + "',numchild='3',"
- "childtype='"NS"QString',childnumchild='0',children=["
+ "childtype='" NS "QString',childnumchild='0',children=["
"{name='absolutePath'," + specQString(fi.absolutePath()) + "},"
"{name='absoluteFilePath'," + specQString(fi.absoluteFilePath()) + "},"
"{name='canonicalPath'," + specQString(fi.canonicalPath()) + "},"
@@ -1360,7 +1360,7 @@ void tst_Gdb::dump_QFileInfo()
"{name='path'," + specQString(fi.path()) + "},"
"{name='groupid',type='unsigned int',value='" + N(fi.groupId()) + "'},"
"{name='ownerid',type='unsigned int',value='" + N(fi.ownerId()) + "'},"
- "{name='permissions',value=' ',type='"NS"QFile::Permissions',numchild='10'},"
+ "{name='permissions',value=' ',type='" NS "QFile::Permissions',numchild='10'},"
"{name='caching',type='bool',value='true'},"
"{name='exists',type='bool',value='true'},"
"{name='isAbsolute',type='bool',value='false'},"
@@ -1373,11 +1373,11 @@ void tst_Gdb::dump_QFileInfo()
"{name='isRoot',type='bool',value='false'},"
"{name='isSymLink',type='bool',value='false'},"
"{name='isWritable',type='bool',value='true'},"
- "{name='created',type='"NS"QDateTime',"
+ "{name='created',type='" NS "QDateTime',"
+ specQString(fi.created().toString()) + ",numchild='3'},"
- "{name='lastModified',type='"NS"QDateTime',"
+ "{name='lastModified',type='" NS "QDateTime',"
+ specQString(fi.lastModified().toString()) + ",numchild='3'},"
- "{name='lastRead',type='"NS"QDateTime',"
+ "{name='lastRead',type='" NS "QDateTime',"
+ specQString(fi.lastRead().toString()) + ",numchild='3'}]}",
"local.fi");
}
@@ -1387,7 +1387,7 @@ void tst_Gdb::dump_QFileInfo()
void tst_Gdb::dump_QImageDataHelper(QImage &img)
{
const QByteArray ba(QByteArray::fromRawData((const char*) img.bits(), img.numBytes()));
- QByteArray expected = QByteArray("tiname='$I',addr='$A',type='"NS"QImageData',").
+ QByteArray expected = QByteArray("tiname='$I',addr='$A',type='" NS "QImageData',").
append("numchild='0',value='<hover here>',valuetooltipencoded='1',").
append("valuetooltipsize='").append(N(ba.size())).append("',").
append("valuetooltip='").append(ba.toBase64()).append("'");
@@ -1415,14 +1415,14 @@ void tst_Gdb::dump_QImage()
# ifdef QT_GUI_LIB
prepare("dump_QImage");
next();
- check("B", "{iname='local.image',name='image',type='"NS"QImage',"
+ check("B", "{iname='local.image',name='image',type='" NS "QImage',"
"value='(null)',numchild='0'}");
next();
- check("C", "{iname='local.image',name='image',type='"NS"QImage',"
+ check("C", "{iname='local.image',name='image',type='" NS "QImage',"
"value='(30x700)',numchild='0'}");
next(2);
// FIXME:
- //check("E", "{iname='local.image',name='image',type='"NS"QImage',"
+ //check("E", "{iname='local.image',name='image',type='" NS "QImage',"
// "value='(100x0)',numchild='0'}");
# endif
}
@@ -1454,17 +1454,17 @@ void dump_QLocale()
QByteArray dump_QLocaleHelper(const QLocale &loc)
{
- return "type='"NS"QLocale',valueencoded='7',value='" + utfToHex(loc.name()) +
- "',numchild='8',childtype='"NS"QChar',childnumchild='0',children=["
- "{name='country',type='"NS"QLocale::Country',value='-'},"
- "{name='language',type='"NS"QLocale::Language',value='-'},"
- "{name='measurementSystem',type='"NS"QLocale::MeasurementSystem',"
+ return "type='" NS "QLocale',valueencoded='7',value='" + utfToHex(loc.name()) +
+ "',numchild='8',childtype='" NS "QChar',childnumchild='0',children=["
+ "{name='country',type='" NS "QLocale::Country',value='-'},"
+ "{name='language',type='" NS "QLocale::Language',value='-'},"
+ "{name='measurementSystem',type='" NS "QLocale::MeasurementSystem',"
"value='-'},"
- "{name='numberOptions',type='"NS"QFlags<myns::QLocale::NumberOption>',"
+ "{name='numberOptions',type='" NS "QFlags<myns::QLocale::NumberOption>',"
"value='-'},"
- "{name='timeFormat_(short)',type='"NS"QString',"
+ "{name='timeFormat_(short)',type='" NS "QString',"
+ specQString(loc.timeFormat(QLocale::ShortFormat)) + "},"
- "{name='timeFormat_(long)',type='"NS"QString',"
+ "{name='timeFormat_(long)',type='" NS "QString',"
+ specQString(loc.timeFormat()) + "},"
"{name='decimalPoint'," + specQChar(loc.decimalPoint()) + "},"
"{name='exponential'," + specQChar(loc.exponential()) + "},"
@@ -1482,7 +1482,7 @@ void tst_Gdb::dump_QLocale()
prepare("dump_QLocale");
if (checkUninitialized)
check("A","{iname='local.english',name='english',"
- "type='"NS"QLocale',value='<invalid>',"
+ "type='" NS "QLocale',value='<invalid>',"
"numchild='0'}");
next(3);
check("C", "{iname='local.german',name='german',"
@@ -1521,11 +1521,11 @@ void tst_Gdb::dump_QHash_int_int()
prepare("dump_QHash_int_int");
if (checkUninitialized)
check("A","{iname='local.h',name='h',"
- "type='"NS"QHash<int, int>',value='<invalid>',"
+ "type='" NS "QHash<int, int>',value='<invalid>',"
"numchild='0'}");
next(3);
check("D","{iname='local.h',name='h',"
- "type='"NS"QHash<int, int>',value='<2 items>',numchild='2',"
+ "type='" NS "QHash<int, int>',value='<2 items>',numchild='2',"
"childtype='int',childnumchild='0',children=["
"{name='43',value='44'},"
"{name='45',value='46'}]}",
@@ -1547,28 +1547,28 @@ void tst_Gdb::dump_QHash_QString_QString()
prepare("dump_QHash_QString_QString");
if (checkUninitialized)
check("A","{iname='local.h',name='h',"
- "type='"NS"QHash<"NS"QString, "NS"QString>',value='<invalid>',"
+ "type='" NS "QHash<" NS "QString, " NS "QString>',value='<invalid>',"
"numchild='0'}");
next();
check("B","{iname='local.h',name='h',"
- "type='"NS"QHash<"NS"QString, "NS"QString>',value='<0 items>',"
+ "type='" NS "QHash<" NS "QString, " NS "QString>',value='<0 items>',"
"numchild='0'}");
next();
next();
check("D","{iname='local.h',name='h',"
- "type='"NS"QHash<"NS"QString, "NS"QString>',value='<2 items>',"
+ "type='" NS "QHash<" NS "QString, " NS "QString>',value='<2 items>',"
"numchild='2'}");
check("D","{iname='local.h',name='h',"
- "type='"NS"QHash<"NS"QString, "NS"QString>',value='<2 items>',"
- "numchild='2',childtype='"NS"QHashNode<"NS"QString, "NS"QString>',"
+ "type='" NS "QHash<" NS "QString, " NS "QString>',value='<2 items>',"
+ "numchild='2',childtype='" NS "QHashNode<" NS "QString, " NS "QString>',"
"children=["
- "{value=' ',numchild='2',children=[{name='key',type='"NS"QString',"
+ "{value=' ',numchild='2',children=[{name='key',type='" NS "QString',"
"valueencoded='7',value='66006f006f00',numchild='0'},"
- "{name='value',type='"NS"QString',"
+ "{name='value',type='" NS "QString',"
"valueencoded='7',value='620061007200',numchild='0'}]},"
- "{value=' ',numchild='2',children=[{name='key',type='"NS"QString',"
+ "{value=' ',numchild='2',children=[{name='key',type='" NS "QString',"
"valueencoded='7',value='680065006c006c006f00',numchild='0'},"
- "{name='value',type='"NS"QString',valueencoded='7',"
+ "{name='value',type='" NS "QString',valueencoded='7',"
"value='77006f0072006c006400',numchild='0'}]}"
"]}",
"local.h,local.h.0,local.h.1");
@@ -1589,11 +1589,11 @@ void tst_Gdb::dump_QLinkedList_int()
prepare("dump_QLinkedList_int");
if (checkUninitialized)
check("A","{iname='local.h',name='h',"
- "type='"NS"QLinkedList<int>',value='<invalid>',"
+ "type='" NS "QLinkedList<int>',value='<invalid>',"
"numchild='0'}");
next(3);
check("D","{iname='local.h',name='h',"
- "type='"NS"QLinkedList<int>',value='<2 items>',numchild='2',"
+ "type='" NS "QLinkedList<int>',value='<2 items>',numchild='2',"
"childtype='int',childnumchild='0',children=["
"{value='42'},{value='44'}]}", "local.h");
}
@@ -1614,22 +1614,22 @@ void tst_Gdb::dump_QList_int()
prepare("dump_QList_int");
if (checkUninitialized)
check("A","{iname='local.list',name='list',"
- "type='"NS"QList<int>',value='<invalid>',numchild='0'}");
+ "type='" NS "QList<int>',value='<invalid>',numchild='0'}");
next();
check("B","{iname='local.list',name='list',"
- "type='"NS"QList<int>',value='<0 items>',numchild='0'}");
+ "type='" NS "QList<int>',value='<0 items>',numchild='0'}");
next();
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<int>',value='<1 items>',numchild='1'}");
+ "type='" NS "QList<int>',value='<1 items>',numchild='1'}");
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<int>',value='<1 items>',numchild='1',"
+ "type='" NS "QList<int>',value='<1 items>',numchild='1',"
"childtype='int',childnumchild='0',children=["
"{value='1'}]}", "local.list");
next();
check("D","{iname='local.list',name='list',"
- "type='"NS"QList<int>',value='<2 items>',numchild='2'}");
+ "type='" NS "QList<int>',value='<2 items>',numchild='2'}");
check("D","{iname='local.list',name='list',"
- "type='"NS"QList<int>',value='<2 items>',numchild='2',"
+ "type='" NS "QList<int>',value='<2 items>',numchild='2',"
"childtype='int',childnumchild='0',children=["
"{value='1'},{value='2'}]}", "local.list");
}
@@ -1651,13 +1651,13 @@ void tst_Gdb::dump_QList_int_star()
prepare("dump_QList_int_star");
if (checkUninitialized)
check("A","{iname='local.list',name='list',"
- "type='"NS"QList<int*>',value='<invalid>',numchild='0'}");
+ "type='" NS "QList<int*>',value='<invalid>',numchild='0'}");
next();
next();
next();
next();
check("E","{iname='local.list',name='list',"
- "type='"NS"QList<int*>',value='<3 items>',numchild='3',"
+ "type='" NS "QList<int*>',value='<3 items>',numchild='3',"
"childtype='int',childnumchild='0',children=["
"{value='1'},{value='0x0',type='int *'},{value='2'}]}", "local.list");
}
@@ -1677,15 +1677,15 @@ void tst_Gdb::dump_QList_char()
prepare("dump_QList_char");
if (checkUninitialized)
check("A","{iname='local.list',name='list',"
- "type='"NS"QList<char>',value='<invalid>',numchild='0'}");
+ "type='" NS "QList<char>',value='<invalid>',numchild='0'}");
next();
check("B","{iname='local.list',name='list',"
- "type='"NS"QList<char>',value='<0 items>',numchild='0'}");
+ "type='" NS "QList<char>',value='<0 items>',numchild='0'}");
next();
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<char>',value='<1 items>',numchild='1'}");
+ "type='" NS "QList<char>',value='<1 items>',numchild='1'}");
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<char>',value='<1 items>',numchild='1',"
+ "type='" NS "QList<char>',value='<1 items>',numchild='1',"
"childtype='char',childnumchild='0',children=["
"{value='97 'a''}]}", "local.list");
}
@@ -1707,21 +1707,21 @@ void tst_Gdb::dump_QList_char_star()
prepare("dump_QList_char_star");
if (checkUninitialized)
check("A","{iname='local.list',name='list',"
- "type='"NS"QList<char const*>',value='<invalid>',numchild='0'}");
+ "type='" NS "QList<char const*>',value='<invalid>',numchild='0'}");
next();
check("B","{iname='local.list',name='list',"
- "type='"NS"QList<char const*>',value='<0 items>',numchild='0'}");
+ "type='" NS "QList<char const*>',value='<0 items>',numchild='0'}");
next();
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<char const*>',value='<1 items>',numchild='1'}");
+ "type='" NS "QList<char const*>',value='<1 items>',numchild='1'}");
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<char const*>',value='<1 items>',numchild='1',"
+ "type='" NS "QList<char const*>',value='<1 items>',numchild='1',"
"childtype='const char *',childnumchild='1',children=["
"{valueencoded='6',value='61',numchild='0'}]}", "local.list");
next();
next();
check("E","{iname='local.list',name='list',"
- "type='"NS"QList<char const*>',value='<3 items>',numchild='3',"
+ "type='" NS "QList<char const*>',value='<3 items>',numchild='3',"
"childtype='const char *',childnumchild='1',children=["
"{valueencoded='6',value='61',numchild='0'},"
"{value='0x0',numchild='0'},"
@@ -1743,16 +1743,16 @@ void tst_Gdb::dump_QList_QString()
prepare("dump_QList_QString");
if (0 && checkUninitialized)
check("A","{iname='local.list',name='list',"
- "type='"NS"QList<"NS"QString>',value='<invalid>',numchild='0'}");
+ "type='" NS "QList<" NS "QString>',value='<invalid>',numchild='0'}");
next();
check("B","{iname='local.list',name='list',"
- "type='"NS"QList<"NS"QString>',value='<0 items>',numchild='0'}");
+ "type='" NS "QList<" NS "QString>',value='<0 items>',numchild='0'}");
next();
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<"NS"QString>',value='<1 items>',numchild='1'}");
+ "type='" NS "QList<" NS "QString>',value='<1 items>',numchild='1'}");
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<"NS"QString>',value='<1 items>',numchild='1',"
- "childtype='"NS"QString',childnumchild='0',children=["
+ "type='" NS "QList<" NS "QString>',value='<1 items>',numchild='1',"
+ "childtype='" NS "QString',childnumchild='0',children=["
"{valueencoded='7',value='480061006c006c006f00'}]}", "local.list");
}
@@ -1771,25 +1771,25 @@ void tst_Gdb::dump_QList_QString3()
prepare("dump_QList_QString3");
if (checkUninitialized)
check("A","{iname='local.list',name='list',"
- "type='"NS"QList<QString3>',value='<invalid>',numchild='0'}");
+ "type='" NS "QList<QString3>',value='<invalid>',numchild='0'}");
next();
check("B","{iname='local.list',name='list',"
- "type='"NS"QList<QString3>',value='<0 items>',numchild='0'}");
+ "type='" NS "QList<QString3>',value='<0 items>',numchild='0'}");
next();
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<QString3>',value='<1 items>',numchild='1'}");
+ "type='" NS "QList<QString3>',value='<1 items>',numchild='1'}");
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<QString3>',value='<1 items>',numchild='1',"
+ "type='" NS "QList<QString3>',value='<1 items>',numchild='1',"
"childtype='QString3',children=["
"{value='{...}',numchild='3'}]}", "local.list");
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<QString3>',value='<1 items>',numchild='1',"
+ "type='" NS "QList<QString3>',value='<1 items>',numchild='1',"
"childtype='QString3',children=[{value='{...}',numchild='3',children=["
- "{name='s1',type='"NS"QString',"
+ "{name='s1',type='" NS "QString',"
"valueencoded='7',value='6100',numchild='0'},"
- "{name='s2',type='"NS"QString',"
+ "{name='s2',type='" NS "QString',"
"valueencoded='7',value='6200',numchild='0'},"
- "{name='s3',type='"NS"QString',"
+ "{name='s3',type='" NS "QString',"
"valueencoded='7',value='6300',numchild='0'}]}]}",
"local.list,local.list.0");
}
@@ -1809,19 +1809,19 @@ void tst_Gdb::dump_QList_Int3()
prepare("dump_QList_Int3");
if (checkUninitialized)
check("A","{iname='local.list',name='list',"
- "type='"NS"QList<Int3>',value='<invalid>',numchild='0'}");
+ "type='" NS "QList<Int3>',value='<invalid>',numchild='0'}");
next();
check("B","{iname='local.list',name='list',"
- "type='"NS"QList<Int3>',value='<0 items>',numchild='0'}");
+ "type='" NS "QList<Int3>',value='<0 items>',numchild='0'}");
next();
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<Int3>',value='<1 items>',numchild='1'}");
+ "type='" NS "QList<Int3>',value='<1 items>',numchild='1'}");
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<Int3>',value='<1 items>',numchild='1',"
+ "type='" NS "QList<Int3>',value='<1 items>',numchild='1',"
"childtype='Int3',children=[{value='{...}',numchild='3'}]}",
"local.list");
check("C","{iname='local.list',name='list',"
- "type='"NS"QList<Int3>',value='<1 items>',numchild='1',"
+ "type='" NS "QList<Int3>',value='<1 items>',numchild='1',"
"childtype='Int3',children=[{value='{...}',numchild='3',children=["
"{name='i1',type='int',value='42',numchild='0'},"
"{name='i2',type='int',value='43',numchild='0'},"
@@ -1845,19 +1845,19 @@ void tst_Gdb::dump_QMap_int_int()
prepare("dump_QMap_int_int");
if (checkUninitialized)
check("A","{iname='local.h',name='h',"
- "type='"NS"QMap<int, int>',value='<invalid>',"
+ "type='" NS "QMap<int, int>',value='<invalid>',"
"numchild='0'}");
next();
check("B","{iname='local.h',name='h',"
- "type='"NS"QMap<int, int>',value='<0 items>',"
+ "type='" NS "QMap<int, int>',value='<0 items>',"
"numchild='0'}");
next();
next();
check("D","{iname='local.h',name='h',"
- "type='"NS"QMap<int, int>',value='<2 items>',"
+ "type='" NS "QMap<int, int>',value='<2 items>',"
"numchild='2'}");
check("D","{iname='local.h',name='h',"
- "type='"NS"QMap<int, int>',value='<2 items>',"
+ "type='" NS "QMap<int, int>',value='<2 items>',"
"numchild='2',childtype='int',childnumchild='0',"
"children=[{name='12',value='34'},{name='14',value='54'}]}",
"local.h,local.h.0,local.h.1");
@@ -1879,28 +1879,28 @@ void tst_Gdb::dump_QMap_QString_QString()
prepare("dump_QMap_QString_QString");
if (checkUninitialized)
check("A","{iname='local.m',name='m',"
- "type='"NS"QMap<"NS"QString, "NS"QString>',value='<invalid>',"
+ "type='" NS "QMap<" NS "QString, " NS "QString>',value='<invalid>',"
"numchild='0'}");
next();
check("B","{iname='local.m',name='m',"
- "type='"NS"QMap<"NS"QString, "NS"QString>',value='<0 items>',"
+ "type='" NS "QMap<" NS "QString, " NS "QString>',value='<0 items>',"
"numchild='0'}");
next();
next();
check("D","{iname='local.m',name='m',"
- "type='"NS"QMap<"NS"QString, "NS"QString>',value='<2 items>',"
+ "type='" NS "QMap<" NS "QString, " NS "QString>',value='<2 items>',"
"numchild='2'}");
check("D","{iname='local.m',name='m',"
- "type='"NS"QMap<"NS"QString, "NS"QString>',value='<2 items>',"
- "numchild='2',childtype='"NS"QMapNode<"NS"QString, "NS"QString>',"
+ "type='" NS "QMap<" NS "QString, " NS "QString>',value='<2 items>',"
+ "numchild='2',childtype='" NS "QMapNode<" NS "QString, " NS "QString>',"
"children=["
- "{value=' ',numchild='2',children=[{name='key',type='"NS"QString',"
+ "{value=' ',numchild='2',children=[{name='key',type='" NS "QString',"
"valueencoded='7',value='66006f006f00',numchild='0'},"
- "{name='value',type='"NS"QString',"
+ "{name='value',type='" NS "QString',"
"valueencoded='7',value='620061007200',numchild='0'}]},"
- "{value=' ',numchild='2',children=[{name='key',type='"NS"QString',"
+ "{value=' ',numchild='2',children=[{name='key',type='" NS "QString',"
"valueencoded='7',value='680065006c006c006f00',numchild='0'},"
- "{name='value',type='"NS"QString',valueencoded='7',"
+ "{name='value',type='" NS "QString',valueencoded='7',"
"value='77006f0072006c006400',numchild='0'}]}"
"]}",
"local.m,local.m.0,local.m.1");
@@ -1931,18 +1931,18 @@ void tst_Gdb::dump_QObject()
prepare("dump_QObject");
if (checkUninitialized)
check("A","{iname='local.ob',name='ob',"
- "type='"NS"QObject',value='<invalid>',"
+ "type='" NS "QObject',value='<invalid>',"
"numchild='0'}");
next(4);
- check("G","{iname='local.ob',name='ob',type='"NS"QObject',valueencoded='7',"
+ check("G","{iname='local.ob',name='ob',type='" NS "QObject',valueencoded='7',"
"value='41006e0020004f0062006a00650063007400',numchild='4',children=["
- "{name='parent',value='0x0',type='"NS"QObject *',"
+ "{name='parent',value='0x0',type='" NS "QObject *',"
"numchild='0'},"
"{name='children',type='-'," // NS"QObject{Data,}::QObjectList',"
"value='<0 items>',numchild='0',children=[]},"
"{name='properties',value='<1 items>',type=' ',numchild='1',children=["
- "{name='objectName',type='"NS"QString',valueencoded='7',"
+ "{name='objectName',type='" NS "QString',valueencoded='7',"
"value='41006e0020004f0062006a00650063007400',numchild='0'}]},"
"{name='connections',value='<0 items>',type=' ',numchild='0',"
"children=[]},"
@@ -2026,12 +2026,12 @@ void tst_Gdb::dump_QObjectChildListHelper(QObject &o)
const int size = children.size();
const QString sizeStr = N(size);
QByteArray expected = QByteArray("numchild='").append(sizeStr).append("',value='<").
- append(sizeStr).append(" items>',type='"NS"QObjectChildList',children=[");
+ append(sizeStr).append(" items>',type='" NS "QObjectChildList',children=[");
for (int i = 0; i < size; ++i) {
const QObject *child = children.at(i);
expected.append("{addr='").append(ptrToBa(child)).append("',value='").
append(utfToHex(child->objectName())).
- append("',valueencoded='2',type='"NS"QObject',displayedtype='").
+ append("',valueencoded='2',type='" NS "QObject',displayedtype='").
append(child->metaObject()->className()).append("',numchild='1'}");
if (i < size - 1)
expected.append(",");
@@ -2059,7 +2059,7 @@ void tst_Gdb::dump_QObjectMethodList()
{
QStringListModel m;
testDumper("addr='<synthetic>',type='$T',numchild='20',"
- "childtype='"NS"QMetaMethod::Method',childnumchild='0',children=["
+ "childtype='" NS "QMetaMethod::Method',childnumchild='0',children=["
"{name='0 0 destroyed(QObject*)',value='<Signal> (1)'},"
"{name='1 1 destroyed()',value='<Signal> (1)'},"
"{name='2 2 deleteLater()',value='<Slot> (2)'},"
@@ -2139,7 +2139,7 @@ typedef QVector<QObjectPrivate::ConnectionList> ConnLists;
void tst_Gdb::dump_QObjectSignalHelper(QObject &o, int sigNum)
{
//qDebug() << o.objectName() << sigNum;
- QByteArray expected("addr='<synthetic>',numchild='1',type='"NS"QObjectSignal'");
+ QByteArray expected("addr='<synthetic>',numchild='1',type='" NS "QObjectSignal'");
#if QT_VERSION >= 0x040400
expected.append(",children=[");
const QObjectPrivate *p = Cheater::getPrivate(o);
@@ -2158,11 +2158,11 @@ void tst_Gdb::dump_QObjectSignalHelper(QObject &o, int sigNum)
append(o.metaObject()->className()).
append("',numchild='0',addr='").append(ptrToBa(&o)).append("'");
else if (conn->receiver == 0)
- expected.append("value='0x0',type='"NS"QObject *',numchild='0'");
+ expected.append("value='0x0',type='" NS "QObject *',numchild='0'");
else
expected.append("addr='").append(ptrToBa(conn->receiver)).append("',value='").
append(utfToHex(conn->receiver->objectName())).append("',valueencoded='2',").
- append("type='"NS"QObject',displayedtype='").
+ append("type='" NS "QObject',displayedtype='").
append(conn->receiver->metaObject()->className()).append("',numchild='1'");
expected.append("},{name='").append(iStr).append(" slot',type='',value='");
if (conn->receiver != 0)
@@ -2185,7 +2185,7 @@ void tst_Gdb::dump_QObjectSignal()
// Case 1: Simple QObject.
QObject o;
o.setObjectName("Test");
- testDumper("addr='<synthetic>',numchild='1',type='"NS"QObjectSignal',"
+ testDumper("addr='<synthetic>',numchild='1',type='" NS "QObjectSignal',"
"children=[],numchild='0'",
&o, NS"QObjectSignal", true, "", "", 0);
@@ -2221,50 +2221,50 @@ void tst_Gdb::dump_QObjectSignalList()
QObject o;
o.setObjectName("Test");
- testDumper("type='"NS"QObjectSignalList',value='<2 items>',"
+ testDumper("type='" NS "QObjectSignalList',value='<2 items>',"
"addr='$A',numchild='2',children=["
"{name='0',value='destroyed(QObject*)',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='1',value='destroyed()',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'}]",
+ "addr='$A',type='" NS "QObjectSignal'}]",
&o, NS"QObjectSignalList", true);
// Case 2: QAbstractItemModel with no connections.
QStringListModel m(QStringList() << "Test1" << "Test2");
- QByteArray expected = "type='"NS"QObjectSignalList',value='<16 items>',"
+ QByteArray expected = "type='" NS "QObjectSignalList',value='<16 items>',"
"addr='$A',numchild='16',children=["
"{name='0',value='destroyed(QObject*)',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='1',value='destroyed()',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='4',value='dataChanged(QModelIndex,QModelIndex)',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='5',value='headerDataChanged(Qt::Orientation,int,int)',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='6',value='layoutChanged()',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='7',value='layoutAboutToBeChanged()',numchild='0',"
- "addr='$A',type='"NS"QObjectSignal'},"
+ "addr='$A',type='" NS "QObjectSignal'},"
"{name='8',value='rowsAboutToBeInserted(QModelIndex,int,int)',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='9',value='rowsInserted(QModelIndex,int,int)',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='10',value='rowsAboutToBeRemoved(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='11',value='rowsRemoved(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='12',value='columnsAboutToBeInserted(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='13',value='columnsInserted(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='14',value='columnsAboutToBeRemoved(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='15',value='columnsRemoved(QModelIndex,int,int)',"
- "numchild='%',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='%',addr='$A',type='" NS "QObjectSignal'},"
"{name='16',value='modelAboutToBeReset()',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'},"
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'},"
"{name='17',value='modelReset()',"
- "numchild='0',addr='$A',type='"NS"QObjectSignal'}]";
+ "numchild='0',addr='$A',type='" NS "QObjectSignal'}]";
testDumper(expected << "0" << "0" << "0" << "0" << "0" << "0",
&m, NS"QObjectSignalList", true);
@@ -2368,22 +2368,22 @@ void tst_Gdb::dump_QObjectSlotList()
o.setObjectName("Test");
testDumper("numchild='2',value='<2 items>',type='$T',"
"children=[{name='2',value='deleteLater()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='3',value='_q_reregisterTimers(void*)',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'}]",
+ "addr='$A',type='" NS "QObjectSlot'}]",
&o, NS"QObjectSlotList", true);
// Case 2: QAbstractItemModel with no connections.
QStringListModel m(QStringList() << "Test1" << "Test2");
testDumper("numchild='4',value='<4 items>',type='$T',"
"children=[{name='2',value='deleteLater()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='3',value='_q_reregisterTimers(void*)',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='18',value='submit()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='19',value='revert()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'}]",
+ "addr='$A',type='" NS "QObjectSlot'}]",
&m, NS"QObjectSlotList", true);
// Case 3: QAbstractItemModel with connections to itself and to another
@@ -2402,13 +2402,13 @@ void tst_Gdb::dump_QObjectSlotList()
connect(&o, SIGNAL(destroyed(QObject *)), &m, SLOT(submit()));
testDumper("numchild='4',value='<4 items>',type='$T',"
"children=[{name='2',value='deleteLater()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='3',value='_q_reregisterTimers(void*)',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='18',value='submit()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'},"
+ "addr='$A',type='" NS "QObjectSlot'},"
"{name='19',value='revert()',numchild='0',"
- "addr='$A',type='"NS"QObjectSlot'}]",
+ "addr='$A',type='" NS "QObjectSlot'}]",
&m, NS"QObjectSlotList", true);
}
@@ -2438,13 +2438,13 @@ void tst_Gdb::dump_QPixmap()
# ifdef QT_GUI_LIB
prepare("dump_QPixmap");
next();
- check("B", "{iname='local.p',name='p',type='"NS"QPixmap',"
+ check("B", "{iname='local.p',name='p',type='" NS "QPixmap',"
"value='(null)',numchild='0'}");
next();
- check("C", "{iname='local.p',name='p',type='"NS"QPixmap',"
+ check("C", "{iname='local.p',name='p',type='" NS "QPixmap',"
"value='(20x100)',numchild='0'}");
next();
- check("D", "{iname='local.p',name='p',type='"NS"QPixmap',"
+ check("D", "{iname='local.p',name='p',type='" NS "QPixmap',"
"value='(2x24)',numchild='0'}");
# endif
}
@@ -2463,10 +2463,10 @@ void tst_Gdb::dump_QPoint()
prepare("dump_QPoint");
next();
next();
- check("C","{iname='local.p',name='p',type='"NS"QPoint',"
+ check("C","{iname='local.p',name='p',type='" NS "QPoint',"
"value='(43, 44)',numchild='2',childtype='int',childnumchild='0',"
"children=[{name='x',value='43'},{name='y',value='44'}]},"
- "{iname='local.f',name='f',type='"NS"QPointF',"
+ "{iname='local.f',name='f',type='" NS "QPointF',"
"value='(45, 46)',numchild='2',childtype='double',childnumchild='0',"
"children=[{name='x',value='45'},{name='y',value='46'}]}",
"local.p,local.f");
@@ -2487,11 +2487,11 @@ void tst_Gdb::dump_QRect()
next();
next();
- check("C","{iname='local.p',name='p',type='"NS"QRect',"
+ check("C","{iname='local.p',name='p',type='" NS "QRect',"
"value='100x200+43+44',numchild='4',childtype='int',childnumchild='0',"
"children=[{name='x1',value='43'},{name='y1',value='44'},"
"{name='x2',value='142'},{name='y2',value='243'}]},"
- "{iname='local.f',name='f',type='"NS"QRectF',"
+ "{iname='local.f',name='f',type='" NS "QRectF',"
"value='100x200+45+46',numchild='4',childtype='double',childnumchild='0',"
"children=[{name='x',value='45'},{name='y',value='46'},"
"{name='w',value='100'},{name='h',value='200'}]}",
@@ -2514,11 +2514,11 @@ void tst_Gdb::dump_QSet_int()
prepare("dump_QSet_int");
if (checkUninitialized)
check("A","{iname='local.h',name='h',"
- "type='"NS"QSet<int>',value='<invalid>',"
+ "type='" NS "QSet<int>',value='<invalid>',"
"numchild='0'}");
next(3);
check("D","{iname='local.h',name='h',"
- "type='"NS"QSet<int>',value='<2 items>',numchild='2',"
+ "type='" NS "QSet<int>',value='<2 items>',numchild='2',"
"childtype='int',childnumchild='0',children=["
"{value='42'},{value='44'}]}", "local.h");
}
@@ -2539,11 +2539,11 @@ void tst_Gdb::dump_QSet_Int3()
prepare("dump_QSet_Int3");
if (checkUninitialized)
check("A","{iname='local.h',name='h',"
- "type='"NS"QSet<Int3>',value='<invalid>',"
+ "type='" NS "QSet<Int3>',value='<invalid>',"
"numchild='0'}");
next(3);
check("D","{iname='local.h',name='h',"
- "type='"NS"QSet<Int3>',value='<2 items>',numchild='2',"
+ "type='" NS "QSet<Int3>',value='<2 items>',numchild='2',"
"childtype='Int3',children=["
"{value='{...}',numchild='3'},{value='{...}',numchild='3'}]}", "local.h");
}
@@ -2584,65 +2584,65 @@ void tst_Gdb::dump_QSharedPointer()
prepare("dump_QSharedPointer");
if (checkUninitialized)
check("A","{iname='local.simplePtr',name='simplePtr',"
- "type='"NS"QSharedPointer<int>',value='<invalid>',numchild='0'},"
+ "type='" NS "QSharedPointer<int>',value='<invalid>',numchild='0'},"
"{iname='local.simplePtr2',name='simplePtr2',"
- "type='"NS"QSharedPointer<int>',value='<invalid>',numchild='0'},"
+ "type='" NS "QSharedPointer<int>',value='<invalid>',numchild='0'},"
"{iname='local.simplePtr3',name='simplePtr3',"
- "type='"NS"QSharedPointer<int>',value='<invalid>',numchild='0'},"
+ "type='" NS "QSharedPointer<int>',value='<invalid>',numchild='0'},"
"{iname='local.simplePtr4',name='simplePtr4',"
- "type='"NS"QWeakPointer<int>',value='<invalid>',numchild='0'},"
+ "type='" NS "QWeakPointer<int>',value='<invalid>',numchild='0'},"
"{iname='local.compositePtr',name='compositePtr',"
- "type='"NS"QSharedPointer<"NS"QString>',value='<invalid>',numchild='0'},"
+ "type='" NS "QSharedPointer<" NS "QString>',value='<invalid>',numchild='0'},"
"{iname='local.compositePtr2',name='compositePtr2',"
- "type='"NS"QSharedPointer<"NS"QString>',value='<invalid>',numchild='0'},"
+ "type='" NS "QSharedPointer<" NS "QString>',value='<invalid>',numchild='0'},"
"{iname='local.compositePtr3',name='compositePtr3',"
- "type='"NS"QSharedPointer<"NS"QString>',value='<invalid>',numchild='0'},"
+ "type='" NS "QSharedPointer<" NS "QString>',value='<invalid>',numchild='0'},"
"{iname='local.compositePtr4',name='compositePtr4',"
- "type='"NS"QWeakPointer<"NS"QString>',value='<invalid>',numchild='0'}");
+ "type='" NS "QWeakPointer<" NS "QString>',value='<invalid>',numchild='0'}");
next(8);
check("C","{iname='local.simplePtr',name='simplePtr',"
- "type='"NS"QSharedPointer<int>',value='(null)',numchild='0'},"
+ "type='" NS "QSharedPointer<int>',value='(null)',numchild='0'},"
"{iname='local.simplePtr2',name='simplePtr2',"
- "type='"NS"QSharedPointer<int>',value='',numchild='3'},"
+ "type='" NS "QSharedPointer<int>',value='',numchild='3'},"
"{iname='local.simplePtr3',name='simplePtr3',"
- "type='"NS"QSharedPointer<int>',value='',numchild='3'},"
+ "type='" NS "QSharedPointer<int>',value='',numchild='3'},"
"{iname='local.simplePtr4',name='simplePtr4',"
- "type='"NS"QWeakPointer<int>',value='',numchild='3'},"
+ "type='" NS "QWeakPointer<int>',value='',numchild='3'},"
"{iname='local.compositePtr',name='compositePtr',"
- "type='"NS"QSharedPointer<"NS"QString>',value='(null)',numchild='0'},"
+ "type='" NS "QSharedPointer<" NS "QString>',value='(null)',numchild='0'},"
"{iname='local.compositePtr2',name='compositePtr2',"
- "type='"NS"QSharedPointer<"NS"QString>',value='',numchild='3'},"
+ "type='" NS "QSharedPointer<" NS "QString>',value='',numchild='3'},"
"{iname='local.compositePtr3',name='compositePtr3',"
- "type='"NS"QSharedPointer<"NS"QString>',value='',numchild='3'},"
+ "type='" NS "QSharedPointer<" NS "QString>',value='',numchild='3'},"
"{iname='local.compositePtr4',name='compositePtr4',"
- "type='"NS"QWeakPointer<"NS"QString>',value='',numchild='3'}");
+ "type='" NS "QWeakPointer<" NS "QString>',value='',numchild='3'}");
check("C","{iname='local.simplePtr',name='simplePtr',"
- "type='"NS"QSharedPointer<int>',value='(null)',numchild='0'},"
+ "type='" NS "QSharedPointer<int>',value='(null)',numchild='0'},"
"{iname='local.simplePtr2',name='simplePtr2',"
- "type='"NS"QSharedPointer<int>',value='',numchild='3',children=["
+ "type='" NS "QSharedPointer<int>',value='',numchild='3',children=["
"{name='data',type='int',value='99',numchild='0'},"
"{name='weakref',value='3',type='int',numchild='0'},"
"{name='strongref',value='2',type='int',numchild='0'}]},"
"{iname='local.simplePtr3',name='simplePtr3',"
- "type='"NS"QSharedPointer<int>',value='',numchild='3',children=["
+ "type='" NS "QSharedPointer<int>',value='',numchild='3',children=["
"{name='data',type='int',value='99',numchild='0'},"
"{name='weakref',value='3',type='int',numchild='0'},"
"{name='strongref',value='2',type='int',numchild='0'}]},"
"{iname='local.simplePtr4',name='simplePtr4',"
- "type='"NS"QWeakPointer<int>',value='',numchild='3',children=["
+ "type='" NS "QWeakPointer<int>',value='',numchild='3',children=["
"{name='data',type='int',value='99',numchild='0'},"
"{name='weakref',value='3',type='int',numchild='0'},"
"{name='strongref',value='2',type='int',numchild='0'}]},"
"{iname='local.compositePtr',name='compositePtr',"
- "type='"NS"QSharedPointer<"NS"QString>',value='(null)',numchild='0'},"
+ "type='" NS "QSharedPointer<" NS "QString>',value='(null)',numchild='0'},"
"{iname='local.compositePtr2',name='compositePtr2',"
- "type='"NS"QSharedPointer<"NS"QString>',value='',numchild='3'},"
+ "type='" NS "QSharedPointer<" NS "QString>',value='',numchild='3'},"
"{iname='local.compositePtr3',name='compositePtr3',"
- "type='"NS"QSharedPointer<"NS"QString>',value='',numchild='3'},"
+ "type='" NS "QSharedPointer<" NS "QString>',value='',numchild='3'},"
"{iname='local.compositePtr4',name='compositePtr4',"
- "type='"NS"QWeakPointer<"NS"QString>',value='',numchild='3'}",
+ "type='" NS "QWeakPointer<" NS "QString>',value='',numchild='3'}",
"local.simplePtr,local.simplePtr2,local.simplePtr3,local.simplePtr4,"
"local.compositePtr,local.compositePtr,local.compositePtr,"
"local.compositePtr");
@@ -2664,10 +2664,10 @@ void tst_Gdb::dump_QSize()
next(1);
// FIXME: Enable child type as soon as 'double' is not reported
// as 'myns::QVariant::Private::Data::qreal' anymore
- check("C","{iname='local.p',name='p',type='"NS"QSize',"
+ check("C","{iname='local.p',name='p',type='" NS "QSize',"
"value='(43, 44)',numchild='2',childtype='int',childnumchild='0',"
"children=[{name='w',value='43'},{name='h',value='44'}]}"
-// ",{iname='local.f',name='f',type='"NS"QSizeF',"
+// ",{iname='local.f',name='f',type='" NS "QSizeF',"
// "value='(45, 46)',numchild='2',childtype='double',childnumchild='0',"
// "children=[{name='w',value='45'},{name='h',value='46'}]}"
"",
@@ -2689,24 +2689,24 @@ void tst_Gdb::dump_QStack()
{
prepare("dump_QStack");
if (checkUninitialized)
- check("A","{iname='local.v',name='v',type='"NS"QStack<int>',"
+ check("A","{iname='local.v',name='v',type='" NS "QStack<int>',"
"value='<invalid>',numchild='0'}");
next();
- check("B","{iname='local.v',name='v',type='"NS"QStack<int>',"
+ check("B","{iname='local.v',name='v',type='" NS "QStack<int>',"
"value='<0 items>',numchild='0'}");
- check("B","{iname='local.v',name='v',type='"NS"QStack<int>',"
+ check("B","{iname='local.v',name='v',type='" NS "QStack<int>',"
"value='<0 items>',numchild='0',children=[]}", "local.v");
next();
- check("C","{iname='local.v',name='v',type='"NS"QStack<int>',"
+ check("C","{iname='local.v',name='v',type='" NS "QStack<int>',"
"value='<1 items>',numchild='1'}");
- check("C","{iname='local.v',name='v',type='"NS"QStack<int>',"
+ check("C","{iname='local.v',name='v',type='" NS "QStack<int>',"
"value='<1 items>',numchild='1',childtype='int',"
"childnumchild='0',children=[{value='3'}]}", // rounding...
"local.v");
next();
- check("D","{iname='local.v',name='v',type='"NS"QStack<int>',"
+ check("D","{iname='local.v',name='v',type='" NS "QStack<int>',"
"value='<2 items>',numchild='2'}");
- check("D","{iname='local.v',name='v',type='"NS"QStack<int>',"
+ check("D","{iname='local.v',name='v',type='" NS "QStack<int>',"
"value='<2 items>',numchild='2',childtype='int',"
"childnumchild='0',children=[{value='3'},{value='2'}]}",
"local.v");
@@ -2726,33 +2726,33 @@ void tst_Gdb::dump_QString()
{
prepare("dump_QString");
if (checkUninitialized)
- check("A","{iname='local.s',name='s',type='"NS"QString',"
+ check("A","{iname='local.s',name='s',type='" NS "QString',"
"value='<invalid>',numchild='0'}");
next();
- check("B","{iname='local.s',name='s',type='"NS"QString',"
+ check("B","{iname='local.s',name='s',type='" NS "QString',"
"valueencoded='7',value='',numchild='0'}", "local.s");
// Plain C style dumping:
- check("B","{iname='local.s',name='s',type='"NS"QString',"
+ check("B","{iname='local.s',name='s',type='" NS "QString',"
"value='{...}',numchild='5'}", "", 0);
- check("B","{iname='local.s',name='s',type='"NS"QString',"
+ check("B","{iname='local.s',name='s',type='" NS "QString',"
"value='{...}',numchild='5',children=["
- "{name='d',type='"NS"QString::Data *',"
+ "{name='d',type='" NS "QString::Data *',"
"value='-',numchild='1'}]}", "local.s", 0);
/*
// FIXME: changed after auto-deref commit
- check("B","{iname='local.s',name='s',type='"NS"QString',"
+ check("B","{iname='local.s',name='s',type='" NS "QString',"
"value='{...}',numchild='5',"
"children=[{name='d',"
- "type='"NS"QString::Data *',value='-',numchild='1',"
+ "type='" NS "QString::Data *',value='-',numchild='1',"
"children=[{iname='local.s.d.*',name='*d',"
- "type='"NS"QString::Data',value='{...}',numchild='11'}]}]}",
+ "type='" NS "QString::Data',value='{...}',numchild='11'}]}]}",
"local.s,local.s.d", 0);
*/
next();
- check("C","{iname='local.s',name='s',type='"NS"QString',"
+ check("C","{iname='local.s',name='s',type='" NS "QString',"
"valueencoded='7',value='680061006c006c006f00',numchild='0'}");
next();
- check("D","{iname='local.s',name='s',type='"NS"QString',"
+ check("D","{iname='local.s',name='s',type='" NS "QString',"
"valueencoded='7',value='680061006c006c006f007800',numchild='0'}");
}
@@ -2771,26 +2771,26 @@ void tst_Gdb::dump_QStringList()
{
prepare("dump_QStringList");
if (checkUninitialized)
- check("A","{iname='local.s',name='s',type='"NS"QStringList',"
+ check("A","{iname='local.s',name='s',type='" NS "QStringList',"
"value='<invalid>',numchild='0'}");
next();
- check("B","{iname='local.s',name='s',type='"NS"QStringList',"
+ check("B","{iname='local.s',name='s',type='" NS "QStringList',"
"value='<0 items>',numchild='0'}");
- check("B","{iname='local.s',name='s',type='"NS"QStringList',"
+ check("B","{iname='local.s',name='s',type='" NS "QStringList',"
"value='<0 items>',numchild='0',children=[]}", "local.s");
next();
- check("C","{iname='local.s',name='s',type='"NS"QStringList',"
+ check("C","{iname='local.s',name='s',type='" NS "QStringList',"
"value='<1 items>',numchild='1'}");
- check("C","{iname='local.s',name='s',type='"NS"QStringList',"
- "value='<1 items>',numchild='1',childtype='"NS"QString',"
+ check("C","{iname='local.s',name='s',type='" NS "QStringList',"
+ "value='<1 items>',numchild='1',childtype='" NS "QString',"
"childnumchild='0',children=[{valueencoded='7',"
"value='680065006c006c006f00'}]}",
"local.s");
next();
- check("D","{iname='local.s',name='s',type='"NS"QStringList',"
+ check("D","{iname='local.s',name='s',type='" NS "QStringList',"
"value='<2 items>',numchild='2'}");
- check("D","{iname='local.s',name='s',type='"NS"QStringList',"
- "value='<2 items>',numchild='2',childtype='"NS"QString',"
+ check("D","{iname='local.s',name='s',type='" NS "QStringList',"
+ "value='<2 items>',numchild='2',childtype='" NS "QString',"
"childnumchild='0',children=["
"{valueencoded='7',value='680065006c006c006f00'},"
"{valueencoded='7',value='77006f0072006c006400'}]}",
@@ -2810,9 +2810,9 @@ void tst_Gdb::dump_QTextCodec()
// FIXME
prepare("dump_QTextCodec");
next();
- check("D", "{iname='local.codec',name='codec',type='"NS"QTextCodec',"
+ check("D", "{iname='local.codec',name='codec',type='" NS "QTextCodec',"
"valueencoded='6',value='5554462d3136',numchild='2',children=["
- "{name='name',type='"NS"QByteArray',valueencoded='6',"
+ "{name='name',type='" NS "QByteArray',valueencoded='6',"
"value='5554462d3136',numchild='6'},"
"{name='mibEnum',type='int',value='1015',numchild='0'}]}",
"local.codec,local.codec.*");
@@ -2833,24 +2833,24 @@ void tst_Gdb::dump_QVector()
{
prepare("dump_QVector");
if (checkUninitialized)
- check("A","{iname='local.v',name='v',type='"NS"QVector<double>',"
+ check("A","{iname='local.v',name='v',type='" NS "QVector<double>',"
"value='<invalid>',numchild='0'}");
next();
- check("B","{iname='local.v',name='v',type='"NS"QVector<double>',"
+ check("B","{iname='local.v',name='v',type='" NS "QVector<double>',"
"value='<0 items>',numchild='0'}");
- check("B","{iname='local.v',name='v',type='"NS"QVector<double>',"
+ check("B","{iname='local.v',name='v',type='" NS "QVector<double>',"
"value='<0 items>',numchild='0',children=[]}", "local.v");
next();
- check("C","{iname='local.v',name='v',type='"NS"QVector<double>',"
+ check("C","{iname='local.v',name='v',type='" NS "QVector<double>',"
"value='<1 items>',numchild='1'}");
- check("C","{iname='local.v',name='v',type='"NS"QVector<double>',"
+ check("C","{iname='local.v',name='v',type='" NS "QVector<double>',"
"value='<1 items>',numchild='1',childtype='double',"
"childnumchild='0',children=[{value='-'}]}", // rounding...
"local.v");
next();
- check("D","{iname='local.v',name='v',type='"NS"QVector<double>',"
+ check("D","{iname='local.v',name='v',type='" NS "QVector<double>',"
"value='<2 items>',numchild='2'}");
- check("D","{iname='local.v',name='v',type='"NS"QVector<double>',"
+ check("D","{iname='local.v',name='v',type='" NS "QVector<double>',"
"value='<2 items>',numchild='2',childtype='double',"
"childnumchild='0',children=[{value='-'},{value='-'}]}",
"local.v");
@@ -2929,194 +2929,194 @@ void dump_QVariant()
void tst_Gdb::dump_QVariant()
{
-# define PRE "iname='local.v',name='v',type='"NS"QVariant',"
+# define PRE "iname='local.v',name='v',type='" NS "QVariant',"
prepare("dump_QVariant");
if (checkUninitialized) /*<invalid>*/
- check("A","{"PRE"'value=<invalid>',numchild='0'}");
+ check("A","{" PRE "'value=<invalid>',numchild='0'}");
next();
- check("<invalid>", "{"PRE"value='(invalid)',numchild='0'}");
+ check("<invalid>", "{" PRE "value='(invalid)',numchild='0'}");
next();
- check("QBitArray", "{"PRE"value='("NS"QBitArray)',numchild='1',children=["
- "{name='data',type='"NS"QBitArray',value='{...}',numchild='1'}]}",
+ check("QBitArray", "{" PRE "value='(" NS "QBitArray)',numchild='1',children=["
+ "{name='data',type='" NS "QBitArray',value='{...}',numchild='1'}]}",
"local.v");
next();
- (void)GUI(check("QBitMap", "{"PRE"value='("NS"QBitmap)',numchild='1',children=["
- "{name='data',type='"NS"QBitmap',value='{...}',numchild='1'}]}",
+ (void)GUI(check("QBitMap", "{" PRE "value='(" NS "QBitmap)',numchild='1',children=["
+ "{name='data',type='" NS "QBitmap',value='{...}',numchild='1'}]}",
"local.v"));
next();
- check("bool", "{"PRE"value='true',numchild='0'}", "local.v");
+ check("bool", "{" PRE "value='true',numchild='0'}", "local.v");
next();
- (void)GUI(check("QBrush", "{"PRE"value='("NS"QBrush)',numchild='1',children=["
- "{name='data',type='"NS"QBrush',value='{...}',numchild='1'}]}",
+ (void)GUI(check("QBrush", "{" PRE "value='(" NS "QBrush)',numchild='1',children=["
+ "{name='data',type='" NS "QBrush',value='{...}',numchild='1'}]}",
"local.v"));
next();
- check("QByteArray", "{"PRE"value='("NS"QByteArray)',numchild='1',"
- "children=[{name='data',type='"NS"QByteArray',valueencoded='6',"
+ check("QByteArray", "{" PRE "value='(" NS "QByteArray)',numchild='1',"
+ "children=[{name='data',type='" NS "QByteArray',valueencoded='6',"
"value='616263',numchild='3'}]}", "local.v");
next();
- check("QChar", "{"PRE"value='("NS"QChar)',numchild='1',"
- "children=[{name='data',type='"NS"QChar',value=''x' (120)',numchild='0'}]}", "local.v");
+ check("QChar", "{" PRE "value='(" NS "QChar)',numchild='1',"
+ "children=[{name='data',type='" NS "QChar',value=''x' (120)',numchild='0'}]}", "local.v");
next();
- (void)GUI(check("QColor", "{"PRE"value='("NS"QColor)',numchild='1',children=["
- "{name='data',type='"NS"QColor',value='{...}',numchild='2'}]}",
+ (void)GUI(check("QColor", "{" PRE "value='(" NS "QColor)',numchild='1',children=["
+ "{name='data',type='" NS "QColor',value='{...}',numchild='2'}]}",
"local.v"));
next();
- (void)GUI(check("QCursor", "{"PRE"value='("NS"QCursor)',numchild='1',children=["
- "{name='data',type='"NS"QCursor',value='{...}',numchild='1'}]}",
+ (void)GUI(check("QCursor", "{" PRE "value='(" NS "QCursor)',numchild='1',children=["
+ "{name='data',type='" NS "QCursor',value='{...}',numchild='1'}]}",
"local.v"));
next();
- check("QDate", "{"PRE"value='("NS"QDate)',numchild='1',children=["
- "{name='data',type='"NS"QDate',value='{...}',numchild='1'}]}", "local.v");
+ check("QDate", "{" PRE "value='(" NS "QDate)',numchild='1',children=["
+ "{name='data',type='" NS "QDate',value='{...}',numchild='1'}]}", "local.v");
next();
- check("QDateTime", "{"PRE"value='("NS"QDateTime)',numchild='1',children=["
- "{name='data',type='"NS"QDateTime',valueencoded='7',value='',numchild='3'}]}", "local.v");
+ check("QDateTime", "{" PRE "value='(" NS "QDateTime)',numchild='1',children=["
+ "{name='data',type='" NS "QDateTime',valueencoded='7',value='',numchild='3'}]}", "local.v");
next();
- check("double", "{"PRE"value='46',numchild='0'}", "local.v");
+ check("double", "{" PRE "value='46',numchild='0'}", "local.v");
next();
- (void)GUI(check("QFont", "{"PRE"value='("NS"QFont)',numchild='1',children=["
- "{name='data',type='"NS"QFont',value='{...}',numchild='3'}]}",
+ (void)GUI(check("QFont", "{" PRE "value='(" NS "QFont)',numchild='1',children=["
+ "{name='data',type='" NS "QFont',value='{...}',numchild='3'}]}",
"local.v"));
next();
- check("QVariantHash", "{"PRE"value='("NS"QVariantHash)',numchild='1',children=["
- "{name='data',type='"NS"QHash<"NS"QString, "NS"QVariant>',"
+ check("QVariantHash", "{" PRE "value='(" NS "QVariantHash)',numchild='1',children=["
+ "{name='data',type='" NS "QHash<" NS "QString, " NS "QVariant>',"
"value='<0 items>',numchild='0'}]}", "local.v");
next();
- (void)GUI(check("QIcon", "{"PRE"value='("NS"QIcon)',numchild='1',children=["
- "{name='data',type='"NS"QIcon',value='{...}',numchild='1'}]}",
+ (void)GUI(check("QIcon", "{" PRE "value='(" NS "QIcon)',numchild='1',children=["
+ "{name='data',type='" NS "QIcon',value='{...}',numchild='1'}]}",
"local.v"));
next();
// FIXME:
-// (void)GUI(check("QImage", "{"PRE"value='("NS"QImage)',numchild='1',children=["
-// "{name='data',type='"NS"QImage',value='{...}',numchild='1'}]}",
+// (void)GUI(check("QImage", "{" PRE "value='(" NS "QImage)',numchild='1',children=["
+// "{name='data',type='" NS "QImage',value='{...}',numchild='1'}]}",
// "local.v"));
next();
- check("int", "{"PRE"value='42',numchild='0'}", "local.v");
+ check("int", "{" PRE "value='42',numchild='0'}", "local.v");
next();
- (void)GUI(check("QKeySequence","{"PRE"value='("NS"QKeySequence)',numchild='1',children=["
- "{name='data',type='"NS"QKeySequence',value='{...}',numchild='1'}]}",
+ (void)GUI(check("QKeySequence","{" PRE "value='(" NS "QKeySequence)',numchild='1',children=["
+ "{name='data',type='" NS "QKeySequence',value='{...}',numchild='1'}]}",
"local.v"));
next();
- check("QLine", "{"PRE"value='("NS"QLine)',numchild='1',children=["
- "{name='data',type='"NS"QLine',value='{...}',numchild='2'}]}", "local.v");
+ check("QLine", "{" PRE "value='(" NS "QLine)',numchild='1',children=["
+ "{name='data',type='" NS "QLine',value='{...}',numchild='2'}]}", "local.v");
next();
- check("QLineF", "{"PRE"value='("NS"QLineF)',numchild='1',children=["
- "{name='data',type='"NS"QLineF',value='{...}',numchild='2'}]}", "local.v");
+ check("QLineF", "{" PRE "value='(" NS "QLineF)',numchild='1',children=["
+ "{name='data',type='" NS "QLineF',value='{...}',numchild='2'}]}", "local.v");
next();
- check("QVariantList", "{"PRE"value='("NS"QVariantList)',numchild='1',children=["
- "{name='data',type='"NS"QList<"NS"QVariant>',"
+ check("QVariantList", "{" PRE "value='(" NS "QVariantList)',numchild='1',children=["
+ "{name='data',type='" NS "QList<" NS "QVariant>',"
"value='<0 items>',numchild='0'}]}", "local.v");
next();
- check("QLocale", "{"PRE"value='("NS"QLocale)',numchild='1',children=["
- "{name='data',type='"NS"QLocale',valueencoded='7',value='-',numchild='8'}]}", "local.v");
+ check("QLocale", "{" PRE "value='(" NS "QLocale)',numchild='1',children=["
+ "{name='data',type='" NS "QLocale',valueencoded='7',value='-',numchild='8'}]}", "local.v");
next();
- check("qlonglong", "{"PRE"value='44',numchild='0'}", "local.v");
+ check("qlonglong", "{" PRE "value='44',numchild='0'}", "local.v");
next();
- check("QVariantMap", "{"PRE"value='("NS"QVariantMap)',numchild='1',children=["
- "{name='data',type='"NS"QMap<"NS"QString, "NS"QVariant>',"
+ check("QVariantMap", "{" PRE "value='(" NS "QVariantMap)',numchild='1',children=["
+ "{name='data',type='" NS "QMap<" NS "QString, " NS "QVariant>',"
"value='<0 items>',numchild='0'}]}", "local.v");
next();
- (void)GUI(check("QTransform", "{"PRE"value='("NS"QTransform)',numchild='1',children=["
- "{name='data',type='"NS"QTransform',value='{...}',numchild='7'}]}",
+ (void)GUI(check("QTransform", "{" PRE "value='(" NS "QTransform)',numchild='1',children=["
+ "{name='data',type='" NS "QTransform',value='{...}',numchild='7'}]}",
"local.v"));
next();
- (void)GUI(check("QMatrix4x4", "{"PRE"value='("NS"QMatrix4x4)',numchild='1',children=["
- "{name='data',type='"NS"QMatrix4x4',value='{...}',numchild='2'}]}",
+ (void)GUI(check("QMatrix4x4", "{" PRE "value='(" NS "QMatrix4x4)',numchild='1',children=["
+ "{name='data',type='" NS "QMatrix4x4',value='{...}',numchild='2'}]}",
"local.v"));
next();
- (void)GUI(check("QPalette", "{"PRE"value='("NS"QPalette)',numchild='1',children=["
- "{name='data',type='"NS"QPalette',value='{...}',numchild='4'}]}",
+ (void)GUI(check("QPalette", "{" PRE "value='(" NS "QPalette)',numchild='1',children=["
+ "{name='data',type='" NS "QPalette',value='{...}',numchild='4'}]}",
"local.v"));
next();
- (void)GUI(check("QPen", "{"PRE"value='("NS"QPen)',numchild='1',children=["
- "{name='data',type='"NS"QPen',value='{...}',numchild='1'}]}",
+ (void)GUI(check("QPen", "{" PRE "value='(" NS "QPen)',numchild='1',children=["
+ "{name='data',type='" NS "QPen',value='{...}',numchild='1'}]}",
"local.v"));
next();
// FIXME:
-// (void)GUI(check("QPixmap", "{"PRE"value='("NS"QPixmap)',numchild='1',children=["
-// "{name='data',type='"NS"QPixmap',value='{...}',numchild='1'}]}",
+// (void)GUI(check("QPixmap", "{" PRE "value='(" NS "QPixmap)',numchild='1',children=["
+// "{name='data',type='" NS "QPixmap',value='{...}',numchild='1'}]}",
// "local.v"));
next();
- check("QPoint", "{"PRE"value='("NS"QPoint)',numchild='1',children=["
- "{name='data',type='"NS"QPoint',value='(45, 46)',numchild='2'}]}",
+ check("QPoint", "{" PRE "value='(" NS "QPoint)',numchild='1',children=["
+ "{name='data',type='" NS "QPoint',value='(45, 46)',numchild='2'}]}",
"local.v");
next();
// FIXME
-// check("QPointF", "{"PRE"value='("NS"QPointF)',numchild='1',children=["
-// "{name='data',type='"NS"QBrush',value='{...}',numchild='1'}]}",
+// check("QPointF", "{" PRE "value='(" NS "QPointF)',numchild='1',children=["
+// "{name='data',type='" NS "QBrush',value='{...}',numchild='1'}]}",
// "local.v"));
next();
- (void)GUI(check("QPolygon", "{"PRE"value='("NS"QPolygon)',numchild='1',children=["
- "{name='data',type='"NS"QPolygon',value='{...}',numchild='1'}]}",
+ (void)GUI(check("QPolygon", "{" PRE "value='(" NS "QPolygon)',numchild='1',children=["
+ "{name='data',type='" NS "QPolygon',value='{...}',numchild='1'}]}",
"local.v"));
next();
// FIXME:
-// (void)GUI(check("QQuaternion", "{"PRE"value='("NS"QQuaternion)',numchild='1',children=["
-// "{name='data',type='"NS"QQuadernion',value='{...}',numchild='1'}]}",
+// (void)GUI(check("QQuaternion", "{" PRE "value='(" NS "QQuaternion)',numchild='1',children=["
+// "{name='data',type='" NS "QQuadernion',value='{...}',numchild='1'}]}",
// "local.v"));
next();
// FIXME: Fix value
- check("QRect", "{"PRE"value='("NS"QRect)',numchild='1',children=["
- "{name='data',type='"NS"QRect',value='-',numchild='4'}]}", "local.v");
+ check("QRect", "{" PRE "value='(" NS "QRect)',numchild='1',children=["
+ "{name='data',type='" NS "QRect',value='-',numchild='4'}]}", "local.v");
next();
// FIXME: Fix value
- check("QRectF", "{"PRE"value='("NS"QRectF)',numchild='1',children=["
- "{name='data',type='"NS"QRectF',value='-',numchild='4'}]}", "local.v");
+ check("QRectF", "{" PRE "value='(" NS "QRectF)',numchild='1',children=["
+ "{name='data',type='" NS "QRectF',value='-',numchild='4'}]}", "local.v");
next();
- check("QRegExp", "{"PRE"value='("NS"QRegExp)',numchild='1',children=["
- "{name='data',type='"NS"QRegExp',value='{...}',numchild='1'}]}", "local.v");
+ check("QRegExp", "{" PRE "value='(" NS "QRegExp)',numchild='1',children=["
+ "{name='data',type='" NS "QRegExp',value='{...}',numchild='1'}]}", "local.v");
next();
- (void)GUI(check("QRegion", "{"PRE"value='("NS"QRegion)',numchild='1',children=["
- "{name='data',type='"NS"QRegion',value='{...}',numchild='2'}]}",
+ (void)GUI(check("QRegion", "{" PRE "value='(" NS "QRegion)',numchild='1',children=["
+ "{name='data',type='" NS "QRegion',value='{...}',numchild='2'}]}",
"local.v"));
next();
- check("QSize", "{"PRE"value='("NS"QSize)',numchild='1',children=["
- "{name='data',type='"NS"QSize',value='(0, 0)',numchild='2'}]}", "local.v");
+ check("QSize", "{" PRE "value='(" NS "QSize)',numchild='1',children=["
+ "{name='data',type='" NS "QSize',value='(0, 0)',numchild='2'}]}", "local.v");
next();
// FIXME:
-// check("QSizeF", "{"PRE"value='("NS"QSizeF)',numchild='1',children=["
-// "{name='data',type='"NS"QBrush',value='{...}',numchild='1'}]}",
+// check("QSizeF", "{" PRE "value='(" NS "QSizeF)',numchild='1',children=["
+// "{name='data',type='" NS "QBrush',value='{...}',numchild='1'}]}",
// "local.v");
next();
- (void)GUI(check("QSizePolicy", "{"PRE"value='("NS"QSizePolicy)',numchild='1',children=["
- "{name='data',type='"NS"QSizePolicy',value='{...}',numchild='2'}]}",
+ (void)GUI(check("QSizePolicy", "{" PRE "value='(" NS "QSizePolicy)',numchild='1',children=["
+ "{name='data',type='" NS "QSizePolicy',value='{...}',numchild='2'}]}",
"local.v"));
next();
- check("QString", "{"PRE"value='("NS"QString)',numchild='1',children=["
- "{name='data',type='"NS"QString',valueencoded='7',value='610062006300',numchild='0'}]}",
+ check("QString", "{" PRE "value='(" NS "QString)',numchild='1',children=["
+ "{name='data',type='" NS "QString',valueencoded='7',value='610062006300',numchild='0'}]}",
"local.v");
next();
- check("QStringList", "{"PRE"value='("NS"QStringList)',numchild='1',children=["
- "{name='data',type='"NS"QStringList',value='<1 items>',numchild='1'}]}", "local.v");
+ check("QStringList", "{" PRE "value='(" NS "QStringList)',numchild='1',children=["
+ "{name='data',type='" NS "QStringList',value='<1 items>',numchild='1'}]}", "local.v");
next();
- (void)GUI(check("QTextFormat", "{"PRE"value='("NS"QTextFormat)',numchild='1',children=["
- "{name='data',type='"NS"QTextFormat',value='{...}',numchild='3'}]}",
+ (void)GUI(check("QTextFormat", "{" PRE "value='(" NS "QTextFormat)',numchild='1',children=["
+ "{name='data',type='" NS "QTextFormat',value='{...}',numchild='3'}]}",
"local.v"));
next();
- (void)GUI(check("QTextLength", "{"PRE"value='("NS"QTextLength)',numchild='1',children=["
- "{name='data',type='"NS"QTextLength',value='{...}',numchild='2'}]}",
+ (void)GUI(check("QTextLength", "{" PRE "value='(" NS "QTextLength)',numchild='1',children=["
+ "{name='data',type='" NS "QTextLength',value='{...}',numchild='2'}]}",
"local.v"));
next();
- check("QTime", "{"PRE"value='("NS"QTime)',numchild='1',children=["
- "{name='data',type='"NS"QTime',value='{...}',numchild='1'}]}", "local.v");
+ check("QTime", "{" PRE "value='(" NS "QTime)',numchild='1',children=["
+ "{name='data',type='" NS "QTime',value='{...}',numchild='1'}]}", "local.v");
next();
- check("uint", "{"PRE"value='43',numchild='0'}", "local.v");
+ check("uint", "{" PRE "value='43',numchild='0'}", "local.v");
next();
- check("qulonglong", "{"PRE"value='45',numchild='0'}", "local.v");
+ check("qulonglong", "{" PRE "value='45',numchild='0'}", "local.v");
next();
- check("QUrl", "{"PRE"value='("NS"QUrl)',numchild='1',children=["
- "{name='data',type='"NS"QUrl',value='{...}',numchild='1'}]}", "local.v");
+ check("QUrl", "{" PRE "value='(" NS "QUrl)',numchild='1',children=["
+ "{name='data',type='" NS "QUrl',value='{...}',numchild='1'}]}", "local.v");
next();
- (void)GUI(check("QVector2D", "{"PRE"value='("NS"QVector2D)',numchild='1',children=["
- "{name='data',type='"NS"QVector2D',value='{...}',numchild='2'}]}",
+ (void)GUI(check("QVector2D", "{" PRE "value='(" NS "QVector2D)',numchild='1',children=["
+ "{name='data',type='" NS "QVector2D',value='{...}',numchild='2'}]}",
"local.v"));
next();
- (void)GUI(check("QVector3D", "{"PRE"value='("NS"QVector3D)',numchild='1',children=["
- "{name='data',type='"NS"QVector3D',value='{...}',numchild='3'}]}",
+ (void)GUI(check("QVector3D", "{" PRE "value='(" NS "QVector3D)',numchild='1',children=["
+ "{name='data',type='" NS "QVector3D',value='{...}',numchild='3'}]}",
"local.v"));
next();
- (void)GUI(check("QVector4D", "{"PRE"value='("NS"QVector4D)',numchild='1',children=["
- "{name='data',type='"NS"QVector4D',value='{...}',numchild='4'}]}",
+ (void)GUI(check("QVector4D", "{" PRE "value='(" NS "QVector4D)',numchild='1',children=["
+ "{name='data',type='" NS "QVector4D',value='{...}',numchild='4'}]}",
"local.v"));
}
@@ -3137,14 +3137,14 @@ void tst_Gdb::dump_QWeakPointer_11()
prepare("dump_QWeakPointer_11");
if (checkUninitialized)
check("A","{iname='local.sp',name='sp',"
- "type='"NS"QSharedPointer<int>',value='<invalid>',numchild='0'},"
+ "type='" NS "QSharedPointer<int>',value='<invalid>',numchild='0'},"
"{iname='local.wp',name='wp',"
- "type='"NS"QWeakPointer<int>',value='<invalid>',numchild='0'}");
+ "type='" NS "QWeakPointer<int>',value='<invalid>',numchild='0'}");
next(2);
check("B","{iname='local.sp',name='sp',"
- "type='"NS"QSharedPointer<int>',value='(null)',numchild='0'},"
+ "type='" NS "QSharedPointer<int>',value='(null)',numchild='0'},"
"{iname='local.wp',name='wp',"
- "type='"NS"QWeakPointer<int>',value='(null)',numchild='0'}");
+ "type='" NS "QWeakPointer<int>',value='(null)',numchild='0'}");
}
@@ -3161,22 +3161,22 @@ return;
prepare("dump_QWeakPointer_12");
if (checkUninitialized)
check("A","{iname='local.sp',name='sp',"
- "type='"NS"QSharedPointer<int>',value='<invalid>',numchild='0'},"
+ "type='" NS "QSharedPointer<int>',value='<invalid>',numchild='0'},"
"{iname='local.wp',name='wp',"
- "type='"NS"QWeakPointer<int>',value='<invalid>',numchild='0'}");
+ "type='" NS "QWeakPointer<int>',value='<invalid>',numchild='0'}");
next();
next();
check("B","{iname='local.sp',name='sp',"
- "type='"NS"QSharedPointer<int>',value='',numchild='3'},"
+ "type='" NS "QSharedPointer<int>',value='',numchild='3'},"
"{iname='local.wp',name='wp',"
- "type='"NS"QWeakPointer<int>',value='',numchild='3'}");
+ "type='" NS "QWeakPointer<int>',value='',numchild='3'}");
check("B","{iname='local.sp',name='sp',"
- "type='"NS"QSharedPointer<int>',value='',numchild='3',children=["
+ "type='" NS "QSharedPointer<int>',value='',numchild='3',children=["
"{name='data',type='int',value='99',numchild='0'},"
"{name='weakref',value='2',type='int',numchild='0'},"
"{name='strongref',value='1',type='int',numchild='0'}]},"
"{iname='local.wp',name='wp',"
- "type='"NS"QWeakPointer<int>',value='',numchild='3',children=["
+ "type='" NS "QWeakPointer<int>',value='',numchild='3',children=["
"{name='data',type='int',value='99',numchild='0'},"
"{name='weakref',value='2',type='int',numchild='0'},"
"{name='strongref',value='1',type='int',numchild='0'}]}",
@@ -3197,30 +3197,30 @@ void tst_Gdb::dump_QWeakPointer_13()
prepare("dump_QWeakPointer_13");
if (checkUninitialized)
check("A","{iname='local.sp',name='sp',"
- "type='"NS"QSharedPointer<int>',value='<invalid>',numchild='0'},"
+ "type='" NS "QSharedPointer<int>',value='<invalid>',numchild='0'},"
"{iname='local.wp',name='wp',"
- "type='"NS"QWeakPointer<int>',value='<invalid>',numchild='0'},"
+ "type='" NS "QWeakPointer<int>',value='<invalid>',numchild='0'},"
"{iname='local.wp2',name='wp2',"
- "type='"NS"QWeakPointer<int>',value='<invalid>',numchild='0'}");
+ "type='" NS "QWeakPointer<int>',value='<invalid>',numchild='0'}");
next(3);
check("B","{iname='local.sp',name='sp',"
- "type='"NS"QSharedPointer<int>',value='',numchild='3'},"
+ "type='" NS "QSharedPointer<int>',value='',numchild='3'},"
"{iname='local.wp',name='wp',"
- "type='"NS"QWeakPointer<int>',value='',numchild='3'},"
+ "type='" NS "QWeakPointer<int>',value='',numchild='3'},"
"{iname='local.wp2',name='wp2',"
- "type='"NS"QWeakPointer<int>',value='',numchild='3'}");
+ "type='" NS "QWeakPointer<int>',value='',numchild='3'}");
check("B","{iname='local.sp',name='sp',"
- "type='"NS"QSharedPointer<int>',value='',numchild='3',children=["
+ "type='" NS "QSharedPointer<int>',value='',numchild='3',children=["
"{name='data',type='int',value='99',numchild='0'},"
"{name='weakref',value='3',type='int',numchild='0'},"
"{name='strongref',value='1',type='int',numchild='0'}]},"
"{iname='local.wp',name='wp',"
- "type='"NS"QWeakPointer<int>',value='',numchild='3',children=["
+ "type='" NS "QWeakPointer<int>',value='',numchild='3',children=["
"{name='data',type='int',value='99',numchild='0'},"
"{name='weakref',value='3',type='int',numchild='0'},"
"{name='strongref',value='1',type='int',numchild='0'}]},"
"{iname='local.wp2',name='wp2',"
- "type='"NS"QWeakPointer<int>',value='',numchild='3'}",
+ "type='" NS "QWeakPointer<int>',value='',numchild='3'}",
"local.sp,local.wp");
}
@@ -3237,21 +3237,21 @@ void tst_Gdb::dump_QWeakPointer_2()
prepare("dump_QWeakPointer_2");
if (checkUninitialized)
check("A","{iname='local.sp',name='sp',"
- "type='"NS"QSharedPointer<"NS"QString>',"
+ "type='" NS "QSharedPointer<" NS "QString>',"
"value='<invalid>',numchild='0'},"
"{iname='local.wp',name='wp',"
- "type='"NS"QWeakPointer<"NS"QString>',"
+ "type='" NS "QWeakPointer<" NS "QString>',"
"value='<invalid>',numchild='0'}");
next(2);
check("B","{iname='local.sp',name='sp',"
- "type='"NS"QSharedPointer<"NS"QString>',value='',numchild='3',children=["
- "{name='data',type='"NS"QString',"
+ "type='" NS "QSharedPointer<" NS "QString>',value='',numchild='3',children=["
+ "{name='data',type='" NS "QString',"
"valueencoded='7',value='5400650073007400',numchild='0'},"
"{name='weakref',value='2',type='int',numchild='0'},"
"{name='strongref',value='1',type='int',numchild='0'}]},"
"{iname='local.wp',name='wp',"
- "type='"NS"QWeakPointer<"NS"QString>',value='',numchild='3',children=["
- "{name='data',type='"NS"QString',"
+ "type='" NS "QWeakPointer<" NS "QString>',value='',numchild='3',children=["
+ "{name='data',type='" NS "QString',"
"valueencoded='7',value='5400650073007400',numchild='0'},"
"{name='weakref',value='2',type='int',numchild='0'},"
"{name='strongref',value='1',type='int',numchild='0'}]}",
@@ -3284,14 +3284,14 @@ void tst_Gdb::dump_QWidget()
prepare("dump_QWidget");
if (checkUninitialized)
check("A","{iname='local.w',name='w',"
- "type='"NS"QWidget',value='<invalid>',numchild='0'}");
+ "type='" NS "QWidget',value='<invalid>',numchild='0'}");
next();
- check("B","{iname='local.w',name='w',type='"NS"QWidget',"
+ check("B","{iname='local.w',name='w',type='" NS "QWidget',"
"value='{...}',numchild='4',children=["
- "{name='"NS"QObject',type='"NS"QObject',"
+ "{name='" NS "QObject',type='" NS "QObject',"
"valueencoded='7',value='',numchild='4',children=["
- "{name='parent',type='"NS"QObject *',value='0x0',numchild='0'},"
- "{name='children',type='"NS"QObject::QObjectList',"
+ "{name='parent',type='" NS "QObject *',value='0x0',numchild='0'},"
+ "{name='children',type='" NS "QObject::QObjectList',"
"value='<0 items>',numchild='0'},"
"{name='properties',value='<1 items>',type='',numchild='1'},"
"{name='connections',value='<0 items>',type='',numchild='0'},"
@@ -3300,11 +3300,11 @@ void tst_Gdb::dump_QWidget()
"{name='slots',value='<2 items>',type='',"
"numchild='2',childnumchild='0'}"
"]},"
- "{name='"NS"QPaintDevice',type='"NS"QPaintDevice',"
+ "{name='" NS "QPaintDevice',type='" NS "QPaintDevice',"
"value='{...}',numchild='2'},"
- "{name='data',type='"NS"QWidgetData *',"
+ "{name='data',type='" NS "QWidgetData *',"
"value='-',numchild='1'}]}",
- "local.w,local.w."NS"QObject");
+ "local.w,local.w." NS "QObject");
# endif
}
diff --git a/tests/tools/codaclient/codaclientapplication.cpp b/tests/tools/codaclient/codaclientapplication.cpp
index fd2df20539639e0ed6d7326f750e5c9e5c4506cb..9b6726d2d15994b6ab720f8fd07c24c2fdd813ec 100644
--- a/tests/tools/codaclient/codaclientapplication.cpp
+++ b/tests/tools/codaclient/codaclientapplication.cpp
@@ -42,7 +42,7 @@
#include <cstdio>
static const char usageC[] =
-"\n%1 v0.1 built "__DATE__"\n\n"
+"\n%1 v0.1 built " __DATE__ "\n\n"
"Test client for Symbian CODA\n\n"
"Usage:\n"
"%1 ping connection Note: For serial connections ONLY.\n"