1 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/imageviewer/multiexportdialog.cpp b/src/plugins/imageviewer/multiexportdialog.cpp
index b377cc7243..f9eb2a298f 100644
--- a/src/plugins/imageviewer/multiexportdialog.cpp
+++ b/src/plugins/imageviewer/multiexportdialog.cpp
@@ -31,32 +31,31 @@
 #include <coreplugin/icore.h>
 
 #include <utils/pathchooser.h>
+#include <utils/stringutils.h>
 #include <utils/utilsicons.h>
 
 #include <QApplication>
+#include <QDebug>
 #include <QDesktopWidget>
 #include <QDialogButtonBox>
+#include <QDir>
 #include <QFileDialog>
+#include <QFileInfo>
 #include <QFormLayout>
 #include <QHBoxLayout>
-#include <QMessageBox>
-#include <QMenu>
+#include <QImageWriter>
 #include <QLabel>
 #include <QLineEdit>
+#include <QMenu>
+#include <QMessageBox>
 #include <QPushButton>
+#include <QSettings>
 #include <QSpinBox>
+#include <QTextStream>
 #include <QToolButton>
 #include <QVBoxLayout>
 #include <QWidgetAction>
 
-#include <QImageWriter>
-
-#include <QDebug>
-#include <QDir>
-#include <QFileInfo>
-#include <QSettings>
-#include <QTextStream>
-
 namespace ImageViewer {
 namespace Internal {
 
@@ -114,7 +113,7 @@ static QVector<QSize> stringToSizes(const QString &s)
 {
     QVector<QSize> result;
     const QString trimmed = s.trimmed();
-    const QVector<QStringRef> &sizes = trimmed.splitRef(',', QString::SkipEmptyParts);
+    const QVector<QStringRef> &sizes = trimmed.splitRef(',', Utils::SkipEmptyParts);
     result.reserve(sizes.size());
     for (const QStringRef &sizeSpec : sizes) {
         const QSize size = sizeFromString(sizeSpec);
@@ -301,7 +300,8 @@ void MultiExportDialog::accept()
     }
     if (data.size() > 1 && data.at(0).fileName == data.at(1).fileName) {
         QMessageBox::warning(this, windowTitle(),
-                             tr("The file name must contain one of the placeholders %1, %2.").arg("%1", "%2"));
+                             tr("The file name must contain one of the placeholders %1, %2.")
+                                .arg(QString("%1"), QString("%2")));
         return;
     }
 
@@ -329,7 +329,7 @@ void MultiExportDialog::accept()
 
 QString MultiExportDialog::exportFileName() const
 {
-    return m_pathChooser->fileName().toString();
+    return m_pathChooser->filePath().toString();
 }
 
 void MultiExportDialog::setExportFileName(QString f)
@@ -337,7 +337,7 @@ void MultiExportDialog::setExportFileName(QString f)
     const int lastDot = f.lastIndexOf('.');
     if (lastDot != -1)
         f.insert(lastDot, "-%1");
-    m_pathChooser->setFileName(Utils::FilePath::fromString(f));
+    m_pathChooser->setFilePath(Utils::FilePath::fromString(f));
 }
 
 } // namespace Internal