Merge pull request #274 from epasveer/273-some-source-configurations-…

…are-not-saved-or-restored Fixed bug #273.
epasveer · Nov 28, 2024 · 97cc2e9 · 97cc2e9
2 parents 8db74c2 + 5d10d34
commit 97cc2e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@
 * Fixed bug when the Basic Struct visualizer display simple variable
   types (non-structs).
 * Source all files in ~/.config/seergdb/scripts/ on startup.
+* Fixed regression handling ignoring of system header files.
 
 ## [2.4] - 2024-03-18
 * Changed main icon to a more license friendly one.

diff --git a/src/SeerGdbWidget.cpp b/src/SeerGdbWidget.cpp
@@ -2919,12 +2919,12 @@ void SeerGdbWidget::writeSettings () {
         }
     } settings.endArray();
 
-    settings.beginWriteArray("sourceignoredirectories"); {
-        QStringList directories = sourceIgnoreDirectories();
+    settings.beginWriteArray("sourceignorefilepatters"); {
+        QStringList patterns = sourceIgnoreFilePatterns();
 
-        for (int i = 0; i < directories.size(); ++i) {
+        for (int i = 0; i < patterns.size(); ++i) {
             settings.setArrayIndex(i);
-            settings.setValue("directory", directories[i]);
+            settings.setValue("pattern", patterns[i]);
         }
     } settings.endArray();
 
@@ -3018,16 +3018,16 @@ void SeerGdbWidget::readSettings () {
         setSourceAlternateDirectories(directories);
     } settings.endArray();
 
-    size = settings.beginReadArray("sourceignoredirectories"); {
-        QStringList directories;
+    size = settings.beginReadArray("sourceignorefilepatters"); {
+        QStringList patterns;
 
         for (int i = 0; i < size; ++i) {
             settings.setArrayIndex(i);
 
-            directories << settings.value("directory").toString();
+            patterns << settings.value("pattern").toString();
         }
 
-        setSourceIgnoreDirectories(directories);
+        setSourceIgnoreFilePatterns(patterns);
     } settings.endArray();
 
     if (settings.childGroups().contains("sourcemiscfilepatterns")) {
@@ -3405,18 +3405,6 @@ void SeerGdbWidget::setSourceAlternateDirectories (const QStringList& alternateD
     editorManager()->setEditorAlternateDirectories(alternateDirectories);
 }
 
-const QStringList& SeerGdbWidget::sourceIgnoreDirectories() const {
-
-    return editorManager()->editorIgnoreDirectories();
-}
-
-void SeerGdbWidget::setSourceIgnoreDirectories (const QStringList& ignoreDirectories) {
-
-    editorManager()->setEditorIgnoreDirectories(ignoreDirectories);
-
-    sourceLibraryManagerWidget->sourceBrowserWidget()->setIgnoreFilePatterns(ignoreDirectories);
-}
-
 void SeerGdbWidget::setSourceMiscFilePatterns (const QStringList& filePatterns) {
 
     sourceLibraryManagerWidget->sourceBrowserWidget()->setMiscFilePatterns(filePatterns);

diff --git a/src/SeerGdbWidget.h b/src/SeerGdbWidget.h
@@ -132,9 +132,6 @@ class SeerGdbWidget : public QWidget, protected Ui::SeerGdbWidgetForm {
         void                                setSourceAlternateDirectories       (const QStringList& alternateDirectories);
         const QStringList&                  sourceAlternateDirectories          () const;
 
-        void                                setSourceIgnoreDirectories          (const QStringList& ignoreDirectories);
-        const QStringList&                  sourceIgnoreDirectories             () const;
-
         void                                setSourceMiscFilePatterns           (const QStringList& filePatterns);
         const QStringList&                  sourceMiscFilePatterns              () const;