Fix build.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b087aa4fcee75b6ed78af388347659e2a0894cf..8050e4cf307f8bc5a2a49517f39590505f20ac8d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -136,9 +136,9 @@ if(HAVE_BALOO)
     target_link_libraries(
         dolphinprivate PUBLIC
         KF5::FileMetaData
     target_link_libraries(
         dolphinprivate PUBLIC
         KF5::FileMetaData

-        ${BALOO_CORE_LIBRARY}
-        ${BALOO_FILE_LIBRARY}
-        ${BALOO_WIDGETS_LIBRARY}
+        KF5::BalooCore
+        KF5::BalooFiles
+        KF5::BalooWidgets

     )
 endif()
 
     )
 endif()
 

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index b62ff785927378f7f44a2727ef2a90161261f1d2..fb39fd225d4406c603a31116b0e38c2eda6fd6da 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -44,9 +44,9 @@
 
 #ifdef HAVE_BALOO
     #include "private/kbaloorolesprovider.h"
 
 #ifdef HAVE_BALOO
     #include "private/kbaloorolesprovider.h"

-    #include <KF5/Baloo/file.h>
-    #include <KF5/Baloo/filefetchjob.h>
-    #include <KF5/Baloo/filemonitor.h>
+    #include <Baloo/File>
+    #include <Baloo/FileFetchJob>
+    #include <Baloo/FileMonitor>

 #endif
 
 // #define KFILEITEMMODELROLESUPDATER_DEBUG
 #endif
 
 // #define KFILEITEMMODELROLESUPDATER_DEBUG

diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index ea67dfbad24da455f07f5880283e72b356bac645..5096ef096b01f3a62d9ff5d034ce929f8f1e90ee 100644 (file)
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -24,8 +24,8 @@
 #include <KGlobal>
 #include <KLocale>
 
 #include <KGlobal>
 #include <KLocale>
 

-#include <KF5/Baloo/file.h>
-#include <kfilemetadata/propertyinfo.h>
+#include <Baloo/File>
+#include <KFileMetaData/PropertyInfo>

 
 #include <QTime>
 #include <QMap>
 
 #include <QTime>
 #include <QMap>

diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp
index 4ad9066c4eb09097f132b296b97d5057531064e0..1ab2bd15c3fd6cf35932d75927c7d975cb8b005e 100644 (file)
--- a/src/panels/information/filemetadataconfigurationdialog.cpp
+++ b/src/panels/information/filemetadataconfigurationdialog.cpp
@@ -22,7 +22,7 @@
 #ifndef HAVE_BALOO
 #include <kfilemetadataconfigurationwidget.h>
 #else
 #ifndef HAVE_BALOO
 #include <kfilemetadataconfigurationwidget.h>
 #else

-#include <baloo/filemetadataconfigwidget.h>
+#include <Baloo/FileMetaDataConfigWidget>

 #endif
 
 #include <KLocale>
 #endif
 
 #include <KLocale>

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 9dc59db13a674b9736641e14c928f9846429f343..1e660d5c98d27790aa8c7c56c779b4f2d81336db 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -36,7 +36,7 @@
 #ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>
 #else
 #ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>
 #else

-#include <baloo/filemetadatawidget.h>
+#include <Baloo/FileMetaDataWidget>

 #endif
 
 #include <panels/places/placesitem.h>
 #endif
 
 #include <panels/places/placesitem.h>

diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index d4dce607adafdcf7460490aa099ae379e5430aa2..39dd372a8f1ce420f46e36c6c79d48ba3dfca3c3 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 <views/viewproperties.h>
 
 #ifdef HAVE_BALOO

-    #include <KF5/Baloo/query.h>
-    #include <KF5/Baloo/indexerconfig.h>
+    #include <Baloo/Query>
+    #include <Baloo/IndexerConfig>

 #endif
 
 namespace {
 #endif
 
 namespace {

diff --git a/src/search/dolphinfacetswidget.h b/src/search/dolphinfacetswidget.h
index 16d4979182d4232e29855487d2b971ddcab61dbf..46c84ce1a2af741f533af326758d52e49e75465b 100644 (file)
--- a/src/search/dolphinfacetswidget.h
+++ b/src/search/dolphinfacetswidget.h
@@ -24,7 +24,7 @@
 
 #include <config-baloo.h>
 #ifdef HAVE_BALOO
 
 #include <config-baloo.h>
 #ifdef HAVE_BALOO

-    #include <KF5/Baloo/term.h>
+    #include <Baloo/Term>

 #endif
 
 class QButtonGroup;
 #endif
 
 class QButtonGroup;

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 1f946f513c35d798b7e5d676a12cd9d49f9c20a5..78a3569a981c8f6b2e30bd5236022fdd0557e3e7 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -42,9 +42,9 @@
 
 #include <config-baloo.h>
 #ifdef HAVE_BALOO
 
 #include <config-baloo.h>
 #ifdef HAVE_BALOO

-    #include <KF5/Baloo/query.h>
-    #include <KF5/Baloo/term.h>
-    #include <KF5/Baloo/indexerconfig.h>
+    #include <Baloo/Query>
+    #include <Baloo/Term>
+    #include <Baloo/IndexerConfig>

 #endif
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
 #endif
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :

diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 2569acc498d6f62395b3877752b914c5c63276c6..910df7b220c615f690714fe1e8d978dd62b16ce8 100644 (file)
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -28,7 +28,7 @@
 #include <QVBoxLayout>
 
 #ifdef HAVE_BALOO
 #include <QVBoxLayout>
 
 #ifdef HAVE_BALOO

-    #include <KF5/Baloo/indexerconfig.h>
+    #include <Baloo/IndexerConfig>

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index df9a52db116d44cfcb4c5f2de9bb060515a51d57..6d718f02cc83dd83f52609d8d980fb61cf825fb5 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -79,7 +79,7 @@
 #include "zoomlevelinfo.h"
 
 #ifdef HAVE_BALOO
 #include "zoomlevelinfo.h"
 
 #ifdef HAVE_BALOO

-    #include <KF5/Baloo/indexerconfig.h>
+    #include <Baloo/IndexerConfig>

 #endif
 
 namespace {
 #endif
 
 namespace {

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index ecf5d2334134fa0f81cce1a58caeadac7e902f92..72f5be1668783be71022603a6c6835b66ad1ee95 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -44,7 +44,7 @@
 #include <KDebug>
 
 #ifdef HAVE_BALOO
 #include <KDebug>
 
 #ifdef HAVE_BALOO

-    #include <KF5/Baloo/indexerconfig.h>
+    #include <Baloo/IndexerConfig>

 #endif
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) :
 #endif
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) :

diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp
index d8721b7670f94b956c2b72da281b770cc8c2c979..9efbe8a4ff5102d6a29e4492ec7dd70d98d514c2 100644 (file)
--- a/src/views/tooltips/filemetadatatooltip.cpp
+++ b/src/views/tooltips/filemetadatatooltip.cpp
@@ -39,7 +39,7 @@
 #ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>
 #else
 #ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>
 #else

-#include <baloo/filemetadatawidget.h>
+#include <Baloo/FileMetaDataWidget>

 #endif
 
 FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
 #endif
 
 FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :