Merge remote-tracking branch 'origin/Applications/18.08'

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

diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp
index 755636c6cf5db097c16509547ddafb114e24a2d2..f4a688ea82d2663a982e00a1ee0d7ea00aee3039 100644 (file)
--- a/src/views/tooltips/dolphinfilemetadatawidget.cpp
+++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp
@@ -24,26 +24,20 @@
 #include <KColorScheme>
 #include <KSeparator>
 #include <KStringHandler>
-#include <QTextDocument>
+#include <Baloo/FileMetaDataWidget>
 
 #include <QLabel>
 #include <QStyleOptionFrame>
 #include <QStylePainter>
-#include <QVBoxLayout>
+#include <QTextDocument>
 #include <QTextLayout>
-#include <QTextLine>
-
-#ifndef HAVE_BALOO
-#include <KFileMetaDataWidget>
-#else
-#include <Baloo/FileMetaDataWidget>
-#endif
+#include <QVBoxLayout>
 
 DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
     QWidget(parent),
-    m_preview(0),
-    m_name(0),
-    m_fileMetaDataWidget(0)
+    m_preview(nullptr),
+    m_name(nullptr),
+    m_fileMetaDataWidget(nullptr)
 {
     // Create widget for file preview
     m_preview = new QLabel(this);
@@ -63,15 +57,11 @@ DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
     m_name->setMaximumWidth(fontMetrics.averageCharWidth() * 40);
 
     // Create widget for the meta data
-#ifndef HAVE_BALOO
-    m_fileMetaDataWidget = new KFileMetaDataWidget(this);
-    connect(m_fileMetaDataWidget, &KFileMetaDataWidget::metaDataRequestFinished,
-            this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
-#else
     m_fileMetaDataWidget = new Baloo::FileMetaDataWidget(this);
     connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::metaDataRequestFinished,
             this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
-#endif
+    connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::urlActivated,
+            this, &DolphinFileMetaDataWidget::urlActivated);
     m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
     m_fileMetaDataWidget->setReadOnly(true);