tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use QString::toLatin instead of deprecated toAscii

Browse source
This commit is contained in:
Àlex Fiestas 2014-09-23 19:45:29 +02:00
parent 74382f09d2
commit 9a9333035a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/daemon.cpp
View file

@ -100,16 +100,16 @@ Daemon::Daemon(QObject *parent)
//http://delta.affinix.com/docs/qca/rsatest_8cpp-example.html
if (config->group("myself").hasKey("privateKey")) {
//Migration from older versions of KDE Connect
privKey.write(config->group("myself").readEntry<QString>("privateKey",QCA::KeyGenerator().createRSA(2048).toPEM()).toAscii());
privKey.write(config->group("myself").readEntry<QString>("privateKey",QCA::KeyGenerator().createRSA(2048).toPEM()).toLatin1());
} else {
privKey.write(QCA::KeyGenerator().createRSA(2048).toPEM().toAscii());
privKey.write(QCA::KeyGenerator().createRSA(2048).toPEM().toLatin1());
}
privKey.close();
config->group("myself").writeEntry("privateKeyPath", privateKeyPath);
config->sync();
}
if (QFile::permissions(config->group("myself").readEntry("privateKeyPath")) != strict)
{
qCDebug(KDECONNECT_CORE) << "Error: KDE Connect detects wrong permissions for private file " << config->group("myself").readEntry("privateKeyPath");
@ -132,7 +132,7 @@ Daemon::Daemon(QObject *parent)
d->mDevices[id] = device;
Q_EMIT deviceAdded(id);
}
//Listen to connectivity changes
QNetworkSession* network = new QNetworkSession(QNetworkConfigurationManager().defaultConfiguration());
Q_FOREACH (LinkProvider* a, d->mLinkProviders) {

2
core/networkpackage.cpp
View file

@ -186,7 +186,7 @@ bool NetworkPackage::decrypt(QCA::PrivateKey& key, NetworkPackage* out) const
QByteArray decryptedJson;
Q_FOREACH(const QString& chunk, chunks) {
const QByteArray encryptedChunk = QByteArray::fromBase64(chunk.toAscii());
const QByteArray encryptedChunk = QByteArray::fromBase64(chunk.toLatin1());
QCA::SecureArray decryptedChunk;
bool success = key.decrypt(encryptedChunk, &decryptedChunk, NetworkPackage::EncryptionAlgorithm);
if (!success) {