1 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/imageviewer/imageview.cpp b/src/plugins/imageviewer/imageview.cpp
index 9a2af284f4..01d9b3968f 100644
--- a/src/plugins/imageviewer/imageview.cpp
+++ b/src/plugins/imageviewer/imageview.cpp
@@ -40,6 +40,8 @@ const char kSettingsBackground[] = "ShowBackground";
 const char kSettingsOutline[] = "ShowOutline";
 const char kSettingsFitToScreen[] = "FitToScreen";
 
+using namespace Utils;
+
 namespace ImageViewer {
 namespace Constants {
     const qreal DEFAULT_SCALE_FACTOR = 1.2;
@@ -157,25 +159,24 @@ QImage ImageView::renderSvg(const QSize &imageSize) const
 
 bool ImageView::exportSvg(const ExportData &ed)
 {
-    const bool result = renderSvg(ed.size).save(ed.fileName);
+    const bool result = renderSvg(ed.size).save(ed.filePath.toFSPathString());
     if (result) {
         const QString message = Tr::tr("Exported \"%1\", %2x%3, %4 bytes")
-            .arg(QDir::toNativeSeparators(ed.fileName))
+            .arg(ed.filePath.toUserOutput())
             .arg(ed.size.width()).arg(ed.size.height())
-            .arg(QFileInfo(ed.fileName).size());
+            .arg(ed.filePath.fileSize());
         Core::MessageManager::writeDisrupting(message);
     } else {
-        const QString message = Tr::tr("Could not write file \"%1\".").arg(QDir::toNativeSeparators(ed.fileName));
+        const QString message = Tr::tr("Could not write file \"%1\".").arg(ed.filePath.toUserOutput());
         QMessageBox::critical(this, Tr::tr("Export Image"), message);
     }
     return result;
 }
 
 #ifndef QT_NO_SVG
-static QString suggestedExportFileName(const QFileInfo &fi)
+static FilePath suggestedExportFileName(const FilePath &fi)
 {
-    return fi.absolutePath() + QLatin1Char('/') + fi.baseName()
-        + QStringLiteral(".png");
+    return fi.absolutePath().pathAppended(fi.baseName() + ".png");
 }
 #endif
 
@@ -195,11 +196,11 @@ void ImageView::exportImage()
     auto svgItem = qgraphicsitem_cast<QGraphicsSvgItem *>(m_imageItem);
     QTC_ASSERT(svgItem, return);
 
-    const QFileInfo origFi = m_file->filePath().toFileInfo();
+    const FilePath origPath = m_file->filePath();
     ExportDialog exportDialog(this);
-    exportDialog.setWindowTitle(Tr::tr("Export %1").arg(origFi.fileName()));
+    exportDialog.setWindowTitle(Tr::tr("Export %1").arg(origPath.fileName()));
     exportDialog.setExportSize(svgSize());
-    exportDialog.setExportFileName(suggestedExportFileName(origFi));
+    exportDialog.setExportFileName(suggestedExportFileName(origPath));
 
     while (exportDialog.exec() == QDialog::Accepted && !exportSvg(exportDialog.exportData())) {}
 #endif // !QT_NO_SVG
@@ -210,14 +211,13 @@ void ImageView::exportMultiImages()
 #ifndef QT_NO_SVG
     QTC_ASSERT(qgraphicsitem_cast<QGraphicsSvgItem *>(m_imageItem), return);
 
-    const QFileInfo origFi = m_file->filePath().toFileInfo();
+    const FilePath origPath = m_file->filePath();
     const QSize size = svgSize();
-    const QString title =
-        Tr::tr("Export a Series of Images from %1 (%2x%3)")
-          .arg(origFi.fileName()).arg(size.width()).arg(size.height());
+    const QString title = Tr::tr("Export a Series of Images from %1 (%2x%3)")
+          .arg(origPath.fileName()).arg(size.width()).arg(size.height());
     MultiExportDialog multiExportDialog;
     multiExportDialog.setWindowTitle(title);
-    multiExportDialog.setExportFileName(suggestedExportFileName(origFi));
+    multiExportDialog.setExportFileName(suggestedExportFileName(origPath));
     multiExportDialog.setSvgSize(size);
     multiExportDialog.suggestSizes();