Fully switch to QStringList

Holt59 · Jun 12, 2024 · 55b5aa5 · 55b5aa5
1 parent a62c39d
commit 55b5aa5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/settings.cpp b/src/settings.cpp
@@ -318,30 +318,30 @@ void Settings::setExecutablesBlacklist(const QString& s)
 
 QStringList Settings::skipFileSuffixes() const
 {
-  static const QString def = (QStringList() << ".mohidden").join(";");
+  static const QStringList def = QStringList() << ".mohidden";
 
-  auto setting = get<QString>(m_Settings, "Settings", "skip_file_suffixes", def);
+  auto setting = get<QStringList>(m_Settings, "Settings", "skip_file_suffixes", def);
 
-  return setting.split(";");
+  return setting;
 }
 
 void Settings::setSkipFileSuffixes(const QStringList& s)
 {
-  set(m_Settings, "Settings", "skip_file_suffixes", s.join(";"));
+  set(m_Settings, "Settings", "skip_file_suffixes", s);
 }
 
 QStringList Settings::skipDirectories() const
 {
-  static const QString def = (QStringList() << ".git").join(";");
+  static const QStringList def = QStringList() << ".git";
 
-  auto setting = get<QString>(m_Settings, "Settings", "skip_directories", def);
+  auto setting = get<QStringList>(m_Settings, "Settings", "skip_directories", def);
 
-  return setting.split(";");
+  return setting;
 }
 
 void Settings::setSkipDirectories(const QStringList& s)
 {
-  set(m_Settings, "Settings", "skip_directories", s.join(";"));
+  set(m_Settings, "Settings", "skip_directories", s);
 }
 
 void Settings::setMotdHash(uint hash)

diff --git a/src/settingsutilities.h b/src/settingsutilities.h
@@ -32,6 +32,15 @@ struct ValueConverter<QVariantList>
   }
 };
 
+template <>
+struct ValueConverter<QStringList>
+{
+  static QString convert(const QStringList& t)
+  {
+    return t.join(", ");
+  }
+};
+
 bool shouldLogSetting(const QString& displayName);
 
 template <class T>