diff options
Diffstat (limited to 'src/libs/installer/link.cpp')
-rw-r--r-- | src/libs/installer/link.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/libs/installer/link.cpp b/src/libs/installer/link.cpp index ac4935a8b..ef91828ce 100644 --- a/src/libs/installer/link.cpp +++ b/src/libs/installer/link.cpp @@ -88,8 +88,7 @@ public: OPEN_EXISTING, FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, 0); if (m_dirHandle == INVALID_HANDLE_VALUE) { - qWarning() << QString::fromLatin1("Could not open: '%1'; error: %2\n").arg(path) - .arg(QInstaller::windowsErrorString(GetLastError())); + qWarning() << "Cannot open" << path << ":" << QInstaller::windowsErrorString(GetLastError()); } } @@ -138,14 +137,12 @@ QString readWindowsSymLink(const QString &path) Link createJunction(const QString &linkPath, const QString &targetPath) { if (!QDir().mkpath(linkPath)) { - qWarning() << QString::fromLatin1("Could not create the mount directory: %1").arg( - linkPath); + qWarning() << "Cannot create the mount directory" << linkPath; return Link(linkPath); } FileHandleWrapper dirHandle(linkPath); if (dirHandle.handle() == INVALID_HANDLE_VALUE) { - qWarning() << QString::fromLatin1("Could not open: '%1'; error: %2\n").arg(linkPath) - .arg(QInstaller::windowsErrorString(GetLastError())); + qWarning() << "Cannot open" << linkPath << ":" << QInstaller::windowsErrorString(GetLastError()); return Link(linkPath); } @@ -175,8 +172,8 @@ Link createJunction(const QString &linkPath, const QString &targetPath) if (!::DeviceIoControl(dirHandle.handle(), FSCTL_SET_REPARSE_POINT, reparseStructData, reparseStructData->ReparseDataLength + REPARSE_DATA_BUFFER_HEADER_SIZE, 0, 0, &bytesReturned, 0)) { - qWarning() << QString::fromLatin1("Could not set the reparse point: for '%1' to %2; error: %3" - ).arg(linkPath, targetPath).arg(QInstaller::windowsErrorString(GetLastError())); + qWarning() << "Cannot set the reparse point for" << linkPath << "to" << targetPath + << ":" << QInstaller::windowsErrorString(GetLastError()); } return Link(linkPath); } @@ -197,8 +194,7 @@ bool removeJunction(const QString &path) REPARSE_GUID_DATA_BUFFER_HEADER_SIZE, 0, 0, &bytesReturned, 0)) { - qWarning() << QString::fromLatin1("Could not remove the reparse point: '%1'; error: %3" - ).arg(path).arg(QInstaller::windowsErrorString(GetLastError())); + qWarning() << "Cannot remove the reparse point" << path << ":" << QInstaller::windowsErrorString(GetLastError()); return false; } } @@ -211,8 +207,7 @@ Link createLnSymlink(const QString &linkPath, const QString &targetPath) int linkedError = symlink(QFileInfo(targetPath).absoluteFilePath().toUtf8(), QFileInfo(linkPath).absoluteFilePath().toUtf8()); if (linkedError != 0) { - qWarning() << QString::fromLatin1("Could not create a symlink: from '%1' to %2; error: %3" - ).arg(linkPath, targetPath).arg(linkedError); + qWarning() << "Cannot create a symlink from" << linkPath << "to" << targetPath << ":" << linkedError; } @@ -239,8 +234,7 @@ Link Link::create(const QString &link, const QString &targetPath) if (!linkPathExists) linkPathExists = QDir().mkpath(linkPath); if (!linkPathExists) { - qWarning() << QString::fromLatin1("Could not create the needed directories: %1").arg( - link); + qWarning() << "Cannot create the needed directories" << link; return Link(link); } @@ -248,8 +242,8 @@ Link Link::create(const QString &link, const QString &targetPath) if (QFileInfo(targetPath).isDir()) return createJunction(link, targetPath); - qWarning() << QString::fromLatin1("At the moment the %1 can not create anything else as "\ - "junctions for directories under windows").arg(QLatin1String(Q_FUNC_INFO)); + qWarning() << "At the moment the" << Q_FUNC_INFO << "can not create anything else as " + << "junctions for directories under windows"; return Link(link); #else return createLnSymlink(link, targetPath); |