From fd754e8231b9d9c4da0942293932235a5542f3a1 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 20 Jan 2012 15:13:56 +0100
Subject: [PATCH] ClassView: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: I407b2cf2e1d6efa627724e893ea425bb653cdc7a
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
---
src/plugins/classview/classviewmanager.cpp | 4 ++--
src/plugins/classview/classviewparser.cpp | 3 ++-
src/plugins/classview/classviewparsertreeitem.cpp | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp
index 6232b13ef5f..ab9d11e8a4c 100644
--- a/src/plugins/classview/classviewmanager.cpp
+++ b/src/plugins/classview/classviewmanager.cpp
@@ -251,7 +251,7 @@ void Manager::onProjectListChanged()
void Manager::onTaskStarted(const QString &type)
{
- if (type != CppTools::Constants::TASK_INDEX)
+ if (type != QLatin1String(CppTools::Constants::TASK_INDEX))
return;
// disable tree updates to speed up
@@ -260,7 +260,7 @@ void Manager::onTaskStarted(const QString &type)
void Manager::onAllTasksFinished(const QString &type)
{
- if (type != CppTools::Constants::TASK_INDEX)
+ if (type != QLatin1String(CppTools::Constants::TASK_INDEX))
return;
// parsing is finished, enable tree updates
diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp
index 4ffaddda3db..33ef4909c5c 100644
--- a/src/plugins/classview/classviewparser.cpp
+++ b/src/plugins/classview/classviewparser.cpp
@@ -320,7 +320,8 @@ void Parser::addSymbol(const ParserTreeItem::Ptr &item, const CPlusPlus::Symbol
itemAdd = ParserTreeItem::Ptr(new ParserTreeItem());
// 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);
// prevent showing a content of the functions
diff --git a/src/plugins/classview/classviewparsertreeitem.cpp b/src/plugins/classview/classviewparsertreeitem.cpp
index 95bf094b784..9182a730ef3 100644
--- a/src/plugins/classview/classviewparsertreeitem.cpp
+++ b/src/plugins/classview/classviewparsertreeitem.cpp
@@ -364,7 +364,7 @@ void ParserTreeItem::debugDump(int ident) const
d->symbolInformations.constEnd();
while(curHash != endHash) {
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();
if (!curHash.value().isNull())
curHash.value()->debugDump(ident + 1);
--
GitLab