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

fix C++11 string literal incompatibility

Browse Source 
Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-11-22 15:50:49 +01:00
committed by hjk
parent 09f56a5c0d
commit fa66a540fd
9 changed files with 539 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
share/qtcreator/dumper/dumper.cpp
View File

@@ -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();
}

4
src/plugins/bazaar/bazaareditor.cpp
View File

@@ -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) {

6
src/plugins/cvs/cvseditor.cpp
View File

@@ -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) {

4
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -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;
}

4
src/plugins/git/giteditor.cpp
View File

@@ -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) {

12
src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
View File

@@ -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 {

158
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -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);

748
tests/auto/debugger/tst_gdb.cpp
View File

File diff suppressed because it is too large Load Diff

2
tests/tools/codaclient/codaclientapplication.cpp
View File

@@ -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"