Utils: Make FilePathAspect::value() return a QString

This is meant to be the "internal", raw, unexpanded value that does not
necessarily match a scheme://host/path pattern before expansion.

Change-Id: I627afbe1e9682d85c5bb04542c7354760ba9a13f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

src/libs/utils/aspects.cpp

@@ -1319,17 +1319,12 @@ FilePath FilePathAspect::operator()() const
     return FilePath::fromUserInput(StringAspect::value());
 }
 
-FilePath FilePathAspect::value() const
-{
-    return FilePath::fromUserInput(StringAspect::value());
-}
-
 FilePath FilePathAspect::expandedValue() const
 {
     return FilePath::fromUserInput(StringAspect::value());
 }
 
-QString FilePathAspect::stringValue() const
+QString FilePathAspect::value() const
 {
     return StringAspect::value();
 }

src/libs/utils/aspects.h

@@ -546,9 +546,8 @@ public:
     FilePathAspect(AspectContainer *container = nullptr);
 
     FilePath operator()() const;
-    FilePath value() const;
     FilePath expandedValue() const;
-    QString stringValue() const;
+    QString value() const;
     void setValue(const FilePath &filePath);
     void setDefaultValue(const FilePath &filePath);
 

src/plugins/fossil/fossilclient.cpp

@@ -764,9 +764,9 @@ bool FossilClient::managesFile(const FilePath &workingDirectory, const QString &
 unsigned int FossilClient::binaryVersion() const
 {
     static unsigned int cachedBinaryVersion = 0;
-    static QString cachedBinaryPath;
+    static FilePath cachedBinaryPath;
 
-    const QString currentBinaryPath = settings().binaryPath.stringValue();
+    const FilePath currentBinaryPath = settings().binaryPath();
 
     if (currentBinaryPath.isEmpty())
         return 0;

src/plugins/fossil/wizard/fossiljsextension.cpp

@@ -58,7 +58,7 @@ QString FossilJsExtension::defaultSslIdentityFile() const
     if (!isConfigured())
         return QString();
 
-    return settings().sslIdentityFile.stringValue();
+    return settings().sslIdentityFile().toFSPathString();
 }
 
 QString FossilJsExtension::defaultLocalRepoPath() const
@@ -66,7 +66,7 @@ QString FossilJsExtension::defaultLocalRepoPath() const
     if (!isConfigured())
         return QString();
 
-    return settings().defaultRepoPath.stringValue();
+    return settings().defaultRepoPath().toFSPathString();
 }
 
 bool FossilJsExtension::defaultDisableAutosync() const

src/plugins/projectexplorer/buildaspects.cpp

@@ -60,7 +60,7 @@ BuildDirectoryAspect::BuildDirectoryAspect(AspectContainer *container, const Bui
     });
 
     setOpenTerminalHandler([this, bc] {
-        Core::FileUtils::openTerminal(value(), bc->environment());
+        Core::FileUtils::openTerminal(expandedValue(), bc->environment());
     });
 }
 

src/plugins/projectexplorer/buildconfiguration.cpp

@@ -228,7 +228,7 @@ BuildConfiguration::~BuildConfiguration()
 FilePath BuildConfiguration::buildDirectory() const
 {
     FilePath path = FilePath::fromUserInput(
-        environment().expandVariables(d->m_buildDirectoryAspect.stringValue().trimmed()));
+        environment().expandVariables(d->m_buildDirectoryAspect.value().trimmed()));
     // FIXME: If the macro expander is expected to be able to do some
     // structual changes, the fromUserInput() above might already have
     // mis-parsed. Should this here be encapsulated in the FilePathAspect?

src/plugins/vcsbase/vcsbaseclientsettings.cpp

@@ -38,7 +38,8 @@ VcsBaseSettings::~VcsBaseSettings() = default;
 
 FilePaths VcsBaseSettings::searchPathList() const
 {
-    return Utils::transform(path.stringValue().split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts),
+    // FIXME: Filepathify
+    return Utils::transform(path.value().split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts),
                             &FilePath::fromUserInput);
 }
 

src/plugins/vcsbase/vcsbasesubmiteditor.cpp

@@ -174,7 +174,7 @@ void VcsBaseSubmitEditor::setParameters(const VcsBaseSubmitEditorParameters &par
     const CommonVcsSettings &settings = commonSettings();
     // Add additional context menu settings
     if (!settings.submitMessageCheckScript().isEmpty()
-            || !settings.nickNameMailMap.value().isEmpty()) {
+            || !settings.nickNameMailMap().isEmpty()) {
         auto sep = new QAction(this);
         sep->setSeparator(true);
         d->m_widget->addDescriptionEditContextMenuAction(sep);
@@ -186,7 +186,7 @@ void VcsBaseSubmitEditor::setParameters(const VcsBaseSubmitEditorParameters &par
             d->m_widget->addDescriptionEditContextMenuAction(checkAction);
         }
         // Insert nick
-        if (!settings.nickNameMailMap.value().isEmpty()) {
+        if (!settings.nickNameMailMap().isEmpty()) {
             auto insertAction = new QAction(Tr::tr("Insert Name..."), this);
             connect(insertAction, &QAction::triggered, this, &VcsBaseSubmitEditor::slotInsertNickName);
             d->m_widget->addDescriptionEditContextMenuAction(insertAction);