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

Fix preprocessor directives

Browse Source 
* The standard says all preprocessor directives have to start
   at column 0.
This commit is contained in:
Tobias Hunger
2010-06-10 13:12:12 +02:00
parent 726c3345c4
commit 5d5f647f3d
14 changed files with 147 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,13 +195,13 @@ QT_END_NAMESPACE
#ifdef MACROSDEBUG #ifdef MACROSDEBUG
Q_DECL_EXPORT char xDumpInBuffer[10000]; Q_DECL_EXPORT char xDumpInBuffer[10000];
Q_DECL_EXPORT char xDumpOutBuffer[1000000]; Q_DECL_EXPORT char xDumpOutBuffer[1000000];
#define inBuffer xDumpInBuffer # define inBuffer xDumpInBuffer
#define outBuffer xDumpOutBuffer # define outBuffer xDumpOutBuffer
#else #else
Q_DECL_EXPORT char qDumpInBuffer[10000]; Q_DECL_EXPORT char qDumpInBuffer[10000];
Q_DECL_EXPORT char qDumpOutBuffer[1000000]; Q_DECL_EXPORT char qDumpOutBuffer[1000000];
#define inBuffer qDumpInBuffer # define inBuffer qDumpInBuffer
#define outBuffer qDumpOutBuffer # define outBuffer qDumpOutBuffer
#endif #endif
namespace { namespace {
@@ -994,7 +994,7 @@ void qDumpInnerValueHelper(QDumper &d, const char *type, const void *addr,
} }
break; break;
case 'O': case 'O':
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QObject *")) { if (isEqual(type, "QObject *")) {
if (addr) { if (addr) {
const QObject *ob = reinterpret_cast<const QObject *>(addr); const QObject *ob = reinterpret_cast<const QObject *>(addr);
@@ -1010,7 +1010,7 @@ void qDumpInnerValueHelper(QDumper &d, const char *type, const void *addr,
d.putItem("numchild", 0); d.putItem("numchild", 0);
} }
} }
#endif # endif
break; break;
case 'S': case 'S':
if (isEqual(type, "QString")) { if (isEqual(type, "QString")) {
@@ -1246,13 +1246,13 @@ static void qDumpQDateTime(QDumper &d)
d.putHash("isNull", date.isNull()); d.putHash("isNull", date.isNull());
d.putHash("toTime_t", (long)date.toTime_t()); d.putHash("toTime_t", (long)date.toTime_t());
d.putHash("toString", date.toString()); d.putHash("toString", date.toString());
#if QT_VERSION >= 0x040500 # if QT_VERSION >= 0x040500
d.putHash("toString_(ISO)", date.toString(Qt::ISODate)); d.putHash("toString_(ISO)", date.toString(Qt::ISODate));
d.putHash("toString_(SystemLocale)", date.toString(Qt::SystemLocaleDate)); d.putHash("toString_(SystemLocale)", date.toString(Qt::SystemLocaleDate));
d.putHash("toString_(Locale)", date.toString(Qt::LocaleDate)); d.putHash("toString_(Locale)", date.toString(Qt::LocaleDate));
#endif # endif
#if 0 # if 0
d.beginHash(); d.beginHash();
d.putItem("name", "toUTC"); d.putItem("name", "toUTC");
d.putItem("exp", "(("NSX"QDateTime"NSY"*)").put(d.data).put(")" d.putItem("exp", "(("NSX"QDateTime"NSY"*)").put(d.data).put(")"
@@ -1260,9 +1260,9 @@ static void qDumpQDateTime(QDumper &d)
d.putItem("type", NS"QDateTime"); d.putItem("type", NS"QDateTime");
d.putItem("numchild", "1"); d.putItem("numchild", "1");
d.endHash(); d.endHash();
#endif # endif
#if 0 # if 0
d.beginHash(); d.beginHash();
d.putItem("name", "toLocalTime"); d.putItem("name", "toLocalTime");
d.putItem("exp", "(("NSX"QDateTime"NSY"*)").put(d.data).put(")" d.putItem("exp", "(("NSX"QDateTime"NSY"*)").put(d.data).put(")"
@@ -1270,7 +1270,7 @@ static void qDumpQDateTime(QDumper &d)
d.putItem("type", NS"QDateTime"); d.putItem("type", NS"QDateTime");
d.putItem("numchild", "1"); d.putItem("numchild", "1");
d.endHash(); d.endHash();
#endif # endif
d.endChildren(); d.endChildren();
} }
@@ -2079,13 +2079,13 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
*value = QLatin1Char('"') + v->toString() + QLatin1Char('"'); *value = QLatin1Char('"') + v->toString() + QLatin1Char('"');
*numchild = 0; *numchild = 0;
break; break;
#if QT_VERSION >= 0x040500 # if QT_VERSION >= 0x040500
case QVariant::StringList: case QVariant::StringList:
*exp = QString(QLatin1String("(*('"NS"QStringList'*)%1)")) *exp = QString(QLatin1String("(*('"NS"QStringList'*)%1)"))
.arg((quintptr)v); .arg((quintptr)v);
*numchild = v->toStringList().size(); *numchild = v->toStringList().size();
break; break;
#endif # endif
case QVariant::Int: case QVariant::Int:
*value = QString::number(v->toInt()); *value = QString::number(v->toInt());
*numchild= 0; *numchild= 0;
@@ -2094,7 +2094,7 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
*value = QString::number(v->toDouble()); *value = QString::number(v->toDouble());
*numchild = 0; *numchild = 0;
break; break;
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
case QVariant::Point: { case QVariant::Point: {
const QPoint p = v->toPoint(); const QPoint p = v->toPoint();
*value = QString::fromLatin1("%1, %2").arg(p.x()).arg(p.y()); *value = QString::fromLatin1("%1, %2").arg(p.x()).arg(p.y());
@@ -2138,8 +2138,8 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
} }
*numchild = 0; *numchild = 0;
break; break;
#endif // QT_BOOTSTRAPPED # endif // QT_BOOTSTRAPPED
#if USE_QT_GUI # if USE_QT_GUI
case QVariant::Font: case QVariant::Font:
*value = qvariant_cast<QFont>(*v).toString(); *value = qvariant_cast<QFont>(*v).toString();
break; break;
@@ -2147,16 +2147,16 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
*value = qvariant_cast<QColor>(*v).name(); *value = qvariant_cast<QColor>(*v).name();
break; break;
case QVariant::KeySequence: case QVariant::KeySequence:
#ifndef QT_NO_SHORTCUT # ifndef QT_NO_SHORTCUT
*value = qvariant_cast<QKeySequence>(*v).toString(); *value = qvariant_cast<QKeySequence>(*v).toString();
#else # else
*value = QString::fromLatin1("Disabled by QT_NO_SHORTCUT"); *value = QString::fromLatin1("Disabled by QT_NO_SHORTCUT");
#endif # endif
break; break;
case QVariant::SizePolicy: case QVariant::SizePolicy:
*value = sizePolicyValue(qvariant_cast<QSizePolicy>(*v)); *value = sizePolicyValue(qvariant_cast<QSizePolicy>(*v));
break; break;
#endif # endif
default: { default: {
static const char *qTypeFormat = sizeof(void *) == sizeof(long) 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%lx)"
@@ -3476,12 +3476,12 @@ static void handleProtocolVersion2and3(QDumper &d)
qDumpStdMap(d); qDumpStdMap(d);
break; break;
case 'A': case 'A':
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QAbstractItemModel")) if (isEqual(type, "QAbstractItemModel"))
qDumpQAbstractItemModel(d); qDumpQAbstractItemModel(d);
else if (isEqual(type, "QAbstractItem")) else if (isEqual(type, "QAbstractItem"))
qDumpQAbstractItem(d); qDumpQAbstractItem(d);
#endif # endif
break; break;
case 'B': case 'B':
if (isEqual(type, "QByteArray")) if (isEqual(type, "QByteArray"))
@@ -3504,12 +3504,12 @@ static void handleProtocolVersion2and3(QDumper &d)
qDumpStdSet(d); qDumpStdSet(d);
break; break;
case 'F': case 'F':
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QFile")) if (isEqual(type, "QFile"))
qDumpQFile(d); qDumpQFile(d);
else if (isEqual(type, "QFileInfo")) else if (isEqual(type, "QFileInfo"))
qDumpQFileInfo(d); qDumpQFileInfo(d);
#endif # endif
break; break;
case 'H': case 'H':
if (isEqual(type, "QHash")) if (isEqual(type, "QHash"))
@@ -3522,25 +3522,25 @@ static void handleProtocolVersion2and3(QDumper &d)
qDumpStdList(d); qDumpStdList(d);
break; break;
case 'I': case 'I':
#if USE_QT_GUI # if USE_QT_GUI
if (isEqual(type, "QImage")) if (isEqual(type, "QImage"))
qDumpQImage(d); qDumpQImage(d);
else if (isEqual(type, "QImageData")) else if (isEqual(type, "QImageData"))
qDumpQImageData(d); qDumpQImageData(d);
#endif # endif
break; break;
case 'L': case 'L':
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QList")) if (isEqual(type, "QList"))
qDumpQList(d); qDumpQList(d);
else if (isEqual(type, "QLinkedList")) else if (isEqual(type, "QLinkedList"))
qDumpQLinkedList(d); qDumpQLinkedList(d);
else if (isEqual(type, "QLocale")) else if (isEqual(type, "QLocale"))
qDumpQLocale(d); qDumpQLocale(d);
#endif # endif
break; break;
case 'M': case 'M':
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QMap")) if (isEqual(type, "QMap"))
qDumpQMap(d); qDumpQMap(d);
else if (isEqual(type, "QMapNode")) else if (isEqual(type, "QMapNode"))
@@ -3549,10 +3549,10 @@ static void handleProtocolVersion2and3(QDumper &d)
qDumpQModelIndex(d); qDumpQModelIndex(d);
else if (isEqual(type, "QMultiMap")) else if (isEqual(type, "QMultiMap"))
qDumpQMultiMap(d); qDumpQMultiMap(d);
#endif # endif
break; break;
case 'O': case 'O':
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QObject")) if (isEqual(type, "QObject"))
qDumpQObject(d); qDumpQObject(d);
else if (isEqual(type, "QObjectPropertyList")) else if (isEqual(type, "QObjectPropertyList"))
@@ -3571,43 +3571,43 @@ static void handleProtocolVersion2and3(QDumper &d)
qDumpQObjectSlotList(d); qDumpQObjectSlotList(d);
else if (isEqual(type, "QObjectChildList")) else if (isEqual(type, "QObjectChildList"))
qDumpQObjectChildList(d); qDumpQObjectChildList(d);
#endif # endif
break; break;
case 'P': case 'P':
#if USE_QT_GUI # if USE_QT_GUI
if (isEqual(type, "QPixmap")) if (isEqual(type, "QPixmap"))
qDumpQPixmap(d); qDumpQPixmap(d);
#endif # endif
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QPoint")) if (isEqual(type, "QPoint"))
qDumpQPoint(d); qDumpQPoint(d);
else if (isEqual(type, "QPointF")) else if (isEqual(type, "QPointF"))
qDumpQPointF(d); qDumpQPointF(d);
#endif # endif
break; break;
case 'R': case 'R':
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QRect")) if (isEqual(type, "QRect"))
qDumpQRect(d); qDumpQRect(d);
else if (isEqual(type, "QRectF")) else if (isEqual(type, "QRectF"))
qDumpQRectF(d); qDumpQRectF(d);
#endif # endif
break; break;
case 'S': case 'S':
if (isEqual(type, "QString")) if (isEqual(type, "QString"))
qDumpQString(d); qDumpQString(d);
else if (isEqual(type, "QStringList")) else if (isEqual(type, "QStringList"))
qDumpQStringList(d); qDumpQStringList(d);
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
else if (isEqual(type, "QSet")) else if (isEqual(type, "QSet"))
qDumpQSet(d); qDumpQSet(d);
else if (isEqual(type, "QStack")) else if (isEqual(type, "QStack"))
qDumpQVector(d); qDumpQVector(d);
#if QT_VERSION >= 0x040500 # if QT_VERSION >= 0x040500
else if (isEqual(type, "QSharedPointer")) else if (isEqual(type, "QSharedPointer"))
qDumpQSharedPointer(d); qDumpQSharedPointer(d);
#endif # endif
#endif // QT_BOOTSTRAPPED # endif // QT_BOOTSTRAPPED
else if (isEqual(type, "QSize")) else if (isEqual(type, "QSize"))
qDumpQSize(d); qDumpQSize(d);
else if (isEqual(type, "QSizeF")) else if (isEqual(type, "QSizeF"))
@@ -3634,13 +3634,13 @@ static void handleProtocolVersion2and3(QDumper &d)
qDumpStdWString(d); qDumpStdWString(d);
break; break;
case 'T': case 'T':
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QTextCodec")) if (isEqual(type, "QTextCodec"))
qDumpQTextCodec(d); qDumpQTextCodec(d);
#endif # endif
break; break;
case 'V': case 'V':
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QVariantList")) { // resolve typedef if (isEqual(type, "QVariantList")) { // resolve typedef
d.outerType = "QList"; d.outerType = "QList";
d.innerType = "QVariant"; d.innerType = "QVariant";
@@ -3651,15 +3651,15 @@ static void handleProtocolVersion2and3(QDumper &d)
} else if (isEqual(type, "QVector")) { } else if (isEqual(type, "QVector")) {
qDumpQVector(d); qDumpQVector(d);
} }
#endif # endif
break; break;
case 'W': case 'W':
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
#if QT_VERSION >= 0x040500 # if QT_VERSION >= 0x040500
if (isEqual(type, "QWeakPointer")) if (isEqual(type, "QWeakPointer"))
qDumpQWeakPointer(d); qDumpQWeakPointer(d);
#endif # endif
#endif # endif
break; break;
} }
@@ -3954,9 +3954,9 @@ void *qDumpObjectData440(
} }
else { else {
#ifndef QT_BOOTSTRAPPED # ifndef QT_BOOTSTRAPPED
qDebug() << "Unsupported protocol version" << protocolVersion; qDebug() << "Unsupported protocol version" << protocolVersion;
#endif # endif
} }
return outBuffer; return outBuffer;
} }

