CMake: Change PreloadKitInformation to work on Utils::FileName

Change-Id: I717fa8a5c3b308e237acd004fd69df2ba299a938
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

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)

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

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

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;
 }