diff options
Diffstat (limited to 'plugins/CopyEngine/Ultracopier/FileErrorDialog.cpp')
-rw-r--r-- | plugins/CopyEngine/Ultracopier/FileErrorDialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/CopyEngine/Ultracopier/FileErrorDialog.cpp b/plugins/CopyEngine/Ultracopier/FileErrorDialog.cpp index 736cfeb..d88fb90 100644 --- a/plugins/CopyEngine/Ultracopier/FileErrorDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/FileErrorDialog.cpp @@ -6,7 +6,7 @@ bool FileErrorDialog::isInAdmin=false; -FileErrorDialog::FileErrorDialog(QWidget *parent, QFileInfo fileInfo, QString errorString, const ErrorType &errorType) : +FileErrorDialog::FileErrorDialog(QWidget *parent, QFileInfo fileInfo, std::string errorString, const ErrorType &errorType) : QDialog(parent), ui(new Ui::fileErrorDialog) { @@ -19,10 +19,10 @@ FileErrorDialog::FileErrorDialog(QWidget *parent, QFileInfo fileInfo, QString er ui->setupUi(this); action=FileError_Cancel; - ui->label_error->setText(errorString); + ui->label_error->setText(QString::fromStdString(errorString)); if(fileInfo.exists()) { - ui->label_content_file_name->setText(TransferThread::resolvedName(fileInfo)); + ui->label_content_file_name->setText(QString::fromStdString(TransferThread::resolvedName(fileInfo))); if(ui->label_content_file_name->text().isEmpty()) { ui->label_content_file_name->setText(fileInfo.absoluteFilePath()); @@ -63,7 +63,7 @@ FileErrorDialog::FileErrorDialog(QWidget *parent, QFileInfo fileInfo, QString er } else { - ui->label_content_file_name->setText(TransferThread::resolvedName(fileInfo)); + ui->label_content_file_name->setText(QString::fromStdString(TransferThread::resolvedName(fileInfo))); if(ui->label_content_file_name->text().isEmpty()) { ui->label_content_file_name->setText(fileInfo.absoluteFilePath()); |