alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.10' into frameworks

Browse Source 
"4e03e90 - (origin/KDE/4.10) Use non-deprecated types and methods"
(rerunning the perl scripts rather than solving every conflict by hand)
This commit is contained in:
David Faure 2012-12-13 13:22:48 +01:00
commit eb992ce047
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
private/remoteservice.cpp
View File

@ -123,7 +123,7 @@ void RemoteService::setLocation(const QUrl &location)
Jolie::Message getOpDesc(resourcePathFromUrl(location), "startConnection"); Jolie::Message getOpDesc(resourcePathFromUrl(location), "startConnection");
Jolie::Value data; Jolie::Value data;
data.children(JolieMessage::Field::IDENTITY) << Jolie::Value(identityByteArray); data.children(JolieMessage::Field::IDENTITY) << Jolie::Value(identityByteArray);
data.children(JolieMessage::Field::UUID) << Jolie::Value(m_uuid.toAscii()); data.children(JolieMessage::Field::UUID) << Jolie::Value(m_uuid.toLatin1());
getOpDesc.setData(data); getOpDesc.setData(data);
Jolie::PendingCall pendingReply = m_client->asyncCall(getOpDesc); Jolie::PendingCall pendingReply = m_client->asyncCall(getOpDesc);
@ -225,7 +225,7 @@ void RemoteService::slotGotPin(Plasma::ClientPinRequest *request)
Jolie::Value value; Jolie::Value value;
value.children(JolieMessage::Field::PARAMETERS) << Jolie::Value(QByteArray()); value.children(JolieMessage::Field::PARAMETERS) << Jolie::Value(QByteArray());
if (!request->pin().isEmpty()) { if (!request->pin().isEmpty()) {
value.children(JolieMessage::Field::PIN) << Jolie::Value(request->pin().toAscii()); value.children(JolieMessage::Field::PIN) << Jolie::Value(request->pin().toLatin1());
} }
getOpDesc.setData(value); getOpDesc.setData(value);
//TODO: async //TODO: async
@ -302,9 +302,9 @@ Jolie::Message RemoteService::signMessage(const Jolie::Message &message) const
} }
Jolie::Value data = response.data(); Jolie::Value data = response.data();
data.children(JolieMessage::Field::IDENTITYID) << Jolie::Value(identity.id().toAscii()); data.children(JolieMessage::Field::IDENTITYID) << Jolie::Value(identity.id().toLatin1());
data.children(JolieMessage::Field::TOKEN) << Jolie::Value(m_token); data.children(JolieMessage::Field::TOKEN) << Jolie::Value(m_token);
data.children(JolieMessage::Field::UUID) << Jolie::Value(m_uuid.toAscii()); data.children(JolieMessage::Field::UUID) << Jolie::Value(m_uuid.toLatin1());
response.setData(data); response.setData(data);
data.children(JolieMessage::Field::SIGNATURE) << data.children(JolieMessage::Field::SIGNATURE) <<
Jolie::Value(identity.signMessage(JolieMessage::payload(response))); Jolie::Value(identity.signMessage(JolieMessage::payload(response)));

4
private/remoteservicejob.cpp
View File

@ -93,9 +93,9 @@ void RemoteServiceJob::start()
Jolie::Message message(m_location.path(KUrl::RemoveTrailingSlash).remove(0, 1).toUtf8(), Jolie::Message message(m_location.path(KUrl::RemoveTrailingSlash).remove(0, 1).toUtf8(),
"startOperationCall"); "startOperationCall");
Jolie::Value data; Jolie::Value data;
data.children(JolieMessage::Field::OPERATION) << (Jolie::Value(operationName().toAscii())); data.children(JolieMessage::Field::OPERATION) << (Jolie::Value(operationName().toLatin1()));
data.children(JolieMessage::Field::PARAMETERS) << Jolie::Value(params); data.children(JolieMessage::Field::PARAMETERS) << Jolie::Value(params);
data.children(JolieMessage::Field::DESTINATION) << Jolie::Value(destination().toAscii()); data.children(JolieMessage::Field::DESTINATION) << Jolie::Value(destination().toLatin1());
message.setData(data); message.setData(data);
Jolie::Client *client = m_service->m_client; Jolie::Client *client = m_service->m_client;

