kde-baseapps frameworks dolphin with snapshot frameworks branch baloo/baloo-widgets...

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 767cf7fe33639aa3e36812a4a9c88f890a30f6a4..ce629fb9fc23ad2bb3714d51549ee0ae1a54251b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(Baloo 4.97)
+find_package(KF5Baloo 4.97)
 set_package_properties(Baloo PROPERTIES DESCRIPTION "Baloo Core libraries"
                        URL "http://www.kde.org"
                        TYPE OPTIONAL
@@ -18,7 +18,7 @@ set_package_properties(KFileMetaData PROPERTIES
                        PURPOSE "For accessing file metadata labels"
                       )
 
-if (Baloo_FOUND AND BalooWidgets_FOUND AND KFileMetaData_FOUND)
+if (KF5Baloo_FOUND AND BalooWidgets_FOUND AND KFileMetaData_FOUND)
     set(HAVE_BALOO TRUE)
 endif()
 

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index acb3e0f99d74b099af67d30555acd39adfe5ae6e..b62ff785927378f7f44a2727ef2a90161261f1d2 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -44,9 +44,9 @@
 
 #ifdef HAVE_BALOO
     #include "private/kbaloorolesprovider.h"
-    #include <baloo/file.h>
-    #include <baloo/filefetchjob.h>
-    #include <baloo/filemonitor.h>
+    #include <KF5/Baloo/file.h>
+    #include <KF5/Baloo/filefetchjob.h>
+    #include <KF5/Baloo/filemonitor.h>
 #endif
 
 // #define KFILEITEMMODELROLESUPDATER_DEBUG

diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index c0ae0c5441a15021549c5fb13734dcac5317df63..ea67dfbad24da455f07f5880283e72b356bac645 100644 (file)
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -24,7 +24,7 @@
 #include <KGlobal>
 #include <KLocale>
 
-#include <baloo/file.h>
+#include <KF5/Baloo/file.h>
 #include <kfilemetadata/propertyinfo.h>
 
 #include <QTime>

diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 6ba91c5ba37cbafe61cd6a26b21463eb14bb9c6e..d4dce607adafdcf7460490aa099ae379e5430aa2 100644 (file)
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -53,8 +53,8 @@
 #include <views/viewproperties.h>
 
 #ifdef HAVE_BALOO
-    #include <baloo/query.h>
-    #include <baloo/indexerconfig.h>
+    #include <KF5/Baloo/query.h>
+    #include <KF5/Baloo/indexerconfig.h>
 #endif
 
 namespace {

diff --git a/src/search/dolphinfacetswidget.h b/src/search/dolphinfacetswidget.h
index 757dcd4825df4f176045edac3daef2640b23546c..16d4979182d4232e29855487d2b971ddcab61dbf 100644 (file)
--- a/src/search/dolphinfacetswidget.h
+++ b/src/search/dolphinfacetswidget.h
@@ -24,7 +24,7 @@
 
 #include <config-baloo.h>
 #ifdef HAVE_BALOO
-    #include <baloo/term.h>
+    #include <KF5/Baloo/term.h>
 #endif
 
 class QButtonGroup;

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index df96f74342e9fe0e9d0514717fcbdc7b1a0e6fc1..1f946f513c35d798b7e5d676a12cd9d49f9c20a5 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -42,9 +42,9 @@
 
 #include <config-baloo.h>
 #ifdef HAVE_BALOO
-    #include <baloo/query.h>
-    #include <baloo/term.h>
-    #include <baloo/indexerconfig.h>
+    #include <KF5/Baloo/query.h>
+    #include <KF5/Baloo/term.h>
+    #include <KF5/Baloo/indexerconfig.h>
 #endif
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :

diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index db9258ae8a9bf0baefa429708ea870a98d2f2798..2569acc498d6f62395b3877752b914c5c63276c6 100644 (file)
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -28,7 +28,7 @@
 #include <QVBoxLayout>
 
 #ifdef HAVE_BALOO
-    #include <baloo/indexerconfig.h>
+    #include <KF5/Baloo/indexerconfig.h>
 #endif
 
 AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 0e43dcda1386388f32868fc95a75afcdb28f9706..df9a52db116d44cfcb4c5f2de9bb060515a51d57 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -79,7 +79,7 @@
 #include "zoomlevelinfo.h"
 
 #ifdef HAVE_BALOO
-    #include <baloo/indexerconfig.h>
+    #include <KF5/Baloo/indexerconfig.h>
 #endif
 
 namespace {

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 3955f250d09df36a3541ddc5c167b8b84ad2764a..ecf5d2334134fa0f81cce1a58caeadac7e902f92 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -44,7 +44,7 @@
 #include <KDebug>
 
 #ifdef HAVE_BALOO
-    #include <baloo/indexerconfig.h>
+    #include <KF5/Baloo/indexerconfig.h>
 #endif
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) :