summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2009-02-19 12:02:47 +0100
committerhjk <qtc-committer@nokia.com>2009-02-19 12:02:47 +0100
commit9c80a46987e6602f6c435bb33cc76589ef65f0b9 (patch)
treeb1640b23ca7dca3dbe34b1cf533cc31c2350f2b9 /src
parent7708d43f233cf15b41ef2690d3795d4cd4649ff7 (diff)
downloadqt-creator-9c80a46987e6602f6c435bb33cc76589ef65f0b9.tar.gz
Fixes: save a few strlen calls
Diffstat (limited to 'src')
-rw-r--r--src/libs/cplusplus/TypeOfExpression.cpp2
-rw-r--r--src/libs/extensionsystem/pluginmanager.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/cplusplus/TypeOfExpression.cpp b/src/libs/cplusplus/TypeOfExpression.cpp
index fe9a664d18..032443339c 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 5a1c8a00e6..7f523ad277 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");