6
private/serviceprovider.cpp
View File

@ -241,7 +241,7 @@ void ServiceProvider::relay(Jolie::Server *server, int descriptor,
Jolie::Message response(message.resourcePath(), message.operationName(), message.id()); Jolie::Message response(message.resourcePath(), message.operationName(), message.id());
QByteArray uuid = JolieMessage::field(JolieMessage::Field::UUID, message); QByteArray uuid = JolieMessage::field(JolieMessage::Field::UUID, message);
response = appendToken(response, identity.id().toAscii(), uuid); response = appendToken(response, identity.id().toLatin1(), uuid);
AuthorizationManager::self()->d->server->sendReply(descriptor, response); AuthorizationManager::self()->d->server->sendReply(descriptor, response);
return; return;
@ -294,7 +294,7 @@ void ServiceProvider::operationCompleted(Plasma::ServiceJob *job)
data.children(JolieMessage::Field::RESULT) << Jolie::Value(byteArrayResult); data.children(JolieMessage::Field::RESULT) << Jolie::Value(byteArrayResult);
response.setData(data); response.setData(data);
if (job->error()) { if (job->error()) {
response.setFault(Jolie::Fault(job->errorString().toAscii())); response.setFault(Jolie::Fault(job->errorString().toLatin1()));
} }
QByteArray id = JolieMessage::field(JolieMessage::Field::IDENTITYID, message); QByteArray id = JolieMessage::field(JolieMessage::Field::IDENTITYID, message);
@ -367,7 +367,7 @@ Jolie::Message ServiceProvider::appendToken(Jolie::Message message,
const QByteArray &caller, const QByteArray &caller,
const QByteArray &uuid) const QByteArray &uuid)
{ {
m_tokens[caller + uuid] = QUuid::createUuid().toString().toAscii(); m_tokens[caller + uuid] = QUuid::createUuid().toString().toLatin1();
//kDebug() << "setting token: " << m_tokens[caller + uuid].toBase64() //kDebug() << "setting token: " << m_tokens[caller + uuid].toBase64()
//<< " for caller: " << caller.toBase64() //<< " for caller: " << caller.toBase64()
//<< " with uuid caller: " << uuid.toBase64(); //<< " with uuid caller: " << uuid.toBase64();

4
remote/credentials.cpp
View File

@ -113,7 +113,7 @@ Credentials Credentials::createCredentials(const QString &name)
QCA::KeyGenerator generator; QCA::KeyGenerator generator;
QCA::PrivateKey key = generator.createRSA(2048); QCA::PrivateKey key = generator.createRSA(2048);
QString pemKey(key.toPublicKey().toPEM()); QString pemKey(key.toPublicKey().toPEM());
QString id = QCryptographicHash::hash(pemKey.toAscii(), QCryptographicHash::Sha1); QString id = QCryptographicHash::hash(pemKey.toLatin1(), QCryptographicHash::Sha1);
return Credentials(id, name, key.toPEM(), true); return Credentials(id, name, key.toPEM(), true);
#else #else
return Credentials(); return Credentials();
@ -147,7 +147,7 @@ bool Credentials::isValid() const
if (d->publicKey.isNull()) { if (d->publicKey.isNull()) {
return false; return false;
} else { } else {
QString id = QCryptographicHash::hash(d->publicKey.toPEM().toAscii(), QCryptographicHash::Sha1); QString id = QCryptographicHash::hash(d->publicKey.toPEM().toLatin1(), QCryptographicHash::Sha1);
return (id == d->id); return (id == d->id);
} }
#else #else

14
remote/signing.cpp
View File

@ -72,7 +72,7 @@ SigningPrivate::SigningPrivate(Signing *auth, const QString &path)
KUser user; KUser user;
m_keystorePath.append(user.homeDir()).append("/.gnupg/"); m_keystorePath.append(user.homeDir()).append("/.gnupg/");
} else { } else {
error = m_gpgContext->setEngineHomeDirectory(m_keystorePath.toAscii().data()); error = m_gpgContext->setEngineHomeDirectory(m_keystorePath.toLatin1().data());
if (error) { if (error) {
#ifndef NDEBUG #ifndef NDEBUG
kDebug() << "Failed setting custom gpg keystore directory: using default."; kDebug() << "Failed setting custom gpg keystore directory: using default.";
@ -130,7 +130,7 @@ void SigningPrivate::registerUltimateTrustKeys()
foreach (QString keyFile, keyFiles) { foreach (QString keyFile, keyFiles) {
FILE *fp; FILE *fp;
fp = fopen(keyFile.toAscii().data(), "r"); fp = fopen(keyFile.toLatin1().data(), "r");
GpgME::Data data(fp); GpgME::Data data(fp);
GpgME::ImportResult iRes = m_gpgContext->importKeys(data); GpgME::ImportResult iRes = m_gpgContext->importKeys(data);
if (iRes.error()) { if (iRes.error()) {
@ -364,7 +364,7 @@ void SigningPrivate::keyAdded(const QString &path)
m_keystoreDir->stopScan(); m_keystoreDir->stopScan();
FILE *fp; FILE *fp;
fp = fopen(path.toAscii().data(), "r"); fp = fopen(path.toLatin1().data(), "r");
GpgME::Data data(fp); GpgME::Data data(fp);
GpgME::ImportResult iRes = m_gpgContext->importKeys(data); GpgME::ImportResult iRes = m_gpgContext->importKeys(data);
@ -455,7 +455,7 @@ QStringList SigningPrivate::signersOf(const QString id) const
{ {
QStringList result; QStringList result;
GpgME::Error error; GpgME::Error error;
GpgME::Key key = m_gpgContext->key(id.toAscii().data(), error); GpgME::Key key = m_gpgContext->key(id.toLatin1().data(), error);
if (!error) { if (!error) {
for (unsigned int i = 0; i < key.numUserIDs(); ++i) { for (unsigned int i = 0; i < key.numUserIDs(); ++i) {
@ -510,13 +510,13 @@ TrustLevel Signing::trustLevelOf(const QString &keyID) const
for (int i = (int)Plasma::UnverifiableTrust; i <= (int)Plasma::UltimatelyTrusted; ++i) { for (int i = (int)Plasma::UnverifiableTrust; i <= (int)Plasma::UltimatelyTrusted; ++i) {
QSet<QByteArray> tmp = d->keys[(Plasma::TrustLevel)i]; QSet<QByteArray> tmp = d->keys[(Plasma::TrustLevel)i];
foreach (QByteArray key, tmp) { foreach (QByteArray key, tmp) {
if (key.contains(keyID.toAscii().data())) { if (key.contains(keyID.toLatin1().data())) {
return (Plasma::TrustLevel)i; return (Plasma::TrustLevel)i;
} }
} }
} }
return d->addKeyToCache(keyID.toAscii()); return d->addKeyToCache(keyID.toLatin1());
} }
QString Signing::signerOf(const Package &package) const QString Signing::signerOf(const Package &package) const
@ -649,7 +649,7 @@ QString Signing::descriptiveString(const QString &keyID) const
} }
GpgME::Error error; GpgME::Error error;
GpgME::Key key = d->m_gpgContext->key(keyID.toAscii().data(), error); GpgME::Key key = d->m_gpgContext->key(keyID.toLatin1().data(), error);
if (error) { if (error) {
return QString(); return QString();
} }