diff options
author | Jesper K. Pedersen <jesper.pedersen@kdab.com> | 2013-04-16 08:44:14 +0200 |
---|---|---|
committer | Jesper K. Pedersen <jesper.pedersen@kdab.com> | 2013-04-16 14:16:20 +0200 |
commit | 6477b6591a365db4c19d6151589e01f89fdd9c84 (patch) | |
tree | 1391d4634b812b124123ec7b7830ff19e4973b14 | |
parent | 74e093436dd158ba7f583824ce0331a344de7467 (diff) |
Made it compile with Qt Creator 2.7.1
Change-Id: If1f5b49c912fc3719bb017d389412ac5676100bf
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
-rw-r--r-- | scriptingconstants.h | 6 | ||||
-rw-r--r-- | scriptmanager.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scriptingconstants.h b/scriptingconstants.h index 3ca5746..0c70e7e 100644 --- a/scriptingconstants.h +++ b/scriptingconstants.h @@ -36,10 +36,10 @@ namespace Scripting { namespace Constants { -const char S_SCRIPTDIRECTORY[] = "qtc-scripts"; -const char S_EXTENSION[] = "qs"; +const QString S_SCRIPTDIRECTORY = QLatin1String("qtc-scripts"); +const QString S_EXTENSION = QLatin1String("qs"); const char S_SHORTCUT_SUFFIX[] = " scripts."; -const char S_GLOBAL_NAME[] = "Global"; +const QString S_GLOBAL_NAME = QLatin1String("Global"); } // namespace Scripting diff --git a/scriptmanager.cpp b/scriptmanager.cpp index 90dc7b1..882839c 100644 --- a/scriptmanager.cpp +++ b/scriptmanager.cpp @@ -112,7 +112,7 @@ QString ScriptManager::defaultDirectory() const QString ScriptManager::scriptDirectory(ProjectExplorer::Project *project) const { - const QString &path = project->projectDirectory() + '/' + Constants::S_SCRIPTDIRECTORY; + const QString &path = project->projectDirectory() + QLatin1Char('/') + Constants::S_SCRIPTDIRECTORY; if (QFile::exists(path)) return path; @@ -128,11 +128,11 @@ QStringList scriptListFromDir(const QString &path) { QDir dir(path); QStringList filter; - filter << QString("*.") + Constants::S_EXTENSION; + filter << QLatin1String("*.") + Constants::S_EXTENSION; QStringList files = dir.entryList(filter, QDir::Files); for (int i=0; i<files.count(); ++i) { - QString fileName = dir.absolutePath() + '/' + files.at(i); + QString fileName = dir.absolutePath() + QLatin1Char('/') + files.at(i); files[i] = fileName; } |