Port to QStringView

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

diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp
index fdbf19ccdfb9d1554da66c0835bbfad1ca8c9eba..01877e4ee823971f74337bba9986c37153cda696 100644 (file)
--- a/src/views/tooltips/dolphinfilemetadatawidget.cpp
+++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp
@@ -66,7 +66,7 @@ DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
 
     QHBoxLayout* layout = new QHBoxLayout(this);
     layout->addWidget(m_preview);
-    layout->addSpacing(layout->margin());
+    layout->addSpacing(layout->contentsMargins().left());
     layout->addLayout(textLayout);
 }
 
@@ -81,9 +81,16 @@ void DolphinFileMetaDataWidget::setPreview(const QPixmap& pixmap)
 
 QPixmap DolphinFileMetaDataWidget::preview() const
 {
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
     if (m_preview->pixmap()) {
         return *m_preview->pixmap();
     }
+#else
+    if (!m_preview->pixmap(Qt::ReturnByValue).isNull()) {
+        return m_preview->pixmap(Qt::ReturnByValue);
+    }
+#endif
+
     return QPixmap();
 }
 
@@ -106,7 +113,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()) {