1 files changed, 14 insertions, 18 deletions
diff --git a/src/plugins/vcsbase/commonvcssettings.h b/src/plugins/vcsbase/commonvcssettings.h
index 8d781a45d72..a5005f252a5 100644
--- a/src/plugins/vcsbase/commonvcssettings.h
+++ b/src/plugins/vcsbase/commonvcssettings.h
@@ -7,43 +7,39 @@
 
 #include <utils/aspects.h>
 
-namespace VcsBase {
-namespace Internal {
+namespace VcsBase::Internal {
 
 class CommonVcsSettings : public Utils::AspectContainer
 {
+    Q_OBJECT
+
 public:
     CommonVcsSettings();
 
-    friend QDebug operator<<(QDebug, const CommonVcsSettings &);
-
-    Utils::StringAspect nickNameMailMap;
-    Utils::StringAspect nickNameFieldListFile;
+    Utils::FilePathAspect nickNameMailMap{this};
+    Utils::FilePathAspect nickNameFieldListFile{this};
 
-    Utils::StringAspect submitMessageCheckScript;
+    Utils::FilePathAspect submitMessageCheckScript{this};
 
     // Executable run to graphically prompt for a SSH-password.
-    Utils::StringAspect sshPasswordPrompt;
+    Utils::FilePathAspect sshPasswordPrompt{this};
 
-    Utils::BoolAspect lineWrap;
-    Utils::IntegerAspect lineWrapWidth;
+    Utils::BoolAspect lineWrap{this};
+    Utils::IntegerAspect lineWrapWidth{this};
+
+signals:
+    void settingsChanged();
 };
 
 class CommonOptionsPage final : public Core::IOptionsPage
 {
-    Q_OBJECT
-
 public:
-    explicit CommonOptionsPage();
+    CommonOptionsPage();
 
     CommonVcsSettings &settings() { return m_settings; }
 
-signals:
-    void settingsChanged();
-
 private:
     CommonVcsSettings m_settings;
 };
 
-} // namespace Internal
-} // namespace VcsBase
+} // VcsBase::Internal