feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I5cd5607fcd3311915217a1615b948587ef808cfa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-04 17:34:08 +01:00
parent 5a31b0067d
commit ac54974b32
20 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/ssh/sftpchannel.cpp
View File

@@ -508,7 +508,7 @@ void SftpChannelPrivate::handleMkdirStatus(const JobMap::Iterator &it,
const QFileInfoList &dirInfos
= localDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
foreach (const QFileInfo &dirInfo, dirInfos) {
const QString remoteSubDir = remoteDir + '/' + dirInfo.fileName();
const QString remoteSubDir = remoteDir + QLatin1Char('/') + dirInfo.fileName();
const SftpMakeDir::Ptr mkdirOp(
new SftpMakeDir(++m_nextJobId, remoteSubDir, op->parentJob));
op->parentJob->mkdirsInProgress.insert(mkdirOp,
@@ -528,7 +528,7 @@ void SftpChannelPrivate::handleMkdirStatus(const JobMap::Iterator &it,
return;
}
const QString remoteFilePath = remoteDir + '/' + fileInfo.fileName();
const QString remoteFilePath = remoteDir + QLatin1Char('/') + fileInfo.fileName();
SftpUploadFile::Ptr uploadFileOp(new SftpUploadFile(++m_nextJobId,
remoteFilePath, localFile, SftpOverwriteExisting, op->parentJob));
createJob(uploadFileOp);

4
src/libs/utils/ssh/sshcapabilities.cpp
View File

@@ -98,8 +98,8 @@ QByteArray SshCapabilities::findBestMatch(const QList<QByteArray> &myCapabilitie
QCoreApplication::translate("SshConnection",
"Server and client capabilities don't match. "
"Client list was: %1.\nServer list was %2.")
.arg(listAsByteArray(myCapabilities).data())
.arg(listAsByteArray(serverCapabilities).data()));
.arg(QString::fromLocal8Bit(listAsByteArray(myCapabilities).data()))
.arg(QString::fromLocal8Bit(listAsByteArray(serverCapabilities).data())));
}
} // namespace Internal

2
src/libs/utils/ssh/sshconnection.cpp
View File

@@ -321,7 +321,7 @@ void SshConnectionPrivate::handleIncomingData()
e.errorString);
} catch (Botan::Exception &e) {
closeConnection(SSH_DISCONNECT_BY_APPLICATION, SshInternalError, "",
tr("Botan library exception: %1").arg(e.what()));
tr("Botan library exception: %1").arg(QString::fromAscii(e.what())));
}
}

2
src/libs/utils/ssh/sshincomingpacket.cpp
View File

@@ -286,7 +286,7 @@ SshChannelOpenFailure SshIncomingPacket::extractChannelOpenFailure() const
quint32 offset = TypeOffset + 1;
openFailure.localChannel = SshPacketParser::asUint32(m_data, &offset);
openFailure.reasonCode = SshPacketParser::asUint32(m_data, &offset);
openFailure.reasonString = SshPacketParser::asString(m_data, &offset);
openFailure.reasonString = QString::fromLocal8Bit(SshPacketParser::asString(m_data, &offset));
openFailure.language = SshPacketParser::asString(m_data, &offset);
} catch (SshPacketParseException &) {
throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,

2
src/libs/utils/ssh/sshkeygenerator.cpp
View File

@@ -84,7 +84,7 @@ bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format, int ke
}
return true;
} catch (Botan::Exception &e) {
m_error = tr("Error generating key: %1").arg(e.what());
m_error = tr("Error generating key: %1").arg(QString::fromAscii(e.what()));
return false;
}
}