From 9c80a46987e6602f6c435bb33cc76589ef65f0b9 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 19 Feb 2009 12:02:47 +0100
Subject: [PATCH] Fixes: save a few strlen calls
---
src/libs/cplusplus/TypeOfExpression.cpp | 2 +-
src/libs/extensionsystem/pluginmanager.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/libs/cplusplus/TypeOfExpression.cpp b/src/libs/cplusplus/TypeOfExpression.cpp
index fe9a664d18e..032443339c6 100644
--- a/src/libs/cplusplus/TypeOfExpression.cpp
+++ b/src/libs/cplusplus/TypeOfExpression.cpp
@@ -145,5 +145,5 @@ QString TypeOfExpression::preprocessedExpression(const QString &expression,
Preprocessor preproc(0, env);
QByteArray preprocessedCode;
preproc("<expression>", code, &preprocessedCode);
- return QString::fromUtf8(preprocessedCode);
+ return QString::fromUtf8(preprocessedCode.constData(), preprocessedCode.size());
}
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index 5a1c8a00e6a..7f523ad277f 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -459,7 +459,8 @@ bool PluginManager::runningTests() const
*/
QString PluginManager::testDataDirectory() const
{
- QString s = QString::fromLocal8Bit(qgetenv("IDETESTDIR"));
+ QByteArray ba = qgetenv("IDETESTDIR");
+ QString s = QString::fromLocal8Bit(ba.constData(), ba.size());
if (s.isEmpty()) {
s = IDE_TEST_DIR;
s.append("/tests");
--
GitLab