summaryrefslogtreecommitdiff
path: root/src/assistant/help/qhelpprojectdata.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-03-22 10:28:47 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-03-22 09:41:10 +0000
commit9a2664b07762619b597227ba7ef47e69e5813dc0 (patch)
treeafdb420cc4953efc65910434b1621d76bcab2a9c /src/assistant/help/qhelpprojectdata.cpp
parent518179f881364007afc2b5c3e07bb0ba6642ddc8 (diff)
downloadqttools-9a2664b07762619b597227ba7ef47e69e5813dc0.tar.gz
Assistant: Fix warnings about constructing/concatenating QString from char *.
Use QLatin1Char/String where applicable. Change-Id: I8584ea79fb34b55ad99966e2dd959b95ab73fb18 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/assistant/help/qhelpprojectdata.cpp')
-rw-r--r--src/assistant/help/qhelpprojectdata.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/assistant/help/qhelpprojectdata.cpp b/src/assistant/help/qhelpprojectdata.cpp
index f48fdea9b..fa084ff3c 100644
--- a/src/assistant/help/qhelpprojectdata.cpp
+++ b/src/assistant/help/qhelpprojectdata.cpp
@@ -275,13 +275,13 @@ void QHelpProjectDataPrivate::addMatchingFiles(const QString &pattern)
{
// The pattern matching is expensive, so we skip it if no
// wildcard symbols occur in the string.
- if (!pattern.contains('?') && !pattern.contains('*')
- && !pattern.contains('[') && !pattern.contains(']')) {
+ if (!pattern.contains(QLatin1Char('?')) && !pattern.contains(QLatin1Char('*'))
+ && !pattern.contains(QLatin1Char('[')) && !pattern.contains(QLatin1Char(']'))) {
filterSectionList.last().addFile(pattern);
return;
}
- QFileInfo fileInfo(rootPath + '/' + pattern);
+ QFileInfo fileInfo(rootPath + QLatin1Char('/') + pattern);
const QDir &dir = fileInfo.dir();
const QString &path = dir.canonicalPath();
@@ -303,7 +303,7 @@ void QHelpProjectDataPrivate::addMatchingFiles(const QString &pattern)
if (regExp.exactMatch(file)) {
matchFound = true;
filterSectionList.last().
- addFile(QFileInfo(pattern).dir().path() + '/' + file);
+ addFile(QFileInfo(pattern).dir().path() + QLatin1Char('/') + file);
}
}
if (!matchFound)