8
src/plugins/debugger/debuggermanager.cpp
View File

@@ -198,7 +198,7 @@ using namespace TextEditor;
const char *DebuggerManager::stateName(int s) const char *DebuggerManager::stateName(int s)
{ {
#define SN(x) case x: return #x; # define SN(x) case x: return #x;
switch (s) { switch (s) {
SN(DebuggerNotReady) SN(DebuggerNotReady)
SN(EngineStarting) SN(EngineStarting)
@@ -221,7 +221,7 @@ const char *DebuggerManager::stateName(int s)
SN(EngineShuttingDown) SN(EngineShuttingDown)
} }
return "<unknown>"; return "<unknown>";
#undef SN # undef SN
} }
@@ -345,7 +345,7 @@ DebuggerManager::DebuggerManager(DebuggerPlugin *plugin)
DebuggerManager::~DebuggerManager() DebuggerManager::~DebuggerManager()
{ {
#define doDelete(ptr) delete ptr; ptr = 0 # define doDelete(ptr) delete ptr; ptr = 0
doDelete(scriptEngine); doDelete(scriptEngine);
doDelete(pdbEngine); doDelete(pdbEngine);
doDelete(gdbEngine); doDelete(gdbEngine);
@@ -364,7 +364,7 @@ DebuggerManager::~DebuggerManager()
doDelete(scriptEngine); doDelete(scriptEngine);
doDelete(cdbEngine); doDelete(cdbEngine);
doDelete(tcfEngine); doDelete(tcfEngine);
#undef doDelete # undef doDelete
DebuggerManagerPrivate::instance = 0; DebuggerManagerPrivate::instance = 0;
delete d; delete d;
} }

