diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:49:55 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:50:23 +0100 |
| commit | 75b42f18d886b59dbf3380dd12f39f40005ef08b (patch) | |
| tree | cd1cb5699064fa897f11d9f9f4923c0c0f05d95a /share/qtcreator/gdbmacros/gdbmacros.cpp | |
| parent | 43203140461174071f7a3e68bf388a6522556810 (diff) | |
| parent | a6ca348636dd92ab1445cff2286b3293163f5cea (diff) | |
| download | qt-creator-75b42f18d886b59dbf3380dd12f39f40005ef08b.tar.gz | |
Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
Diffstat (limited to 'share/qtcreator/gdbmacros/gdbmacros.cpp')
| -rw-r--r-- | share/qtcreator/gdbmacros/gdbmacros.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp index 58fe779706..ee75ff511c 100644 --- a/share/qtcreator/gdbmacros/gdbmacros.cpp +++ b/share/qtcreator/gdbmacros/gdbmacros.cpp @@ -1078,7 +1078,7 @@ static void qDumpQAbstractItem(QDumper &d) { ModelIndex *mm = reinterpret_cast<ModelIndex *>(&mi); mm->r = mm->c = 0; - mm->p = mm->m = 0; + mm->p = mm->m = 0; static const char *printFormat = sizeof(void *) == sizeof(long) ? "%d,%d,0x%lx,0x%lx" : "%d,%d,0x%llx,0x%llx"; sscanf(d.templateParameters[0], printFormat, &mm->r, &mm->c, &mm->p, &mm->m); @@ -2150,7 +2150,7 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value, case QVariant::KeySequence: #ifndef QT_NO_SHORTCUT *value = qvariant_cast<QKeySequence>(*v).toString(); - #else + #else *value = QString::fromLatin1("Disabled by QT_NO_SHORTCUT"); #endif break; @@ -2803,7 +2803,7 @@ static void qDumpQSharedPointer(QDumper &d) const QSharedPointer<int> &ptr = *reinterpret_cast<const QSharedPointer<int> *>(d.data); - if (ptr.isNull()) { + if (ptr.isNull()) { d.putItem("value", "<null>"); d.putItem("valueeditable", "false"); d.putItem("numchild", 0); @@ -3746,9 +3746,9 @@ static inline void dumpSizes(QDumper &d) const SizeMap::const_iterator cend = sizeMap.constEnd(); for (SizeMap::const_iterator it = sizeMap.constBegin(); it != cend; ++it) { // new size list - if (it.key() != lastSize) { + if (it.key() != lastSize) { if (lastSize) - d.put("],"); + d.put("],"); d.put("[\""); d.put(it.key()); lastSize = it.key(); @@ -3758,7 +3758,7 @@ static inline void dumpSizes(QDumper &d) d.put(it.value()); d.put('"'); } - d.put("]]"); + d.put("]]"); } extern "C" Q_DECL_EXPORT |