Merge branch 'KDE/4.10'

Conflicts:
	dolphin/src/CMakeLists.txt

2 files changed, 8 insertions, 4 deletions

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