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

Debugger: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
(except gdbmi.cpp, name_demangler.cpp). Remove some unneeded
conversions, change some maps to take QByteArray keys.

Change-Id: I010f1251998a441fe5c8c87901b1e0c277c0391c
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2011-12-21 14:02:52 +01:00
committed by hjk
parent ec49390052
commit a92e38f47f
38 changed files with 327 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/plugins/debugger/logwindow.cpp
View File

@@ -64,36 +64,6 @@
namespace Debugger {
namespace Internal {
static QChar charForChannel(int channel)
{
switch (channel) {
case LogDebug: return 'd';
case LogWarning: return 'w';
case LogError: return 'e';
case LogInput: return '<';
case LogOutput: return '>';
case LogStatus: return 's';
case LogTime: return 't';
case LogMisc:
default: return ' ';
}
}
static LogChannel channelForChar(QChar c)
{
switch (c.unicode()) {
case 'd': return LogDebug;
case 'w': return LogWarning;
case 'e': return LogError;
case '<': return LogInput;
case '>': return LogOutput;
case 's': return LogStatus;
case 't': return LogTime;
default: return LogMisc;
}
}
/////////////////////////////////////////////////////////////////////
//
// OutputHighlighter
@@ -111,7 +81,7 @@ private:
void highlightBlock(const QString &text)
{
QTextCharFormat format;
switch (channelForChar(text.isEmpty() ? QChar() : text.at(0))) {
switch (LogWindow::channelForChar(text.isEmpty() ? QChar() : text.at(0))) {
case LogInput:
format.setForeground(Qt::blue);
setFormat(1, text.size(), format);
@@ -266,7 +236,7 @@ private:
int n = 0;
// cut time string
if (line.size() > 18 && line.at(0) == '[')
if (line.size() > 18 && line.at(0) == QLatin1Char('['))
line = line.mid(18);
//qDebug() << line;
@@ -312,7 +282,7 @@ public:
public slots:
void gotoResult(int i)
{
QString needle = QString::number(i) + '^';
QString needle = QString::number(i) + QLatin1Char('^');
QString needle2 = QLatin1Char('>') + needle;
QTextCursor cursor(document());
do {
@@ -343,7 +313,7 @@ LogWindow::LogWindow(QWidget *parent)
: QWidget(parent)
{
setWindowTitle(tr("Debugger Log"));
setObjectName("Log");
setObjectName(QLatin1String("Log"));
m_ignoreNextInputEcho = false;
@@ -366,7 +336,7 @@ LogWindow::LogWindow(QWidget *parent)
m_commandLabel = new QLabel(tr("Command:"), this);
m_commandEdit = new QLineEdit(this);
m_commandEdit->setFrame(false);
m_commandEdit->setObjectName("DebuggerInput");
m_commandEdit->setObjectName(QLatin1String("DebuggerInput"));
m_commandEdit->setCompleter(new Utils::HistoryCompleter(
Core::ICore::instance()->settings(), m_commandEdit));
QHBoxLayout *commandBox = new QHBoxLayout;
@@ -438,7 +408,7 @@ void LogWindow::showOutput(int channel, const QString &output)
if (debuggerCore()->boolSetting(LogTimeStamps))
m_combinedText->appendPlainText(charForChannel(LogTime) + logTimeStamp());
foreach (QString line, output.split('\n')) {
foreach (QString line, output.split(QLatin1Char('\n'))) {
// FIXME: QTextEdit asserts on really long lines...
const int n = 30000;
if (line.size() > n) {
@@ -536,6 +506,35 @@ bool LogWindow::writeLogContents(const QPlainTextEdit *editor, QWidget *parent)
return success;
}
QChar LogWindow::charForChannel(int channel)
{
switch (channel) {
case LogDebug: return QLatin1Char('d');
case LogWarning: return QLatin1Char('w');
case LogError: return QLatin1Char('e');
case LogInput: return QLatin1Char('<');
case LogOutput: return QLatin1Char('>');
case LogStatus: return QLatin1Char('s');
case LogTime: return QLatin1Char('t');
case LogMisc:
default: return QLatin1Char(' ');
}
}
LogChannel LogWindow::channelForChar(QChar c)
{
switch (c.unicode()) {
case 'd': return LogDebug;
case 'w': return LogWarning;
case 'e': return LogError;
case '<': return LogInput;
case '>': return LogOutput;
case 's': return LogStatus;
case 't': return LogTime;
default: return LogMisc;
}
}
} // namespace Internal
} // namespace Debugger