summaryrefslogtreecommitdiff
path: root/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp')
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
index a61df84fc2..8d7866dd93 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
@@ -770,12 +770,12 @@ QPair<ProFile *, QStringList> QmakePriFile::readProFile()
QString contents;
{
QString errorMsg;
- if (TextFileFormat::readFile(
- filePath().toString(),
- Core::EditorManager::defaultTextCodec(),
- &contents,
- &m_textFormat,
- &errorMsg) != TextFileFormat::ReadSuccess) {
+ if (TextFileFormat::readFile(filePath(),
+ Core::EditorManager::defaultTextCodec(),
+ &contents,
+ &m_textFormat,
+ &errorMsg)
+ != TextFileFormat::ReadSuccess) {
QmakeBuildSystem::proFileParseError(errorMsg, filePath());
return qMakePair(includeFile, lines);
}
@@ -932,7 +932,7 @@ void QmakePriFile::save(const QStringList &lines)
QTC_ASSERT(m_textFormat.codec, return);
FileChangeBlocker changeGuard(filePath().toString());
QString errorMsg;
- if (!m_textFormat.writeFile(filePath().toString(), lines.join('\n'), &errorMsg)) {
+ if (!m_textFormat.writeFile(filePath(), lines.join('\n'), &errorMsg)) {
QMessageBox::critical(Core::ICore::dialogParent(), QCoreApplication::translate(
"QmakePriFile", "File Error"), errorMsg);
}
@@ -1140,9 +1140,9 @@ QByteArray QmakeProFile::cxxDefines() const
QByteArray result;
foreach (const QString &def, variableValue(Variable::Defines)) {
// 'def' is shell input, so interpret it.
- QtcProcess::SplitError error = QtcProcess::SplitOk;
- const QStringList args = QtcProcess::splitArgs(def, HostOsInfo::hostOs(), false, &error);
- if (error != QtcProcess::SplitOk || args.size() == 0)
+ ProcessArgs::SplitError error = ProcessArgs::SplitOk;
+ const QStringList args = ProcessArgs::splitArgs(def, HostOsInfo::hostOs(), false, &error);
+ if (error != ProcessArgs::SplitOk || args.size() == 0)
continue;
result += "#define ";