1 files changed, 20 insertions, 14 deletions

diff --git a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp
index 7f3d565..3bee3ae 100644
--- a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp
+++ b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp
@@ -2,11 +2,17 @@
 #include "ui_fileIsSameDialog.h"
 #include "TransferThread.h"
 
+#ifdef Q_OS_WIN32
+#define CURRENTSEPARATOR "\\"
+#else
+#define CURRENTSEPARATOR "/"
+#endif
+
 #include <QRegularExpression>
 #include <QFileInfo>
 #include <QMessageBox>
 
-FileIsSameDialog::FileIsSameDialog(QWidget *parent,QFileInfo fileInfo,QString firstRenamingRule,QString otherRenamingRule) :
+FileIsSameDialog::FileIsSameDialog(QWidget *parent, QFileInfo fileInfo, std::string firstRenamingRule, std::string otherRenamingRule) :
     QDialog(parent),
     ui(new Ui::fileIsSameDialog)
 {
@@ -21,11 +27,11 @@ FileIsSameDialog::FileIsSameDialog(QWidget *parent,QFileInfo fileInfo,QString fi
     action=FileExists_Cancel;
     oldName=TransferThread::resolvedName(fileInfo);
     destinationInfo=fileInfo;
-    ui->lineEditNewName->setText(oldName);
-    ui->lineEditNewName->setPlaceholderText(oldName);
+    ui->lineEditNewName->setText(QString::fromStdString(oldName));
+    ui->lineEditNewName->setPlaceholderText(QString::fromStdString(oldName));
     ui->label_content_size->setText(QString::number(fileInfo.size()));
     ui->label_content_modified->setText(fileInfo.lastModified().toString());
-    ui->label_content_file_name->setText(TransferThread::resolvedName(fileInfo));
+    ui->label_content_file_name->setText(QString::fromStdString(TransferThread::resolvedName(fileInfo)));
     QString folder=fileInfo.absolutePath();
     if(folder.size()>80)
         folder=folder.mid(0,38)+"..."+folder.mid(folder.size()-38);
@@ -72,19 +78,19 @@ void FileIsSameDialog::changeEvent(QEvent *e)
     }
 }
 
-QString FileIsSameDialog::getNewName()
+std::string FileIsSameDialog::getNewName()
 {
-    if(oldName==ui->lineEditNewName->text() || ui->checkBoxAlways->isChecked())
+    if(oldName==ui->lineEditNewName->text().toStdString() || ui->checkBoxAlways->isChecked())
         return oldName;
     else
-        return ui->lineEditNewName->text();
+        return ui->lineEditNewName->text().toStdString();
 }
 
 void FileIsSameDialog::on_SuggestNewName_clicked()
 {
     QFileInfo destinationInfo=this->destinationInfo;
     QString absolutePath=destinationInfo.absolutePath();
-    QString fileName=TransferThread::resolvedName(destinationInfo);
+    QString fileName=QString::fromStdString(TransferThread::resolvedName(destinationInfo));
     QString suffix="";
     QString destination;
     QString newFileName;
@@ -101,26 +107,26 @@ void FileIsSameDialog::on_SuggestNewName_clicked()
     {
         if(num==1)
         {
-            if(firstRenamingRule=="")
+            if(firstRenamingRule.empty())
                 newFileName=tr("%1 - copy").arg(fileName);
             else
             {
-                newFileName=firstRenamingRule;
+                newFileName=QString::fromStdString(firstRenamingRule);
                 newFileName.replace(QStringLiteral("%name%"),fileName);
             }
         }
         else
         {
-            if(otherRenamingRule=="")
+            if(otherRenamingRule.empty())
                 newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num);
             else
             {
-                newFileName=otherRenamingRule;
+                newFileName=QString::fromStdString(otherRenamingRule);
                 newFileName.replace(QStringLiteral("%name%"),fileName);
                 newFileName.replace(QStringLiteral("%number%"),QString::number(num));
             }
         }
-        destination=absolutePath+QDir::separator()+newFileName+suffix;
+        destination=absolutePath+CURRENTSEPARATOR+newFileName+suffix;
         destinationInfo.setFile(destination);
         num++;
     }
@@ -158,7 +164,7 @@ bool FileIsSameDialog::getAlways()
 
 void FileIsSameDialog::updateRenameButton()
 {
-    ui->Rename->setEnabled(ui->checkBoxAlways->isChecked() || (!ui->lineEditNewName->text().contains(QRegularExpression("[/\\\\\\*]")) && oldName!=ui->lineEditNewName->text() && !ui->lineEditNewName->text().isEmpty()));
+    ui->Rename->setEnabled(ui->checkBoxAlways->isChecked() || (!ui->lineEditNewName->text().contains(QRegularExpression("[/\\\\\\*]")) && oldName!=ui->lineEditNewName->text().toStdString() && !ui->lineEditNewName->text().isEmpty()));
 }
 
 void FileIsSameDialog::on_lineEditNewName_textChanged(const QString &arg1)