46
src/plugins/debugger/gdb/classicgdbengine.cpp
View File

@@ -224,9 +224,9 @@ void GdbEngine::updateSubItemClassic(const WatchData &data0)
{ {
PRECONDITION; PRECONDITION;
WatchData data = data0; WatchData data = data0;
#if DEBUG_SUBITEM # if DEBUG_SUBITEM
qDebug() << "UPDATE SUBITEM:" << data.toString(); qDebug() << "UPDATE SUBITEM:" << data.toString();
#endif # endif
QTC_ASSERT(data.isValid(), return); QTC_ASSERT(data.isValid(), return);
// in any case we need the type first // in any case we need the type first
@@ -235,16 +235,16 @@ void GdbEngine::updateSubItemClassic(const WatchData &data0)
// Let's play safe, though. // Let's play safe, though.
if (!data.variable.isEmpty()) { if (!data.variable.isEmpty()) {
// Update: It does so for out-of-scope watchers. // Update: It does so for out-of-scope watchers.
#if 1 # if 1
qDebug() << "FIXME: GdbEngine::updateSubItem:" qDebug() << "FIXME: GdbEngine::updateSubItem:"
<< data.toString() << "should not happen"; << data.toString() << "should not happen";
#else # else
data.setType(WatchData::msgNotInScope()); data.setType(WatchData::msgNotInScope());
data.setValue(WatchData::msgNotInScope()); data.setValue(WatchData::msgNotInScope());
data.setHasChildren(false); data.setHasChildren(false);
insertData(data); insertData(data);
return; return;
#endif # endif
} }
// The WatchVarCreate handler will receive type information // The WatchVarCreate handler will receive type information
// and re-insert a WatchData item with correct type, so // and re-insert a WatchData item with correct type, so
@@ -261,9 +261,9 @@ void GdbEngine::updateSubItemClassic(const WatchData &data0)
if (data.isChildrenNeeded() && isPointerType(data.type) if (data.isChildrenNeeded() && isPointerType(data.type)
&& !hasDebuggingHelperForType(data.type)) { && !hasDebuggingHelperForType(data.type)) {
// We sometimes know what kind of children pointers have // We sometimes know what kind of children pointers have
#if DEBUG_SUBITEM # if DEBUG_SUBITEM
qDebug() << "IT'S A POINTER"; qDebug() << "IT'S A POINTER";
#endif # endif
if (theDebuggerBoolSetting(AutoDerefPointers)) { if (theDebuggerBoolSetting(AutoDerefPointers)) {
// Try automatic dereferentiation // Try automatic dereferentiation
@@ -286,9 +286,9 @@ void GdbEngine::updateSubItemClassic(const WatchData &data0)
} }
if (data.isValueNeeded() && hasDebuggingHelperForType(data.type)) { if (data.isValueNeeded() && hasDebuggingHelperForType(data.type)) {
#if DEBUG_SUBITEM # if DEBUG_SUBITEM
qDebug() << "UPDATE SUBITEM: CUSTOMVALUE"; qDebug() << "UPDATE SUBITEM: CUSTOMVALUE";
#endif # endif
runDebuggingHelperClassic(data, runDebuggingHelperClassic(data,
manager()->watchHandler()->isExpandedIName(data.iname)); manager()->watchHandler()->isExpandedIName(data.iname));
return; return;
@@ -296,9 +296,9 @@ void GdbEngine::updateSubItemClassic(const WatchData &data0)
/* /*
if (data.isValueNeeded() && data.exp.isEmpty()) { if (data.isValueNeeded() && data.exp.isEmpty()) {
#if DEBUG_SUBITEM # if DEBUG_SUBITEM
qDebug() << "UPDATE SUBITEM: NO EXPRESSION?"; qDebug() << "UPDATE SUBITEM: NO EXPRESSION?";
#endif # endif
data.setError("<no expression given>"); data.setError("<no expression given>");
insertData(data); insertData(data);
return; return;
@@ -306,9 +306,9 @@ void GdbEngine::updateSubItemClassic(const WatchData &data0)
*/ */
if (data.isValueNeeded() && data.variable.isEmpty()) { if (data.isValueNeeded() && data.variable.isEmpty()) {
#if DEBUG_SUBITEM # if DEBUG_SUBITEM
qDebug() << "UPDATE SUBITEM: VARIABLE NEEDED FOR VALUE"; qDebug() << "UPDATE SUBITEM: VARIABLE NEEDED FOR VALUE";
#endif # endif
createGdbVariableClassic(data); createGdbVariableClassic(data);
// the WatchVarCreate handler will re-insert a WatchData // the WatchVarCreate handler will re-insert a WatchData
// item, with valueNeeded() set. // item, with valueNeeded() set.
@@ -317,9 +317,9 @@ void GdbEngine::updateSubItemClassic(const WatchData &data0)
if (data.isValueNeeded()) { if (data.isValueNeeded()) {
QTC_ASSERT(!data.variable.isEmpty(), return); // tested above QTC_ASSERT(!data.variable.isEmpty(), return); // tested above
#if DEBUG_SUBITEM # if DEBUG_SUBITEM
qDebug() << "UPDATE SUBITEM: VALUE"; qDebug() << "UPDATE SUBITEM: VALUE";
#endif # endif
QByteArray cmd = "-var-evaluate-expression \"" + data.iname + '"'; QByteArray cmd = "-var-evaluate-expression \"" + data.iname + '"';
postCommand(cmd, WatchUpdate, postCommand(cmd, WatchUpdate,
CB(handleEvaluateExpressionClassic), QVariant::fromValue(data)); CB(handleEvaluateExpressionClassic), QVariant::fromValue(data));
@@ -327,17 +327,17 @@ void GdbEngine::updateSubItemClassic(const WatchData &data0)
} }
if (data.isChildrenNeeded() && hasDebuggingHelperForType(data.type)) { if (data.isChildrenNeeded() && hasDebuggingHelperForType(data.type)) {
#if DEBUG_SUBITEM # if DEBUG_SUBITEM
qDebug() << "UPDATE SUBITEM: CUSTOMVALUE WITH CHILDREN"; qDebug() << "UPDATE SUBITEM: CUSTOMVALUE WITH CHILDREN";
#endif # endif
runDebuggingHelperClassic(data, true); runDebuggingHelperClassic(data, true);
return; return;
} }
if (data.isChildrenNeeded() && data.variable.isEmpty()) { if (data.isChildrenNeeded() && data.variable.isEmpty()) {
#if DEBUG_SUBITEM # if DEBUG_SUBITEM
qDebug() << "UPDATE SUBITEM: VARIABLE NEEDED FOR CHILDREN"; qDebug() << "UPDATE SUBITEM: VARIABLE NEEDED FOR CHILDREN";
#endif # endif
createGdbVariableClassic(data); createGdbVariableClassic(data);
// the WatchVarCreate handler will re-insert a WatchData // the WatchVarCreate handler will re-insert a WatchData
// item, with childrenNeeded() set. // item, with childrenNeeded() set.
@@ -353,9 +353,9 @@ void GdbEngine::updateSubItemClassic(const WatchData &data0)
} }
if (data.isHasChildrenNeeded() && hasDebuggingHelperForType(data.type)) { if (data.isHasChildrenNeeded() && hasDebuggingHelperForType(data.type)) {
#if DEBUG_SUBITEM # if DEBUG_SUBITEM
qDebug() << "UPDATE SUBITEM: CUSTOMVALUE WITH CHILDREN"; qDebug() << "UPDATE SUBITEM: CUSTOMVALUE WITH CHILDREN";
#endif # endif
runDebuggingHelperClassic(data, runDebuggingHelperClassic(data,
manager()->watchHandler()->isExpandedIName(data.iname)); manager()->watchHandler()->isExpandedIName(data.iname));
return; return;
@@ -363,9 +363,9 @@ void GdbEngine::updateSubItemClassic(const WatchData &data0)
//#if !X //#if !X
if (data.isHasChildrenNeeded() && data.variable.isEmpty()) { if (data.isHasChildrenNeeded() && data.variable.isEmpty()) {
#if DEBUG_SUBITEM # if DEBUG_SUBITEM
qDebug() << "UPDATE SUBITEM: VARIABLE NEEDED FOR CHILDCOUNT"; qDebug() << "UPDATE SUBITEM: VARIABLE NEEDED FOR CHILDCOUNT";
#endif # endif
createGdbVariableClassic(data); createGdbVariableClassic(data);
// the WatchVarCreate handler will re-insert a WatchData // the WatchVarCreate handler will re-insert a WatchData
// item, with childrenNeeded() set. // item, with childrenNeeded() set.

16
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -657,13 +657,13 @@ void GdbEngine::readGdbStandardOutput()
scan = newstart; scan = newstart;
if (end == start) if (end == start)
continue; continue;
#if defined(Q_OS_WIN) # if defined(Q_OS_WIN)
if (m_inbuffer.at(end - 1) == '\r') { if (m_inbuffer.at(end - 1) == '\r') {
--end; --end;
if (end == start) if (end == start)
continue; continue;
} }
#endif # endif
m_busy = true; m_busy = true;
handleResponse(QByteArray::fromRawData(m_inbuffer.constData() + start, end - start)); handleResponse(QByteArray::fromRawData(m_inbuffer.constData() + start, end - start));
m_busy = false; m_busy = false;
@@ -1149,7 +1149,7 @@ void GdbEngine::handleAqcuiredInferior()
tryLoadDebuggingHelpers(); tryLoadDebuggingHelpers();
#ifndef Q_OS_MAC # ifndef Q_OS_MAC
// intentionally after tryLoadDebuggingHelpers(), // intentionally after tryLoadDebuggingHelpers(),
// otherwise we'd interrupt solib loading. // otherwise we'd interrupt solib loading.
if (theDebuggerBoolSetting(AllPluginBreakpoints)) { if (theDebuggerBoolSetting(AllPluginBreakpoints)) {
@@ -1166,7 +1166,7 @@ void GdbEngine::handleAqcuiredInferior()
postCommand("set auto-solib-add off"); postCommand("set auto-solib-add off");
postCommand("set stop-on-solib-events 0"); postCommand("set stop-on-solib-events 0");
} }
#endif # endif
// It's nicer to see a bit of the world we live in. // It's nicer to see a bit of the world we live in.
reloadModulesInternal(); reloadModulesInternal();
@@ -2847,7 +2847,7 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
stackFrames.append(parseStackFrame(stack.childAt(i), i)); stackFrames.append(parseStackFrame(stack.childAt(i), i));
const StackFrame &frame = stackFrames.back(); const StackFrame &frame = stackFrames.back();
#if defined(Q_OS_WIN) # if defined(Q_OS_WIN)
const bool isBogus = const bool isBogus =
// Assume this is wrong and points to some strange stl_algobase // Assume this is wrong and points to some strange stl_algobase
// implementation. Happens on Karsten's XP system with Gdb 5.50 // implementation. Happens on Karsten's XP system with Gdb 5.50
@@ -2863,7 +2863,7 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
showStatusMessage(tr("Jumping out of bogus frame..."), 1000); showStatusMessage(tr("Jumping out of bogus frame..."), 1000);
return; return;
} }
#endif # endif
// Initialize top frame to the first valid frame. // Initialize top frame to the first valid frame.
const bool isValid = frame.isUsable() && !frame.function.isEmpty(); const bool isValid = frame.isUsable() && !frame.function.isEmpty();
@@ -3401,11 +3401,11 @@ void GdbEngine::updateWatchDataHelper(const WatchData &data)
{ {
//m_pendingRequests = 0; //m_pendingRequests = 0;
PENDING_DEBUG("UPDATE WATCH DATA"); PENDING_DEBUG("UPDATE WATCH DATA");
#if DEBUG_PENDING # if DEBUG_PENDING
//qDebug() << "##############################################"; //qDebug() << "##############################################";
qDebug() << "UPDATE MODEL, FOUND INCOMPLETE:"; qDebug() << "UPDATE MODEL, FOUND INCOMPLETE:";
//qDebug() << data.toString(); //qDebug() << data.toString();
#endif # endif
updateSubItemClassic(data); updateSubItemClassic(data);
//PENDING_DEBUG("INTERNAL TRIGGERING UPDATE WATCH MODEL"); //PENDING_DEBUG("INTERNAL TRIGGERING UPDATE WATCH MODEL");

16
src/plugins/debugger/gdb/trkgdbadapter.cpp
View File

@@ -1151,26 +1151,26 @@ void TrkGdbAdapter::handleTrkResult(const TrkResult &result)
logMessage(QLatin1String("Ignoring stop at 0")); logMessage(QLatin1String("Ignoring stop at 0"));
} }
#if 1 # if 1
// We almost always need register values, so get them // We almost always need register values, so get them
// now before informing gdb about the stop.s // now before informing gdb about the stop.s
//qDebug() << "Auto-fetching registers"; //qDebug() << "Auto-fetching registers";
sendTrkMessage(0x12, sendTrkMessage(0x12,
TrkCB(handleAndReportReadRegistersAfterStop), TrkCB(handleAndReportReadRegistersAfterStop),
trkReadRegistersMessage()); trkReadRegistersMessage());
#else # else
// As a source-line step typically consists of // As a source-line step typically consists of
// several instruction steps, better avoid the multiple // several instruction steps, better avoid the multiple
// roundtrips through TRK in favour of an additional // roundtrips through TRK in favour of an additional
// roundtrip through gdb. But gdb will ask for all registers. // roundtrip through gdb. But gdb will ask for all registers.
#if 1 # if 1
sendGdbServerMessage("S05", "Target stopped"); sendGdbServerMessage("S05", "Target stopped");
#else # else
QByteArray ba = "T05"; QByteArray ba = "T05";
appendRegister(&ba, RegisterPSGdb, addr); appendRegister(&ba, RegisterPSGdb, addr);
sendGdbServerMessage(ba, "Registers"); sendGdbServerMessage(ba, "Registers");
#endif # endif
#endif # endif
break; break;
} }
case TrkNotifyException: { // 0x91 Notify Exception (obsolete) case TrkNotifyException: { // 0x91 Notify Exception (obsolete)
@@ -1522,14 +1522,14 @@ void TrkGdbAdapter::tryAnswerGdbMemoryRequest(bool buffered)
// Happens when chunks are not combined // Happens when chunks are not combined
QTC_ASSERT(false, /**/); QTC_ASSERT(false, /**/);
debugMessage("CHUNKS NOT COMBINED"); debugMessage("CHUNKS NOT COMBINED");
#ifdef MEMORY_DEBUG # ifdef MEMORY_DEBUG
qDebug() << "CHUNKS NOT COMBINED"; qDebug() << "CHUNKS NOT COMBINED";
it = m_snapshot.memory.begin(); it = m_snapshot.memory.begin();
et = m_snapshot.memory.end(); et = m_snapshot.memory.end();
for ( ; it != et; ++it) for ( ; it != et; ++it)
qDebug() << hexNumber(it.key().from) << hexNumber(it.key().to); qDebug() << hexNumber(it.key().from) << hexNumber(it.key().to);
qDebug() << "WANTED" << wanted.from << wanted.to; qDebug() << "WANTED" << wanted.from << wanted.to;
#endif # endif
sendGdbServerMessage("E22", ""); sendGdbServerMessage("E22", "");
return; return;
} }

4
src/plugins/debugger/stackwindow.cpp
View File

@@ -172,9 +172,9 @@ void StackWindow::copyContentsToClipboard()
str += '\n'; str += '\n';
} }
QClipboard *clipboard = QApplication::clipboard(); QClipboard *clipboard = QApplication::clipboard();
#ifdef Q_WS_X11 # ifdef Q_WS_X11
clipboard->setText(str, QClipboard::Selection); clipboard->setText(str, QClipboard::Selection);
#endif # endif
clipboard->setText(str, QClipboard::Clipboard); clipboard->setText(str, QClipboard::Clipboard);
} }

4
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -733,7 +733,7 @@ void FakeVimPluginPrivate::setActionChecked(const QString &code, bool check)
void FakeVimPluginPrivate::windowCommand(int key) void FakeVimPluginPrivate::windowCommand(int key)
{ {
#define control(n) (256 + n) # define control(n) (256 + n)
QString code; QString code;
switch (key) { switch (key) {
case 'c': case 'C': case control('c'): case 'c': case 'C': case control('c'):
@@ -756,7 +756,7 @@ void FakeVimPluginPrivate::windowCommand(int key)
code = Core::Constants::GOTO_OTHER_SPLIT; code = Core::Constants::GOTO_OTHER_SPLIT;
break; break;
} }
#undef control # undef control
//qDebug() << "RUNNING WINDOW COMMAND: " << key << code; //qDebug() << "RUNNING WINDOW COMMAND: " << key << code;
if (code.isEmpty()) { if (code.isEmpty()) {
//qDebug() << "UNKNOWN WINDOWS COMMAND: " << key; //qDebug() << "UNKNOWN WINDOWS COMMAND: " << key;

16
src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
View File

@@ -45,11 +45,11 @@ NavigatorTreeModel::NavigatorTreeModel(QObject *parent)
{ {
invisibleRootItem()->setFlags(Qt::ItemIsDropEnabled); invisibleRootItem()->setFlags(Qt::ItemIsDropEnabled);
#ifdef _LOCK_ITEMS_ # ifdef _LOCK_ITEMS_
setColumnCount(3); setColumnCount(3);
#else # else
setColumnCount(2); setColumnCount(2);
#endif # endif
setSupportedDragActions(Qt::LinkAction); setSupportedDragActions(Qt::LinkAction);
@@ -194,14 +194,14 @@ NavigatorTreeModel::ItemRow NavigatorTreeModel::createItemRow(const ModelNode &n
idItem->setEditable(true); idItem->setEditable(true);
idItem->setData(hash, Qt::UserRole); idItem->setData(hash, Qt::UserRole);
#ifdef _LOCK_ITEMS_ # ifdef _LOCK_ITEMS_
QStandardItem *lockItem = new QStandardItem; QStandardItem *lockItem = new QStandardItem;
lockItem->setDragEnabled(true); lockItem->setDragEnabled(true);
lockItem->setDropEnabled(dropEnabled); lockItem->setDropEnabled(dropEnabled);
lockItem->setEditable(false); lockItem->setEditable(false);
lockItem->setCheckable(true); lockItem->setCheckable(true);
lockItem->setData(hash, Qt::UserRole); lockItem->setData(hash, Qt::UserRole);
#endif # endif
QStandardItem *visibilityItem = new QStandardItem; QStandardItem *visibilityItem = new QStandardItem;
visibilityItem->setDropEnabled(dropEnabled); visibilityItem->setDropEnabled(dropEnabled);
@@ -212,11 +212,11 @@ NavigatorTreeModel::ItemRow NavigatorTreeModel::createItemRow(const ModelNode &n
visibilityItem->setCheckable(false); visibilityItem->setCheckable(false);
} }
#ifdef _LOCK_ITEMS_ # ifdef _LOCK_ITEMS_
return ItemRow(idItem, lockItem, visibilityItem); return ItemRow(idItem, lockItem, visibilityItem);
#else # else
return ItemRow(idItem, visibilityItem); return ItemRow(idItem, visibilityItem);
#endif # endif
} }
void NavigatorTreeModel::updateItemRow(const ModelNode &node, ItemRow items) void NavigatorTreeModel::updateItemRow(const ModelNode &node, ItemRow items)

2
src/plugins/qmldesigner/designercore/model/propertyparser.h
View File

@@ -27,7 +27,7 @@
** **
**************************************************************************/ **************************************************************************/
#ifndef PROPERTYPARSER_H #ifndef PROPERTYPARSER_H
#define PROPERTYPARSER_H #define PROPERTYPARSER_H
#include <QtCore/QVariant> #include <QtCore/QVariant>

6
src/shared/symbianutils/trkdevice.cpp
View File

@@ -58,9 +58,9 @@
/* Required headers for select() according to POSIX.1-2001 */ /* Required headers for select() according to POSIX.1-2001 */
# include <sys/select.h> # include <sys/select.h>
/* Required headers for select() according to earlier standards: /* Required headers for select() according to earlier standards:
#include <sys/time.h> # include <sys/time.h>
#include <sys/types.h> # include <sys/types.h>
#include <unistd.h> # include <unistd.h>
*/ */
#endif #endif

6
src/tools/qtlibspatcher/qtlibspatchermain.cpp
View File

@@ -101,15 +101,15 @@ bool patchBinariesWithQtPathes(const char *baseQtPath)
bool result = true; bool result = true;
static const char *filesToPatch[] = { static const char *filesToPatch[] = {
#ifdef Q_OS_WIN # ifdef Q_OS_WIN
"/bin/qmake.exe", "/bin/qmake.exe",
"/bin/QtCore4.dll", "/bin/QtCore4.dll",
"/bin/QtCored4.dll", "/bin/QtCored4.dll",
"/lib/QtCored4.dll" "/lib/QtCored4.dll"
#else # else
"/bin/qmake", "/bin/qmake",
"/lib/libQtCore.so", "/lib/libQtCore.so",
#endif # endif
}; };
for (int i = 0; i < (int)(sizeof(filesToPatch) / sizeof(filesToPatch[0])); i++) { for (int i = 0; i < (int)(sizeof(filesToPatch) / sizeof(filesToPatch[0])); i++) {

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

@@ -1323,7 +1323,7 @@ void tst_Debugger::dumpQLinkedList()
dumpQLinkedListHelper(l3); dumpQLinkedListHelper(l3);
} }
#if 0 # if 0
void tst_Debugger::dumpQLinkedList() void tst_Debugger::dumpQLinkedList()
{ {
// Case 1: Simple element type. // Case 1: Simple element type.
@@ -1402,7 +1402,7 @@ void tst_Debugger::dumpQLinkedList()
//dumpQLinkedListHelper(l3); //dumpQLinkedListHelper(l3);
testDumper("", &l, NS"QLinkedList", true, NS"QString"); testDumper("", &l, NS"QLinkedList", true, NS"QString");
} }
#endif # endif
void tst_Debugger::dumpQList_int() void tst_Debugger::dumpQList_int()
{ {

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

@@ -768,11 +768,11 @@ void dump_misc()
vec.push_back("Hallo2"); vec.push_back("Hallo2");
std::set<std::string> stdSet; std::set<std::string> stdSet;
stdSet.insert("s1"); stdSet.insert("s1");
#ifdef QT_GUI_LIB # ifdef QT_GUI_LIB
QWidget *ww = 0; //this; QWidget *ww = 0; //this;
QWidget &wwr = *ww; QWidget &wwr = *ww;
Q_UNUSED(wwr); Q_UNUSED(wwr);
#endif # endif
QSharedPointer<QString> sps(new QString("hallo")); QSharedPointer<QString> sps(new QString("hallo"));
QList<QSharedPointer<QString> > spsl; QList<QSharedPointer<QString> > spsl;
@@ -790,10 +790,10 @@ void dump_misc()
QLinkedList<QString> lls; QLinkedList<QString> lls;
lls << "link1" << "link2"; lls << "link1" << "link2";
#ifdef QT_GUI_LIB # ifdef QT_GUI_LIB
QStandardItemModel *model = new QStandardItemModel; QStandardItemModel *model = new QStandardItemModel;
model->appendRow(new QStandardItem("i1")); model->appendRow(new QStandardItem("i1"));
#endif # endif
QList <QList<int> > nestedIntList; QList <QList<int> > nestedIntList;
nestedIntList << QList<int>(); nestedIntList << QList<int>();
@@ -1055,7 +1055,7 @@ QByteArray dump_QAbstractItemModelHelper(QAbstractItemModel &m)
void dump_QAbstractItemModel() void dump_QAbstractItemModel()
{ {
#ifdef QT_GUI_LIB # ifdef QT_GUI_LIB
/* A */ QStringList strList; /* A */ QStringList strList;
strList << "String 1"; strList << "String 1";
QStringListModel model1(strList); QStringListModel model1(strList);
@@ -1066,12 +1066,12 @@ void dump_QAbstractItemModel()
/* E */ model2.appendRow(QList<QStandardItem *>() << (new QStandardItem("Item (0,0)")) << (new QStandardItem("Item (0,1)"))); /* E */ model2.appendRow(QList<QStandardItem *>() << (new QStandardItem("Item (0,0)")) << (new QStandardItem("Item (0,1)")));
/* F */ model2.appendRow(QList<QStandardItem *>() << (new QStandardItem("Item (1,0)")) << (new QStandardItem("Item (1,1)"))); /* F */ model2.appendRow(QList<QStandardItem *>() << (new QStandardItem("Item (1,0)")) << (new QStandardItem("Item (1,1)")));
/* G */ (void) (model1.rowCount() + model2.rowCount() + strList.size()); /* G */ (void) (model1.rowCount() + model2.rowCount() + strList.size());
#endif # endif
} }
void tst_Gdb::dump_QAbstractItemModel() void tst_Gdb::dump_QAbstractItemModel()
{ {
#ifdef QT_GUI_LIB # ifdef QT_GUI_LIB
/* A */ QStringList strList; /* A */ QStringList strList;
QString template_ = QString template_ =
"{iname='local.strList',name='strList',type='"NS"QStringList'," "{iname='local.strList',name='strList',type='"NS"QStringList',"
@@ -1086,7 +1086,7 @@ void tst_Gdb::dump_QAbstractItemModel()
check("A", template_.arg("1").toAscii()); check("A", template_.arg("1").toAscii());
next(4); next(4);
check("B", template_.arg("1").toAscii()); check("B", template_.arg("1").toAscii());
#endif # endif
} }
@@ -1184,16 +1184,16 @@ void tst_Gdb::dump_QChar()
void dump_QDateTime() void dump_QDateTime()
{ {
#ifndef QT_NO_DATESTRING # ifndef QT_NO_DATESTRING
/* A */ QDateTime d; /* A */ QDateTime d;
/* B */ d = QDateTime::fromString("M5d21y7110:31:02", "'M'M'd'd'y'yyhh:mm:ss"); /* B */ d = QDateTime::fromString("M5d21y7110:31:02", "'M'M'd'd'y'yyhh:mm:ss");
/* C */ (void) d.isNull(); /* C */ (void) d.isNull();
#endif # endif
} }
void tst_Gdb::dump_QDateTime() void tst_Gdb::dump_QDateTime()
{ {
#ifndef QT_NO_DATESTRING # ifndef QT_NO_DATESTRING
prepare("dump_QDateTime"); prepare("dump_QDateTime");
if (checkUninitialized) if (checkUninitialized)
check("A","{iname='local.d',name='d'," check("A","{iname='local.d',name='d',"
@@ -1238,7 +1238,7 @@ void tst_Gdb::dump_QDateTime()
"value='-',numchild='3'}" "value='-',numchild='3'}"
"]}", "]}",
"local.d"); "local.d");
#endif # endif
} }
@@ -1387,18 +1387,18 @@ void tst_Gdb::dump_QImageDataHelper(QImage &img)
void dump_QImage() void dump_QImage()
{ {
#ifdef QT_GUI_LIB # ifdef QT_GUI_LIB
/* A */ QImage image; // Null image. /* A */ QImage image; // Null image.
/* B */ image = QImage(30, 700, QImage::Format_RGB555); // Normal image. /* B */ image = QImage(30, 700, QImage::Format_RGB555); // Normal image.
/* C */ image = QImage(100, 0, QImage::Format_Invalid); // Invalid image. /* C */ image = QImage(100, 0, QImage::Format_Invalid); // Invalid image.
/* D */ (void) image.size(); /* D */ (void) image.size();
/* E */ (void) image.size(); /* E */ (void) image.size();
#endif # endif
} }
void tst_Gdb::dump_QImage() void tst_Gdb::dump_QImage()
{ {
#ifdef QT_GUI_LIB # ifdef QT_GUI_LIB
prepare("dump_QImage"); prepare("dump_QImage");
next(); next();
check("B", "{iname='local.image',name='image',type='"NS"QImage'," check("B", "{iname='local.image',name='image',type='"NS"QImage',"
@@ -1410,7 +1410,7 @@ void tst_Gdb::dump_QImage()
// FIXME: // 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'}"); // "value='(100x0)',numchild='0'}");
#endif # endif
} }
#if 0 #if 0
@@ -2411,17 +2411,17 @@ const char * const pixmap[] = {
void dump_QPixmap() void dump_QPixmap()
{ {
#ifdef QT_GUI_LIB # ifdef QT_GUI_LIB
/* A */ QPixmap p; // Case 1: Null Pixmap. /* A */ QPixmap p; // Case 1: Null Pixmap.
/* B */ p = QPixmap(20, 100); // Case 2: Uninitialized non-null pixmap. /* B */ p = QPixmap(20, 100); // Case 2: Uninitialized non-null pixmap.
/* C */ p = QPixmap(pixmap); // Case 3: Initialized non-null pixmap. /* C */ p = QPixmap(pixmap); // Case 3: Initialized non-null pixmap.
/* D */ (void) p.size(); /* D */ (void) p.size();
#endif # endif
} }
void tst_Gdb::dump_QPixmap() void tst_Gdb::dump_QPixmap()
{ {
#ifdef QT_GUI_LIB # ifdef QT_GUI_LIB
prepare("dump_QPixmap"); prepare("dump_QPixmap");
next(); next();
check("B", "{iname='local.p',name='p',type='"NS"QPixmap'," check("B", "{iname='local.p',name='p',type='"NS"QPixmap',"
@@ -2432,7 +2432,7 @@ void tst_Gdb::dump_QPixmap()
next(); 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'}"); "value='(2x24)',numchild='0'}");
#endif # endif
} }
@@ -2915,7 +2915,7 @@ void dump_QVariant()
void tst_Gdb::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"); prepare("dump_QVariant");
if (checkUninitialized) /*<invalid>*/ if (checkUninitialized) /*<invalid>*/
check("A","{"PRE"'value=<invalid>',numchild='0'}"); check("A","{"PRE"'value=<invalid>',numchild='0'}");
@@ -3257,15 +3257,15 @@ void tst_Gdb::dump_QWeakPointer_2() {}
void dump_QWidget() void dump_QWidget()
{ {
#ifdef QT_GUI_LIB # ifdef QT_GUI_LIB
/* A */ QWidget w; /* A */ QWidget w;
/* B */ (void) w.size(); /* B */ (void) w.size();
#endif # endif
} }
void tst_Gdb::dump_QWidget() void tst_Gdb::dump_QWidget()
{ {
#ifdef QT_GUI_LIB # ifdef QT_GUI_LIB
prepare("dump_QWidget"); prepare("dump_QWidget");
if (checkUninitialized) if (checkUninitialized)
check("A","{iname='local.w',name='w'," check("A","{iname='local.w',name='w',"
@@ -3290,7 +3290,7 @@ void tst_Gdb::dump_QWidget()
"{name='data',type='"NS"QWidgetData *'," "{name='data',type='"NS"QWidgetData *',"
"value='-',numchild='1'}]}", "value='-',numchild='1'}]}",
"local.w,local.w."NS"QObject"); "local.w,local.w."NS"QObject");
#endif # endif
} }
@@ -3620,11 +3620,11 @@ void breaker() {}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef QT_GUI_LIB # ifdef QT_GUI_LIB
QApplication app(argc, argv); QApplication app(argc, argv);
#else # else
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
#endif # endif
breaker(); breaker();
if (argc == 2 && QByteArray(argv[1]) == "run") { if (argc == 2 && QByteArray(argv[1]) == "run") {

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

@@ -1797,9 +1797,9 @@ int main(int argc, char *argv[])
testQMultiMap(); testQMultiMap();
testQString(); testQString();
testQSet(); testQSet();
#if QT_VERSION >= 0x040500 # if QT_VERSION >= 0x040500
testQSharedPointer(); testQSharedPointer();
#endif # endif
testQStringList(); testQStringList();
testStruct(); testStruct();
testQThread(); testQThread();