Merge branch 'master' into frameworks

[dolphin.git] / src / views / tooltips / filemetadatatooltip.cpp

diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp
index 67911eea2ce2c9dc5caf2e41f63ec52a6e1fbe9f..afb1a32d30719f85d8506b4b0b6b8d7d329b57d2 100644 (file)
--- a/src/views/tooltips/filemetadatatooltip.cpp
+++ b/src/views/tooltips/filemetadatatooltip.cpp
@@ -24,6 +24,8 @@
 #include <KColorScheme>
 #include <KSeparator>
 #include <KWindowSystem>
+// For the blurred tooltip background
+#include <KWindowEffects>
 #include <KStringHandler>
 
 #include <QLabel>
@@ -34,15 +36,12 @@
 #include <QTextLayout>
 #include <QTextLine>
 
-#ifndef HAVE_NEPOMUK
+#ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>
 #else
-#include <nepomuk2/filemetadatawidget.h>
+#include <Baloo/FileMetaDataWidget>
 #endif
 
-// For the blurred tooltip background
-#include <plasma/windoweffects.h>
-
 FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
     QWidget(parent),
     m_preview(0),
@@ -70,15 +69,17 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
     m_name->setMaximumWidth(fontMetrics.averageCharWidth() * 40);
 
     // Create widget for the meta data
-#ifndef HAVE_NEPOMUK
+#ifndef HAVE_BALOO
     m_fileMetaDataWidget = new KFileMetaDataWidget(this);
+    connect(m_fileMetaDataWidget, &KFileMetaDataWidget::metaDataRequestFinished,
+            this, &FileMetaDataToolTip::metaDataRequestFinished);
 #else
-    m_fileMetaDataWidget = new Nepomuk2::FileMetaDataWidget(this);
+    m_fileMetaDataWidget = new Baloo::FileMetaDataWidget(this);
+    connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::metaDataRequestFinished,
+            this, &FileMetaDataToolTip::metaDataRequestFinished);
 #endif
     m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
     m_fileMetaDataWidget->setReadOnly(true);
-    connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished(KFileItemList)),
-            this, SIGNAL(metaDataRequestFinished(KFileItemList)));
 
     QVBoxLayout* textLayout = new QVBoxLayout();
     textLayout->addWidget(m_name);
@@ -174,8 +175,8 @@ void FileMetaDataToolTip::paintEvent(QPaintEvent* event)
 
 void FileMetaDataToolTip::showEvent(QShowEvent *)
 {
-    Plasma::WindowEffects::overrideShadow(winId(), true);
-    Plasma::WindowEffects::enableBlurBehind(winId(), true, mask());
+#pragma message("TODO: port Plasma::WindowEffects::overrideShadow")
+    //Plasma::WindowEffects::overrideShadow(winId(), true);
+    KWindowEffects::enableBlurBehind(winId(), true, mask());
 }
 
-#include "filemetadatatooltip.moc"