From 65d17272ad6fb548849b3a40a2b083f059a9015c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 11 Jan 2016 13:21:02 +0100 Subject: [PATCH] CMake: Change PreloadKitInformation to work on Utils::FileName Change-Id: I717fa8a5c3b308e237acd004fd69df2ba299a938 Reviewed-by: Niels Weber Reviewed-by: Tobias Hunger --- .../cmakepreloadcachekitconfigwidget.cpp | 2 +- .../cmakepreloadcachekitinformation.cpp | 10 +++++----- .../cmakepreloadcachekitinformation.h | 4 ++-- src/plugins/cmakeprojectmanager/generatorinfo.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitconfigwidget.cpp b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitconfigwidget.cpp index 58793fedf3a..0141d822779 100644 --- a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitconfigwidget.cpp +++ b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitconfigwidget.cpp @@ -77,7 +77,7 @@ void CMakePreloadCacheKitConfigWidget::makeReadOnly() void CMakePreloadCacheKitConfigWidget::refresh() { if (!m_ignoreChange) - m_lineEdit->setText(CMakePreloadCacheKitInformation::preloadCacheFile(m_kit)); + m_lineEdit->setText(CMakePreloadCacheKitInformation::preloadCacheFile(m_kit).toUserOutput()); } void CMakePreloadCacheKitConfigWidget::preloadFileWasChanged(const QString &text) diff --git a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.cpp index f3c038be0f5..0b1d44066f9 100644 --- a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.cpp @@ -86,18 +86,18 @@ KitConfigWidget *CMakePreloadCacheKitInformation::createConfigWidget(Kit *k) con return new Internal::CMakePreloadCacheKitConfigWidget(k, this); } -void CMakePreloadCacheKitInformation::setPreloadCacheFile(Kit *k, const QString &preload) +void CMakePreloadCacheKitInformation::setPreloadCacheFile(Kit *k, const Utils::FileName &preload) { if (!k) return; - k->setValue(CMakePreloadCacheKitInformation::id(), preload); + k->setValue(CMakePreloadCacheKitInformation::id(), preload.toString()); } -QString CMakePreloadCacheKitInformation::preloadCacheFile(const Kit *k) +Utils::FileName CMakePreloadCacheKitInformation::preloadCacheFile(const Kit *k) { if (!k) - return QString(); - return k->value(CMakePreloadCacheKitInformation::id()).toString(); + return Utils::FileName(); + return Utils::FileName::fromString(k->value(CMakePreloadCacheKitInformation::id()).toString()); } } // namespace CMakeProjectManager diff --git a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h index 1761441b05d..2cdb36c0fb5 100644 --- a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h +++ b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h @@ -52,8 +52,8 @@ public: ItemList toUserOutput(const ProjectExplorer::Kit *k) const override; ProjectExplorer::KitConfigWidget *createConfigWidget(ProjectExplorer::Kit *k) const override; - static void setPreloadCacheFile(ProjectExplorer::Kit *k, const QString &preload); - static QString preloadCacheFile(const ProjectExplorer::Kit *k); + static void setPreloadCacheFile(ProjectExplorer::Kit *k, const Utils::FileName &preload); + static Utils::FileName preloadCacheFile(const ProjectExplorer::Kit *k); }; } // namespace CMakeProjectManager diff --git a/src/plugins/cmakeprojectmanager/generatorinfo.cpp b/src/plugins/cmakeprojectmanager/generatorinfo.cpp index ae45a918bd9..44a1b121c15 100644 --- a/src/plugins/cmakeprojectmanager/generatorinfo.cpp +++ b/src/plugins/cmakeprojectmanager/generatorinfo.cpp @@ -96,7 +96,7 @@ QByteArray GeneratorInfo::generatorArgument() const QString GeneratorInfo::preLoadCacheFileArgument() const { - const QString tmp = CMakePreloadCacheKitInformation::preloadCacheFile(m_kit); + const QString tmp = CMakePreloadCacheKitInformation::preloadCacheFile(m_kit).toUserOutput(); return tmp.isEmpty() ? QString() : QString::fromLatin1("-C") + tmp; }