From 8112a004329e1992df607e5d5e6a417ea4602a78 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 20 Jan 2021 17:39:04 +0100
Subject: Cpp: Use new settings API

Avoid writing defaults to the settings.

Task-number: QTCREATORBUG-24430
Change-Id: I8e1d5a5b8ca21ef96a68a4d71a7d97d138bd186b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/cpptools/cppfilesettingspage.h | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/plugins/cpptools/cppfilesettingspage.h')

diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h
index 4fb2db74b9..e3533b396f 100644
--- a/src/plugins/cpptools/cppfilesettingspage.h
+++ b/src/plugins/cpptools/cppfilesettingspage.h
@@ -25,8 +25,12 @@
 
 #pragma once
 
+#include "cpptoolsconstants.h"
+
 #include <coreplugin/dialogs/ioptionspage.h>
 
+#include <QDir>
+
 QT_BEGIN_NAMESPACE
 class QSettings;
 QT_END_NAMESPACE
@@ -37,14 +41,19 @@ namespace Internal {
 struct CppFileSettings
 {
     QStringList headerPrefixes;
-    QString headerSuffix;
-    QStringList headerSearchPaths;
+    QString headerSuffix = "h";
+    QStringList headerSearchPaths = {"include",
+                                     "Include",
+                                     QDir::toNativeSeparators("../include"),
+                                     QDir::toNativeSeparators("../Include")};
     QStringList sourcePrefixes;
-    QString sourceSuffix;
-    QStringList sourceSearchPaths;
+    QString sourceSuffix = "cpp";
+    QStringList sourceSearchPaths = {QDir::toNativeSeparators("../src"),
+                                     QDir::toNativeSeparators("../Src"),
+                                     ".."};
     QString licenseTemplatePath;
     bool headerPragmaOnce = false;
-    bool lowerCaseFiles = false;
+    bool lowerCaseFiles = Constants::LOWERCASE_CPPFILES_DEFAULT;
 
     void toSettings(QSettings *) const;
     void fromSettings(QSettings *);
-- 
cgit v1.2.1