Fix compile problems on systems that don't want nepomuk. eeek !

svn path=/trunk/KDE/kdebase/apps/; revision=679265

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 7fec6908d220112dd1b2c186807d2119c583462e..bfde4da66c922872c3c3f4c888261e9afc3da08f 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -733,12 +733,16 @@ void DolphinMainWindow::sortByType()
 
 void DolphinMainWindow::sortByRating()
 {
 
 void DolphinMainWindow::sortByRating()
 {

+#ifdef HAVE_NEPOMUK

     m_activeViewContainer->view()->setSorting(DolphinView::SortByRating);
     m_activeViewContainer->view()->setSorting(DolphinView::SortByRating);

+#endif

 }
 
 void DolphinMainWindow::sortByTags()
 {
 }
 
 void DolphinMainWindow::sortByTags()
 {

+#ifdef HAVE_NEPOMUK

     m_activeViewContainer->view()->setSorting(DolphinView::SortByTags);
     m_activeViewContainer->view()->setSorting(DolphinView::SortByTags);

+#endif

 }
 
 void DolphinMainWindow::toggleSortOrder()
 }
 
 void DolphinMainWindow::toggleSortOrder()

diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp
index 2e321d7ecc89770cbf6d2b641025bbe64fe95719..592b0aa1ca9b464f72a8aa8e3bc942adb8bde6af 100644 (file)
--- a/src/dolphinsortfilterproxymodel.cpp
+++ b/src/dolphinsortfilterproxymodel.cpp
@@ -203,16 +203,20 @@ bool DolphinSortFilterProxyModel::lessThan(const QModelIndex& left,
 
     // If we are sorting by rating, folders and files are citizens of the same
     // class. Same if we are sorting by tags.
 
     // If we are sorting by rating, folders and files are citizens of the same
     // class. Same if we are sorting by tags.

+#ifdef HAVE_NEPOMUK

     if ((sortRole() != DolphinView::SortByRating) &&
         (sortRole() != DolphinView::SortByTags))
     {
     if ((sortRole() != DolphinView::SortByRating) &&
         (sortRole() != DolphinView::SortByTags))
     {

+#endif

         // On our priority, folders go above regular files.
         if (leftFileItem->isDir() && !rightFileItem->isDir()) {
             return true;
         } else if (!leftFileItem->isDir() && rightFileItem->isDir()) {
             return false;
         }
         // On our priority, folders go above regular files.
         if (leftFileItem->isDir() && !rightFileItem->isDir()) {
             return true;
         } else if (!leftFileItem->isDir() && rightFileItem->isDir()) {
             return false;
         }

+#ifdef HAVE_NEPOMUK

     }
     }

+#endif

 
     // Hidden elements go before visible ones, if they both are
     // folders or files.
 
     // Hidden elements go before visible ones, if they both are
     // folders or files.