X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/0dd0b65bf02f52da0d2e9d270160e69b81a357ca..38c34eeca:/src/views/tooltips/dolphinfilemetadatawidget.cpp

diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp
index cabfc0617..3686b0f18 100644
--- a/src/views/tooltips/dolphinfilemetadatawidget.cpp
+++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp
@@ -1,49 +1,30 @@
-/***************************************************************************
- *   Copyright (C) 2010 by Peter Penz <peter.penz19@gmail.com>             *
- *   Copyright (C) 2008 by Fredrik Höglund <fredrik@kde.org>               *
- *   Copyright (C) 2012 by Mark Gaiser <markg85@gmail.com>                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2010 Peter Penz <peter.penz19@gmail.com>
+ * SPDX-FileCopyrightText: 2008 Fredrik Höglund <fredrik@kde.org>
+ * SPDX-FileCopyrightText: 2012 Mark Gaiser <markg85@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "dolphinfilemetadatawidget.h"
 
+#include <Baloo/FileMetaDataWidget>
 #include <KColorScheme>
 #include <KSeparator>
 #include <KStringHandler>
-#include <QTextDocument>
 
 #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(nullptr),
-    m_name(nullptr),
-    m_fileMetaDataWidget(nullptr)
+DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget *parent)
+    : QWidget(parent)
+    , m_preview(nullptr)
+    , m_name(nullptr)
+    , m_fileMetaDataWidget(nullptr)
 {
     // Create widget for file preview
     m_preview = new QLabel(this);
@@ -63,23 +44,13 @@ 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);
-    connect(m_fileMetaDataWidget, &KFileMetaDataWidget::urlActivated,
-            this, &DolphinFileMetaDataWidget::urlActivated);
-#else
     m_fileMetaDataWidget = new Baloo::FileMetaDataWidget(this);
-    connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::metaDataRequestFinished,
-            this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
-    connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::urlActivated,
-            this, &DolphinFileMetaDataWidget::urlActivated);
-#endif
+    connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::metaDataRequestFinished, this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
+    connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::urlActivated, this, &DolphinFileMetaDataWidget::urlActivated);
     m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
     m_fileMetaDataWidget->setReadOnly(true);
 
-    QVBoxLayout* textLayout = new QVBoxLayout();
+    QVBoxLayout *textLayout = new QVBoxLayout();
     textLayout->addWidget(m_name);
     textLayout->addWidget(new KSeparator());
     textLayout->addWidget(m_fileMetaDataWidget);
@@ -91,9 +62,9 @@ DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
     // (see bug #241608)
     textLayout->addStretch();
 
-    QHBoxLayout* layout = new QHBoxLayout(this);
+    QHBoxLayout *layout = new QHBoxLayout(this);
     layout->addWidget(m_preview);
-    layout->addSpacing(layout->margin());
+    layout->addSpacing(layout->contentsMargins().left());
     layout->addLayout(textLayout);
 }
 
@@ -101,20 +72,21 @@ DolphinFileMetaDataWidget::~DolphinFileMetaDataWidget()
 {
 }
 
-void DolphinFileMetaDataWidget::setPreview(const QPixmap& pixmap)
+void DolphinFileMetaDataWidget::setPreview(const QPixmap &pixmap)
 {
     m_preview->setPixmap(pixmap);
 }
 
 QPixmap DolphinFileMetaDataWidget::preview() const
 {
-    if (m_preview->pixmap()) {
-        return *m_preview->pixmap();
+    if (!m_preview->pixmap(Qt::ReturnByValue).isNull()) {
+        return m_preview->pixmap(Qt::ReturnByValue);
     }
+
     return QPixmap();
 }
 
-void DolphinFileMetaDataWidget::setName(const QString& name)
+void DolphinFileMetaDataWidget::setName(const QString &name)
 {
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
@@ -133,7 +105,7 @@ void DolphinFileMetaDataWidget::setName(const QString& name)
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_name->maximumWidth());
-        wrappedText += processedName.midRef(line.textStart(), line.textLength());
+        wrappedText += QStringView(processedName).mid(line.textStart(), line.textLength());
 
         line = textLayout.createLine();
         if (line.isValid()) {
@@ -150,7 +122,7 @@ QString DolphinFileMetaDataWidget::name() const
     return m_name->text();
 }
 
-void DolphinFileMetaDataWidget::setItems(const KFileItemList& items)
+void DolphinFileMetaDataWidget::setItems(const KFileItemList &items)
 {
     m_fileMetaDataWidget->setItems(items);
 }
@@ -159,4 +131,3 @@ KFileItemList DolphinFileMetaDataWidget::items() const
 {
     return m_fileMetaDataWidget->items();
 }
-