From: Peter Penz <peter.penz19@gmail.com>
Date: Thu, 12 Nov 2009 19:45:55 +0000 (+0000)
Subject: Don't show the search options, if no Nepomuk is available. Hopefully Nepomuk will... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f0cab33518342562b693162f8997c56988d73ff9

Don't show the search options, if no Nepomuk is available. Hopefully Nepomuk will get a hard build dependency quite soon, those #ifdef-code is really ugly and difficult to maintain...

svn path=/trunk/KDE/kdebase/apps/; revision=1048135
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 658192b7d..c2c2064a0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -134,10 +134,6 @@ set(dolphin_SRCS
     panels/folders/folderspanel.cpp
     panels/folders/paneltreeview.cpp
     search/dolphinsearchbox.cpp
-    search/dolphinsearchoptionsconfigurator.cpp
-    search/searchcriteriondescription.cpp
-    search/searchcriterionselector.cpp
-    search/searchcriterionvalue.cpp
     settings/behaviorsettingspage.cpp
     settings/columnviewsettingspage.cpp
     settings/contextmenusettingspage.cpp
@@ -174,6 +170,10 @@ if(Nepomuk_FOUND)
         panels/information/kloadmetadatathread.cpp
         panels/information/nepomukmassupdatejob.cpp
         panels/information/ktaggingwidget.cpp
+        search/dolphinsearchoptionsconfigurator.cpp
+        search/searchcriteriondescription.cpp
+        search/searchcriterionselector.cpp
+        search/searchcriterionvalue.cpp
     )
 endif(Nepomuk_FOUND)
 
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 474c65cd7..a83a95fc1 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -24,11 +24,13 @@
 #include "dolphinremoteencoding.h"
 
 #include <config-nepomuk.h>
+#ifdef HAVE_NEPOMUK
+    #include "search/dolphinsearchoptionsconfigurator.h"
+#endif
 
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"
 #include "search/dolphinsearchbox.h"
-#include "search/dolphinsearchoptionsconfigurator.h"
 #include "settings/dolphinsettings.h"
 #include "settings/dolphinsettingsdialog.h"
 #include "dolphinviewcontainer.h"
@@ -1014,7 +1016,9 @@ void DolphinMainWindow::slotTabMoved(int from, int to)
 
 void DolphinMainWindow::showSearchOptions()
 {
+#ifdef HAVE_NEPOMUK
     m_searchOptionsConfigurator->show();
+#endif
 }
 
 void DolphinMainWindow::init()
@@ -1057,8 +1061,10 @@ void DolphinMainWindow::init()
     connect(this, SIGNAL(urlChanged(const KUrl&)),
             m_remoteEncoding, SLOT(slotAboutToOpenUrl()));
 
+#ifdef HAVE_NEPOMUK
     m_searchOptionsConfigurator = new DolphinSearchOptionsConfigurator(this);
     m_searchOptionsConfigurator->hide();
+#endif
 
     m_tabBar = new KTabBar(this);
     m_tabBar->setMovable(true);
@@ -1086,7 +1092,9 @@ void DolphinMainWindow::init()
     m_centralWidgetLayout = new QVBoxLayout(centralWidget);
     m_centralWidgetLayout->setSpacing(0);
     m_centralWidgetLayout->setMargin(0);
+#ifdef HAVE_NEPOMUK
     m_centralWidgetLayout->addWidget(m_searchOptionsConfigurator);
+#endif
     m_centralWidgetLayout->addWidget(m_tabBar);
     m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1);
 
diff --git a/src/panels/information/kmetadatawidget.cpp b/src/panels/information/kmetadatawidget.cpp
index 9e995ba0f..c74bf60ae 100644
--- a/src/panels/information/kmetadatawidget.cpp
+++ b/src/panels/information/kmetadatawidget.cpp
@@ -95,6 +95,7 @@ public:
 
     void slotMetaDataUpdateDone();
 
+#ifdef HAVE_NEPOMUK
     /**
      * Disables the metadata widget and starts the job that
      * changes the meta data asynchronously. After the job
@@ -106,6 +107,7 @@ public:
      * Merges items like 'width' and 'height' as one item.
      */
     QList<KLoadMetaDataThread::Item> mergedItems(const QList<KLoadMetaDataThread::Item>& items);
+#endif
 
     bool m_sizeVisible;
     bool m_readOnly;
@@ -432,7 +434,6 @@ void KMetaDataWidget::Private::startChangeDataJob(KJob* job)
     q->setEnabled(false); // no updates during execution
     job->start();
 }
-#endif
 
 QList<KLoadMetaDataThread::Item>
     KMetaDataWidget::Private::mergedItems(const QList<KLoadMetaDataThread::Item>& items)
@@ -482,6 +483,7 @@ QList<KLoadMetaDataThread::Item>
 
     return mergedItems;
 }
+#endif
 
 KMetaDataWidget::KMetaDataWidget(QWidget* parent) :
     QWidget(parent),