From 3614b7fea7563300974982cca27a787749ea3f0f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 27 Jun 2014 10:34:57 +0200 Subject: [PATCH] Fix build. --- src/CMakeLists.txt | 6 +++--- src/kitemviews/kfileitemmodelrolesupdater.cpp | 6 +++--- src/kitemviews/private/kbaloorolesprovider.cpp | 4 ++-- src/panels/information/filemetadataconfigurationdialog.cpp | 2 +- src/panels/information/informationpanelcontent.cpp | 2 +- src/panels/places/placesitemmodel.cpp | 4 ++-- src/search/dolphinfacetswidget.h | 2 +- src/search/dolphinsearchbox.cpp | 6 +++--- src/settings/additionalinfodialog.cpp | 2 +- src/views/dolphinview.cpp | 2 +- src/views/dolphinviewactionhandler.cpp | 2 +- src/views/tooltips/filemetadatatooltip.cpp | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3b087aa4f..8050e4cf3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -136,9 +136,9 @@ if(HAVE_BALOO) target_link_libraries( dolphinprivate PUBLIC KF5::FileMetaData - ${BALOO_CORE_LIBRARY} - ${BALOO_FILE_LIBRARY} - ${BALOO_WIDGETS_LIBRARY} + KF5::BalooCore + KF5::BalooFiles + KF5::BalooWidgets ) endif() diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index b62ff7859..fb39fd225 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -44,9 +44,9 @@ #ifdef HAVE_BALOO #include "private/kbaloorolesprovider.h" - #include - #include - #include + #include + #include + #include #endif // #define KFILEITEMMODELROLESUPDATER_DEBUG diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp index ea67dfbad..5096ef096 100644 --- a/src/kitemviews/private/kbaloorolesprovider.cpp +++ b/src/kitemviews/private/kbaloorolesprovider.cpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp index 4ad9066c4..1ab2bd15c 100644 --- a/src/panels/information/filemetadataconfigurationdialog.cpp +++ b/src/panels/information/filemetadataconfigurationdialog.cpp @@ -22,7 +22,7 @@ #ifndef HAVE_BALOO #include #else -#include +#include #endif #include diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 9dc59db13..1e660d5c9 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -36,7 +36,7 @@ #ifndef HAVE_BALOO #include #else -#include +#include #endif #include diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index d4dce607a..39dd372a8 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -53,8 +53,8 @@ #include #ifdef HAVE_BALOO - #include - #include + #include + #include #endif namespace { diff --git a/src/search/dolphinfacetswidget.h b/src/search/dolphinfacetswidget.h index 16d497918..46c84ce1a 100644 --- a/src/search/dolphinfacetswidget.h +++ b/src/search/dolphinfacetswidget.h @@ -24,7 +24,7 @@ #include #ifdef HAVE_BALOO - #include + #include #endif class QButtonGroup; diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index 1f946f513..78a3569a9 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -42,9 +42,9 @@ #include #ifdef HAVE_BALOO - #include - #include - #include + #include + #include + #include #endif DolphinSearchBox::DolphinSearchBox(QWidget* parent) : diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp index 2569acc49..910df7b22 100644 --- a/src/settings/additionalinfodialog.cpp +++ b/src/settings/additionalinfodialog.cpp @@ -28,7 +28,7 @@ #include #ifdef HAVE_BALOO - #include + #include #endif AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent, diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index df9a52db1..6d718f02c 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -79,7 +79,7 @@ #include "zoomlevelinfo.h" #ifdef HAVE_BALOO - #include + #include #endif namespace { diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index ecf5d2334..72f5be166 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -44,7 +44,7 @@ #include #ifdef HAVE_BALOO - #include + #include #endif DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) : diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp index d8721b767..9efbe8a4f 100644 --- a/src/views/tooltips/filemetadatatooltip.cpp +++ b/src/views/tooltips/filemetadatatooltip.cpp @@ -39,7 +39,7 @@ #ifndef HAVE_BALOO #include #else -#include +#include #endif FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :