6 files changed, 13 insertions, 16 deletions
diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 0efa8a5fe..e9d5f606d 100644
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -19,7 +19,7 @@
 
 #include "additionalinfodialog.h"
 
-#include <config-nepomuk.h>
+#include <config-baloo.h>
 
 #include <KLocale>
 #include "kitemviews/kfileitemmodel.h"
@@ -27,8 +27,8 @@
 #include <QLabel>
 #include <QVBoxLayout>
 
-#ifdef HAVE_NEPOMUK
-    #include <Nepomuk2/ResourceManager>
+#ifdef HAVE_BALOO
+    #include <baloo/indexerconfig.h>
 #endif
 
 AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
@@ -50,14 +50,10 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
     header->setWordWrap(true);
 
     // Add checkboxes
-    bool nepomukRunning = false;
     bool indexingEnabled = false;
-#ifdef HAVE_NEPOMUK
-    nepomukRunning = (Nepomuk2::ResourceManager::instance()->initialized());
-    if (nepomukRunning) {
-        KConfig config("nepomukserverrc");
-        indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", true);
-    }
+#ifdef HAVE_BALOO
+    Baloo::IndexerConfig config;
+    indexingEnabled = config.fileIndexingEnabled();
 #endif
 
     m_listWidget = new QListWidget(mainWidget);
@@ -67,8 +63,8 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
         QListWidgetItem* item = new QListWidgetItem(info.translation, m_listWidget);
         item->setCheckState(visibleRoles.contains(info.role) ? Qt::Checked : Qt::Unchecked);
 
-        const bool enable = (!info.requiresNepomuk && !info.requiresIndexer) ||
-                            (info.requiresNepomuk && nepomukRunning) ||
+        const bool enable = (!info.requiresBaloo && !info.requiresIndexer) ||
+                            (info.requiresBaloo) ||
                             (info.requiresIndexer && indexingEnabled);
 
         if (!enable) {
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index 5a79ad619..b0620ac74 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -314,6 +314,7 @@ X-KDE-Keywords[gl]=xestor de ficheiros
 X-KDE-Keywords[he]=מנהל קבצים
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
+X-KDE-Keywords[is]=skráastjóri
 X-KDE-Keywords[it]=gestore dei file
 X-KDE-Keywords[kk]=file manager
 X-KDE-Keywords[km]=កម្មវិធីគ្រប់គ្រងឯកសារ
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 4cf793a35..8636058cd 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -314,6 +314,7 @@ X-KDE-Keywords[gl]=xestor de ficheiros
 X-KDE-Keywords[he]=מנהל קבצים
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
+X-KDE-Keywords[is]=skráastjóri
 X-KDE-Keywords[it]=gestore dei file
 X-KDE-Keywords[kk]=file manager
 X-KDE-Keywords[km]=កម្មវិធីគ្រប់គ្រងឯកសារ
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index aa93e6d28..34867305a 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -263,6 +263,7 @@ X-KDE-Keywords[gl]=xestor de ficheiros
 X-KDE-Keywords[he]=מנהל קבצים
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
+X-KDE-Keywords[is]=skráastjóri
 X-KDE-Keywords[it]=gestore dei file
 X-KDE-Keywords[kk]=file manager
 X-KDE-Keywords[km]=កម្មវិធីគ្រប់គ្រងឯកសារ
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index ce8401228..a4b4e058b 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -312,6 +312,7 @@ X-KDE-Keywords[gl]=xestor de ficheiros
 X-KDE-Keywords[he]=מנהל קבצים
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
+X-KDE-Keywords[is]=skráastjóri
 X-KDE-Keywords[it]=gestore dei file
 X-KDE-Keywords[kk]=file manager
 X-KDE-Keywords[km]=កម្មវិធីគ្រប់គ្រងឯកសារ
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index c5002ff9f..574f8e18e 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -27,10 +27,7 @@
 #include "dolphin_iconsmodesettings.h"
 #include "viewpropsprogressinfo.h"
 
-#include <config-nepomuk.h>
-#ifdef HAVE_NEPOMUK
-#include <Nepomuk2/ResourceManager>
-#endif
+#include <config-baloo.h>
 
 #include <KComponentData>
 #include <KLocale>