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

debugger: remove a few too-fancy typedefs

Browse Source 
Change-Id: I0c8ba3c2d22ca7128527da42b81919dabbd82d14
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-02-16 11:12:02 +01:00
committed by hjk
parent 29a7ee6cf4
commit b9d15b113f
8 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1047,7 +1047,7 @@ void GdbEngine::handleDebuggingHelperValue3Classic(const GdbResponse &response)
int l = out.isEmpty() ? 0 : list.size();
for (int i = 0; i < l; ++i)
str.append(list.at(i).toInt());
data.setValue(_c('"') + str + _c('"'));
data.setValue(QLatin1Char('"') + str + QLatin1Char('"'));
data.setHasChildren(false);
data.setAllUnneeded();
insertData(data);
@@ -1425,9 +1425,9 @@ void GdbEngine::handleVarListChildrenHelperClassic(const GdbMi &item,
data.exp = "*(" + parent.exp + ')';
} else if (startsWithDigit(data.name)) {
// An array. No variables needed?
data.name = _c('[') + data.name + _c(']');
data.name = QLatin1Char('[') + data.name + QLatin1Char(']');
data.exp = parent.exp + '[' + exp + ']';
} else if (0 && parent.name.endsWith(_c('.'))) {
} else if (0 && parent.name.endsWith(QLatin1Char('.'))) {
// Happens with anonymous unions
data.exp = parent.exp + data.name.toLatin1();
//data.name = "<anonymous union>";

2
src/plugins/debugger/gdb/coregdbadapter.cpp
View File

@@ -135,7 +135,7 @@ void CoreGdbAdapter::handleTemporaryTargetCore(const GdbResponse &response)
m_executable = QLatin1String(console.mid(pos1 + 1, pos2 - pos1 - 1));
// Strip off command line arguments. FIXME: make robust.
int idx = m_executable.indexOf(_c(' '));
int idx = m_executable.indexOf(QLatin1Char(' '));
if (idx >= 0)
m_executable.truncate(idx);
if (m_executable.isEmpty()) {

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

@@ -3265,16 +3265,16 @@ void GdbEngine::handleModulesList(const GdbResponse &response)
Module module;
QString symbolsRead;
QTextStream ts(&line, QIODevice::ReadOnly);
if (line.startsWith(__("0x"))) {
if (line.startsWith(QLatin1String("0x"))) {
ts >> module.startAddress >> module.endAddress >> symbolsRead;
module.moduleName = ts.readLine().trimmed();
module.symbolsRead =
(symbolsRead == __("Yes") ? Module::ReadOk : Module::ReadFailed);
(symbolsRead == QLatin1String("Yes") ? Module::ReadOk : Module::ReadFailed);
modules.append(module);
} else if (line.trimmed().startsWith(__("No"))) {
} else if (line.trimmed().startsWith(QLatin1String("No"))) {
// gdb 6.4 symbianelf
ts >> symbolsRead;
QTC_ASSERT(symbolsRead == __("No"), continue);
QTC_ASSERT(symbolsRead == QLatin1String("No"), continue);
module.startAddress = 0;
module.endAddress = 0;
module.moduleName = ts.readLine().trimmed();
@@ -3796,19 +3796,19 @@ bool GdbEngine::setToolTipExpression(const QPoint &mousePos,
}
exp = exp.mid(pos1, pos2 - pos1);
if (exp.isEmpty() || exp.startsWith(_c('#')) || !hasLetterOrNumber(exp) || isKeyWord(exp))
if (exp.isEmpty() || exp.startsWith(QLatin1Char('#')) || !hasLetterOrNumber(exp) || isKeyWord(exp))
return false;
if (exp.startsWith(_c('"')) && exp.endsWith(_c('"')))
if (exp.startsWith(QLatin1Char('"')) && exp.endsWith(QLatin1Char('"')))
return false;
if (exp.startsWith(__("++")) || exp.startsWith(__("--")))
if (exp.startsWith(QLatin1String("++")) || exp.startsWith(QLatin1String("--")))
exp = exp.mid(2);
if (exp.endsWith(__("++")) || exp.endsWith(__("--")))
if (exp.endsWith(QLatin1String("++")) || exp.endsWith(QLatin1String("--")))
exp = exp.mid(2);
if (exp.startsWith(_c('<')) || exp.startsWith(_c('[')))
if (exp.startsWith(QLatin1Char('<')) || exp.startsWith(QLatin1Char('[')))
return false;
if (hasSideEffects(exp) || exp.isEmpty())
@@ -4130,7 +4130,7 @@ WatchData GdbEngine::localVariable(const GdbMi &item,
GdbMi t = item.findChild("numchild");
if (t.isValid())
data.setHasChildren(t.data().toInt() > 0);
else if (isPointerType(data.type) || data.name == __("this"))
else if (isPointerType(data.type) || data.name == QLatin1String("this"))
data.setHasChildren(true);
return data;
}
@@ -4139,7 +4139,7 @@ void GdbEngine::insertData(const WatchData &data0)
{
PENDING_DEBUG("INSERT DATA" << data0.toString());
WatchData data = data0;
if (data.value.startsWith(__("mi_cmd_var_create:"))) {
if (data.value.startsWith(QLatin1String("mi_cmd_var_create:"))) {
qDebug() << "BOGUS VALUE:" << data.toString();
return;
}