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

ClassView: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I407b2cf2e1d6efa627724e893ea425bb653cdc7a
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-20 15:13:56 +01:00
parent b97b45a341
commit fd754e8231
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/classview/classviewmanager.cpp
View File

@@ -251,7 +251,7 @@ void Manager::onProjectListChanged()
void Manager::onTaskStarted(const QString &type) void Manager::onTaskStarted(const QString &type)
{ {
if (type != CppTools::Constants::TASK_INDEX) if (type != QLatin1String(CppTools::Constants::TASK_INDEX))
return; return;
// disable tree updates to speed up // disable tree updates to speed up
@@ -260,7 +260,7 @@ void Manager::onTaskStarted(const QString &type)
void Manager::onAllTasksFinished(const QString &type) void Manager::onAllTasksFinished(const QString &type)
{ {
if (type != CppTools::Constants::TASK_INDEX) if (type != QLatin1String(CppTools::Constants::TASK_INDEX))
return; return;
// parsing is finished, enable tree updates // parsing is finished, enable tree updates

3
src/plugins/classview/classviewparser.cpp
View File

@@ -320,7 +320,8 @@ void Parser::addSymbol(const ParserTreeItem::Ptr &item, const CPlusPlus::Symbol
itemAdd = ParserTreeItem::Ptr(new ParserTreeItem()); itemAdd = ParserTreeItem::Ptr(new ParserTreeItem());
// locations are 1-based in Symbol, start with 0 for the editor // locations are 1-based in Symbol, start with 0 for the editor
SymbolLocation location(symbol->fileName(), symbol->line(), symbol->column() - 1); SymbolLocation location(QString::fromUtf8(symbol->fileName() , symbol->fileNameLength()),
symbol->line(), symbol->column() - 1);
itemAdd->addSymbolLocation(location); itemAdd->addSymbolLocation(location);
// prevent showing a content of the functions // prevent showing a content of the functions

2
src/plugins/classview/classviewparsertreeitem.cpp
View File

@@ -364,7 +364,7 @@ void ParserTreeItem::debugDump(int ident) const
d->symbolInformations.constEnd(); d->symbolInformations.constEnd();
while(curHash != endHash) { while(curHash != endHash) {
const SymbolInformation &inf = curHash.key(); const SymbolInformation &inf = curHash.key();
qDebug() << QString(2*ident, QChar(' ')) << inf.iconType() << inf.name() << inf.type() qDebug() << QString(2*ident, QLatin1Char(' ')) << inf.iconType() << inf.name() << inf.type()
<< curHash.value().isNull(); << curHash.value().isNull();
if (!curHash.value().isNull()) if (!curHash.value().isNull())
curHash.value()->debugDump(ident + 1); curHash.value()->debugDump(ident + 1);