[multimedia/elisa] /: Clean up config handling

Git commit 6e3e9cba557259b7ca19c16d6980a026ae1f34e2 by Nate Graham, on behalf of Nicolas Fella.
Committed on 24/07/2026 at 15:05.
Pushed by ngraham into branch 'master'.

Clean up config handling

Define the config file name in the kcfg file instead of manually passing it in

M  +0    -1    autotests/localfilelistingtest.cpp
M  +0    -1    autotests/manageaudioplayertest.cpp
M  +0    -1    autotests/mediaplaylistproxymodeltest.cpp
M  +0    -1    autotests/viewmanagertest.cpp
M  +1    -1    src/elisa_core.kcfg
M  +1    -4    src/elisaapplication.cpp
M  +0    -6    src/elisaimport.cpp

https://invent.kde.org/multimedia/elisa/-/commit/6e3e9cba557259b7ca19c16d6980a026ae1f34e2

diff --git a/autotests/localfilelistingtest.cpp b/autotests/localfilelistingtest.cpp
index b47b48570..81e129a1b 100644
--- a/autotests/localfilelistingtest.cpp
+++ b/autotests/localfilelistingtest.cpp
@@ -42,7 +42,6 @@ private Q_SLOTS:
         qRegisterMetaType<QList<qlonglong>>("QList<qlonglong>");
         qRegisterMetaType<QHash<qlonglong,int>>("QHash<qlonglong,int>");
         qRegisterMetaType<QList<QUrl>>("QList<QUrl>");
-        Elisa::ElisaConfiguration::instance(QStringLiteral("scanAtStartupFeature"));
     }
 
     void initialTestWithNoTrack()
diff --git a/autotests/manageaudioplayertest.cpp b/autotests/manageaudioplayertest.cpp
index ef0478e5f..a8dae71bf 100644
--- a/autotests/manageaudioplayertest.cpp
+++ b/autotests/manageaudioplayertest.cpp
@@ -23,7 +23,6 @@ ManageAudioPlayerTest::ManageAudioPlayerTest(QObject *parent) : QObject(parent)
 void ManageAudioPlayerTest::initTestCase()
 {
     QStandardPaths::setTestModeEnabled(true);
-    Elisa::ElisaConfiguration::instance(QStringLiteral("testfoo"));
 }
 
 void ManageAudioPlayerTest::simpleInitialCase()
diff --git a/autotests/mediaplaylistproxymodeltest.cpp b/autotests/mediaplaylistproxymodeltest.cpp
index 5468cbaa3..849d2667c 100644
--- a/autotests/mediaplaylistproxymodeltest.cpp
+++ b/autotests/mediaplaylistproxymodeltest.cpp
@@ -64,7 +64,6 @@ void MediaPlayListProxyModelTest::initTestCase()
     qRegisterMetaType<QList<qlonglong>>("QList<qlonglong>");
     qRegisterMetaType<QHash<qlonglong,int>>("QHash<qlonglong,int>");
     qRegisterMetaType<ElisaUtils::PlayListEntryType>("PlayListEntryType");
-    Elisa::ElisaConfiguration::instance(QStringLiteral("testfoo"));
 }
 
 void MediaPlayListProxyModelTest::init()
diff --git a/autotests/viewmanagertest.cpp b/autotests/viewmanagertest.cpp
index 0a455715e..7698648e2 100644
--- a/autotests/viewmanagertest.cpp
+++ b/autotests/viewmanagertest.cpp
@@ -39,7 +39,6 @@ private Q_SLOTS:
         qRegisterMetaType<QAbstractProxyModel*>("QAbstractProxyModel*");
         qRegisterMetaType<DataTypes::DataType>("DataTypes::DataType");
         QStandardPaths::setTestModeEnabled(true);
-        Elisa::ElisaConfiguration::instance(QStringLiteral("testfoo"));
     }
 
     void openAlbumViewTest()
diff --git a/src/elisa_core.kcfg b/src/elisa_core.kcfg
index 48009e040..78a35f31f 100644
--- a/src/elisa_core.kcfg
+++ b/src/elisa_core.kcfg
@@ -5,7 +5,7 @@
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
  <include>QDir</include>
  <include>QStandardPaths</include>
- <kcfgfile arg="true" />
+ <kcfgfile name="elisarc" />
  <group name="ElisaFileIndexer">
   <entry key="RootPath" type="PathList" >
   </entry>
diff --git a/src/elisaapplication.cpp b/src/elisaapplication.cpp
index 8bb05143d..8584e9989 100644
--- a/src/elisaapplication.cpp
+++ b/src/elisaapplication.cpp
@@ -94,12 +94,9 @@ ElisaApplication::ElisaApplication(QObject *parent) : QObject(parent), d(std::ma
 {
     auto configurationFileName = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
     configurationFileName += QStringLiteral("/elisarc");
-    Elisa::ElisaConfiguration::instance(configurationFileName);
-    Elisa::ElisaConfiguration::self()->load();
-    Elisa::ElisaConfiguration::self()->save();
     d->mSchemes = KColorSchemeManager::instance();
 
-    d->mConfigFileWatcher.addPath(Elisa::ElisaConfiguration::self()->config()->name());
+    d->mConfigFileWatcher.addPath(configurationFileName);
 
     connect(Elisa::ElisaConfiguration::self(), &Elisa::ElisaConfiguration::configChanged,
             this, &ElisaApplication::configChanged);
diff --git a/src/elisaimport.cpp b/src/elisaimport.cpp
index 07316c36a..a39f257c8 100644
--- a/src/elisaimport.cpp
+++ b/src/elisaimport.cpp
@@ -31,12 +31,6 @@ int main(int argc, char *argv[])
     parser.addVersionOption();
     parser.process(app);
 
-    auto configurationFileName = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
-    configurationFileName += QStringLiteral("/elisarc");
-    Elisa::ElisaConfiguration::instance(configurationFileName);
-    Elisa::ElisaConfiguration::self()->load();
-    Elisa::ElisaConfiguration::self()->save();
-
     MusicListenersManager myMusicManager;
     ElisaImportApplication myApplication;