Merge branch 'KDE/4.10'

Conflicts:
	dolphin/src/CMakeLists.txt

5 files changed, 25 insertions, 13 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9f650ce43..a0beafa80 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,8 @@ set_package_properties(NepomukCore PROPERTIES DESCRIPTION "Nepomuk Core librarie
 macro_bool_to_01(NepomukCore_FOUND HAVE_NEPOMUK)
 configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
 
+macro_optional_find_package(NepomukWidgets)
+
 macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
 configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
 
@@ -22,7 +24,7 @@ if (NepomukCore_FOUND)
                         )
 
   # Yes, Soprano includes is what we need here
-  include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_CORE_INCLUDE_DIR} )
+  include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_CORE_INCLUDE_DIR} ${NEPOMUK_WIDGETS_INCLUDE_DIR} )
 endif (NepomukCore_FOUND)
 
 add_subdirectory(tests)
@@ -114,6 +116,7 @@ if (NepomukCore_FOUND)
     target_link_libraries(
         dolphinprivate
         ${NEPOMUK_CORE_LIBRARY}
+        ${NEPOMUK_WIDGETS_LIBRARY}
         ${SOPRANO_LIBRARIES}
     )
 endif (NepomukCore_FOUND)
@@ -239,6 +242,7 @@ target_link_libraries(kdeinit_dolphin
 if (NepomukCore_FOUND)
     target_link_libraries(kdeinit_dolphin
         ${NEPOMUK_CORE_LIBRARY}
+        ${NEPOMUK_WIDGETS_LIBRARY}
         ${SOPRANO_LIBRARIES}
     )
 endif (NepomukCore_FOUND)
@@ -313,10 +317,10 @@ target_link_libraries(kcm_dolphinnavigation  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIB
 target_link_libraries(kcm_dolphinservices  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBRARY} dolphinprivate)
 target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate)
 if (NepomukCore_FOUND)
-  target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_CORE_LIBRARY})
-  target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_CORE_LIBRARY})
-  target_link_libraries(kcm_dolphinservices ${NEPOMUK_CORE_LIBRARY})
-  target_link_libraries(kcm_dolphingeneral ${NEPOMUK_CORE_LIBRARY})
+  target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
+  target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
+  target_link_libraries(kcm_dolphinservices ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
+  target_link_libraries(kcm_dolphingeneral ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
 endif (NepomukCore_FOUND)
 
 install(TARGETS kcm_dolphinviewmodes DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 39ed1d2bd..355a57196 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -21,7 +21,6 @@
 
 #include <KDialog>
 #include <KFileItem>
-#include <kfilemetadatawidget.h>
 #include <KGlobalSettings>
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
@@ -32,6 +31,8 @@
 #include <kseparator.h>
 #include <KStringHandler>
 
+#include <nepomuk2/filemetadatawidget.h>
+
 #include <panels/places/placesitem.h>
 #include <panels/places/placesitemmodel.h>
 
@@ -106,7 +107,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     const bool previewsShown = InformationPanelSettings::previewsShown();
     m_preview->setVisible(previewsShown);
 
-    m_metaDataWidget = new KFileMetaDataWidget(parent);
+    m_metaDataWidget = new Nepomuk2::FileMetaDataWidget(parent);
     m_metaDataWidget->setFont(KGlobalSettings::smallestReadableFont());
     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
     connect(m_metaDataWidget, SIGNAL(urlActivated(KUrl)), this, SIGNAL(urlActivated(KUrl)));
diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index c0412e567..2a369bbbc 100644
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -26,7 +26,6 @@
 #include <KVBox>
 
 class KFileItemList;
-class KFileMetaDataWidget;
 class PhononWidget;
 class PixmapViewer;
 class PlacesItemModel;
@@ -35,6 +34,10 @@ class QString;
 class QLabel;
 class QScrollArea;
 
+namespace Nepomuk2 {
+    class FileMetaDataWidget;
+}
+
 /**
  * @brief Manages the widgets that display the meta information
 *         for file items of the Information Panel.
@@ -133,7 +136,7 @@ private:
     PixmapViewer* m_preview;
     PhononWidget* m_phononWidget;
     QLabel* m_nameLabel;
-    KFileMetaDataWidget* m_metaDataWidget;
+    Nepomuk2::FileMetaDataWidget* m_metaDataWidget;
     QScrollArea* m_metaDataArea;
 
     PlacesItemModel* m_placesItemModel;
diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp
index 1f4fb69ae..d0cba741e 100644
--- a/src/views/tooltips/filemetadatatooltip.cpp
+++ b/src/views/tooltips/filemetadatatooltip.cpp
@@ -22,7 +22,6 @@
 #include "filemetadatatooltip.h"
 
 #include <KColorScheme>
-#include <kfilemetadatawidget.h>
 #include <KSeparator>
 #include <KWindowSystem>
 
@@ -31,6 +30,8 @@
 #include <QStylePainter>
 #include <QVBoxLayout>
 
+#include <nepomuk2/filemetadatawidget.h>
+
 // For the blurred tooltip background
 #include <plasma/windoweffects.h>
 
@@ -55,7 +56,7 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
     m_name->setFont(font);
 
     // Create widget for the meta data
-    m_fileMetaDataWidget = new KFileMetaDataWidget(this);
+    m_fileMetaDataWidget = new Nepomuk2::FileMetaDataWidget(this);
     m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
     m_fileMetaDataWidget->setReadOnly(true);
     connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished(KFileItemList)),
diff --git a/src/views/tooltips/filemetadatatooltip.h b/src/views/tooltips/filemetadatatooltip.h
index 856b55746..aa7ce63ed 100644
--- a/src/views/tooltips/filemetadatatooltip.h
+++ b/src/views/tooltips/filemetadatatooltip.h
@@ -25,9 +25,12 @@
 #include <QWidget>
 
 class KFileItemList;
-class KFileMetaDataWidget;
 class QLabel;
 
+namespace Nepomuk2 {
+    class FileMetaDataWidget;
+}
+
 /**
  * @brief Tooltip, that shows the meta information and a preview of one
  *        or more files.
@@ -68,7 +71,7 @@ protected:
 private:
     QLabel* m_preview;
     QLabel* m_name;
-    KFileMetaDataWidget* m_fileMetaDataWidget;
+    Nepomuk2::FileMetaDataWidget* m_fileMetaDataWidget;
 };
 
 #endif