diff options
Diffstat (limited to 'tools/devtool/binarydump.cpp')
| -rw-r--r-- | tools/devtool/binarydump.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/devtool/binarydump.cpp b/tools/devtool/binarydump.cpp index 4a6094e66..26e8260dd 100644 --- a/tools/devtool/binarydump.cpp +++ b/tools/devtool/binarydump.cpp @@ -47,19 +47,19 @@ int BinaryDump::dump(const QInstaller::ResourceCollectionManager &manager, const QDir targetDir(QFileInfo(target).absoluteFilePath()); if (targetDir.exists()) { if (!targetDir.entryList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty()) { - std::cerr << qPrintable(QString::fromLatin1("Target directory '%1' already exists and " - "is not empty.").arg(targetDir.path())) << std::endl; + std::cerr << qPrintable(QString::fromLatin1("Target directory \"%1\" already exists and " + "is not empty.").arg(QDir::toNativeSeparators(targetDir.path()))) << std::endl; return EXIT_FAILURE; } } else { if (!QDir().mkpath(targetDir.path())) { - std::cerr << qPrintable(QString::fromLatin1("Could not create '%1'.").arg(targetDir - .path())) << std::endl; + std::cerr << qPrintable(QString::fromLatin1("Cannot create \"%1\".").arg( + QDir::toNativeSeparators(targetDir.path()))) << std::endl; return EXIT_FAILURE; } } - QInstaller::CopyDirectoryOperation copyMetadata; + QInstaller::CopyDirectoryOperation copyMetadata(0); copyMetadata.setArguments(QStringList() << QLatin1String(":/") << (targetDir.path() + QLatin1Char('/'))); // Add "/" at the end to make operation work. if (!copyMetadata.performOperation()) { @@ -68,8 +68,8 @@ int BinaryDump::dump(const QInstaller::ResourceCollectionManager &manager, const } if (!targetDir.cd(QLatin1String("metadata"))) { - std::cerr << qPrintable(QString::fromLatin1("Could not switch to '%1/metadata'.") - .arg(targetDir.path())) << std::endl; + std::cerr << qPrintable(QString::fromLatin1("Cannot switch to \"%1/metadata\".") + .arg(QDir::toNativeSeparators(targetDir.path()))) << std::endl; return EXIT_FAILURE; } @@ -81,8 +81,8 @@ int BinaryDump::dump(const QInstaller::ResourceCollectionManager &manager, const QString error; QDomDocument doc; if (!doc.setContent(&updatesXml, &error)) { - throw QInstaller::Error(QString::fromLatin1("Could not read: '%1'. %2").arg(updatesXml - .fileName(), error)); + throw QInstaller::Error(QString::fromLatin1("Cannot read: \"%1\": %2").arg( + QDir::toNativeSeparators(updatesXml.fileName()), error)); } QHash<QString, QString> versionMap; @@ -113,7 +113,7 @@ int BinaryDump::dump(const QInstaller::ResourceCollectionManager &manager, const continue; if (!targetDir.mkpath(name)) { - throw QInstaller::Error(QString::fromLatin1("Could not create target dir: %1.") + throw QInstaller::Error(QString::fromLatin1("Cannot create target dir: %1.") .arg(targetDir.filePath(name))); } |