diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp index 2d4b5420328..de1f06f9133 100644 --- a/src/plugins/fakevim/fakevimactions.cpp +++ b/src/plugins/fakevim/fakevimactions.cpp @@ -134,7 +134,6 @@ FakeVimSettings::FakeVimSettings() vimRcPath.setToolTip(Tr::tr("Keep empty to use the default path, i.e. " "%USERPROFILE%\\_vimrc on Windows, ~/.vimrc otherwise.")); vimRcPath.setPlaceHolderText(Tr::tr("Default: %1").arg(vimrcDefault)); - vimRcPath.setDisplayStyle(FvStringAspect::PathChooserDisplay); setLayouter([this] { using namespace Layouting; diff --git a/src/plugins/fakevim/fakevimactions.h b/src/plugins/fakevim/fakevimactions.h index a3907dc117f..eea53f50c1a 100644 --- a/src/plugins/fakevim/fakevimactions.h +++ b/src/plugins/fakevim/fakevimactions.h @@ -4,7 +4,13 @@ #pragma once #ifndef FAKEVIM_STANDALONE -# include + +#include + +#else + +namespace Utils { class FilePath {}; } + #endif #include @@ -69,6 +75,7 @@ public: using FvBoolAspect = FvTypedAspect; using FvIntegerAspect = FvTypedAspect; using FvStringAspect = FvTypedAspect; +using FvFilePathAspect = FvTypedAspect; class FvAspectContainer : public FvBaseAspect { @@ -82,6 +89,7 @@ using FvBaseAspect = Utils::BaseAspect; using FvBoolAspect = Utils::BoolAspect; using FvIntegerAspect = Utils::IntegerAspect; using FvStringAspect = Utils::StringAspect; +using FvFilePathAspect = Utils::FilePathAspect; #endif @@ -96,7 +104,7 @@ public: FvBoolAspect useFakeVim; FvBoolAspect readVimRc; - FvStringAspect vimRcPath; + FvFilePathAspect vimRcPath; FvBoolAspect startOfLine; FvIntegerAspect tabStop; diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index fb3049a7b06..fac40d951a6 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -1183,7 +1183,7 @@ void FakeVimPluginPrivate::maybeReadVimRc() //qDebug() << theFakeVimSetting(ConfigShiftWidth)->value(); if (!settings().readVimRc()) return; - QString fileName = settings().vimRcPath(); + QString fileName = settings().vimRcPath().path(); if (fileName.isEmpty()) { fileName = QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + QLatin1String(HostOsInfo::isWindowsHost() ? "/_vimrc" : "/.vimrc");