Fix for crash which was introduced by commit

[dolphin.git] / src / settings / additionalinfodialog.cpp

diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 3cac35b7b1f16f65a5f856ee3bbb49a728ce7fd4..4d1b69c83d5df923aa1d9cd0ef8e9d7c2d65553d 100644 (file)
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -19,16 +19,17 @@
 
 #include "additionalinfodialog.h"
 
 
 #include "additionalinfodialog.h"
 

-#include <config-nepomuk.h>
+#include <config-baloo.h>

 
 

-#include <KLocale>
+#include <KSharedConfig>
+#include <KLocalizedString>

 #include "kitemviews/kfileitemmodel.h"
 #include <QCheckBox>
 #include <QLabel>
 #include <QVBoxLayout>
 
 #include "kitemviews/kfileitemmodel.h"
 #include <QCheckBox>
 #include <QLabel>
 #include <QVBoxLayout>
 

-#ifdef HAVE_NEPOMUK
-    #include <Nepomuk/ResourceManager>
+#ifdef HAVE_BALOO
+    #include <Baloo/IndexerConfig>

 #endif
 
 AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
 #endif
 
 AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,


@@ -50,14 +51,10 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
     header->setWordWrap(true);
 
     // Add checkboxes
     header->setWordWrap(true);
 
     // Add checkboxes

-    bool nepomukRunning = false;

     bool indexingEnabled = false;
     bool indexingEnabled = false;

-#ifdef HAVE_NEPOMUK
-    nepomukRunning = (Nepomuk::ResourceManager::instance()->init() == 0);
-    if (nepomukRunning) {
-        KConfig config("nepomukserverrc");
-        indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
-    }
+#ifdef HAVE_BALOO
+    Baloo::IndexerConfig config;
+    indexingEnabled = config.fileIndexingEnabled();

 #endif
 
     m_listWidget = new QListWidget(mainWidget);
 #endif
 
     m_listWidget = new QListWidget(mainWidget);


@@ -67,8 +64,8 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
         QListWidgetItem* item = new QListWidgetItem(info.translation, m_listWidget);
         item->setCheckState(visibleRoles.contains(info.role) ? Qt::Checked : Qt::Unchecked);
 
         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) {
                             (info.requiresIndexer && indexingEnabled);
 
         if (!enable) {


@@ -79,14 +76,13 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
     QVBoxLayout* layout = new QVBoxLayout(mainWidget);
     layout->addWidget(header);
     layout->addWidget(m_listWidget);
     QVBoxLayout* layout = new QVBoxLayout(mainWidget);
     layout->addWidget(header);
     layout->addWidget(m_listWidget);

-    layout->addStretch(1);

 
     setMainWidget(mainWidget);
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "AdditionalInfoDialog");
     restoreDialogSize(dialogConfig);
 
 
     setMainWidget(mainWidget);
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "AdditionalInfoDialog");
     restoreDialogSize(dialogConfig);
 

-    connect(this, SIGNAL(okClicked()), this, SLOT(slotOk()));
+    connect(this, &AdditionalInfoDialog::okClicked, this, &AdditionalInfoDialog::slotOk);

 }
 
 AdditionalInfoDialog::~AdditionalInfoDialog()
 }
 
 AdditionalInfoDialog::~AdditionalInfoDialog()


@@ -115,4 +111,3 @@ void AdditionalInfoDialog::slotOk()
     }
 }
 
     }
 }
 

-#include "additionalinfodialog.moc"