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

SVN_SILENT: style fixes

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1026383
This commit is contained in:
Aaron J. Seigo 2009-09-21 16:48:19 +00:00
parent 66fb9378c0
commit 2590b21978
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
remote/credentials.cpp
View File

@ -45,11 +45,11 @@ public:
name(name) name(name)
{ {
#ifdef ENABLE_REMOTE_WIDGETS #ifdef ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) { if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES; kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return; return;
} }
if (isPrivateKey) { if (isPrivateKey) {
privateKey = QCA::PrivateKey::fromPEM(pemKey); privateKey = QCA::PrivateKey::fromPEM(pemKey);
publicKey = privateKey.toPublicKey(); publicKey = privateKey.toPublicKey();
@ -104,8 +104,8 @@ Credentials Credentials::createCredentials(const QString &name)
{ {
#ifdef ENABLE_REMOTE_WIDGETS #ifdef ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) { if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES; kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return Credentials(); return Credentials();
} }
QCA::KeyGenerator generator; QCA::KeyGenerator generator;
@ -138,8 +138,8 @@ bool Credentials::isValid() const
{ {
#ifdef ENABLE_REMOTE_WIDGETS #ifdef ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) { if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES; kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return false; return false;
} }
if (d->publicKey.isNull()) { if (d->publicKey.isNull()) {
@ -168,8 +168,8 @@ bool Credentials::isValidSignature(const QByteArray &signature, const QByteArray
{ {
#ifdef ENABLE_REMOTE_WIDGETS #ifdef ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) { if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES; kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return false; return false;
} }
if (d->publicKey.canVerify()) { if (d->publicKey.canVerify()) {
@ -193,8 +193,8 @@ bool Credentials::canSign() const
{ {
#ifdef ENABLE_REMOTE_WIDGETS #ifdef ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) { if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES; kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return false; return false;
} }
return d->privateKey.canSign(); return d->privateKey.canSign();
@ -238,10 +238,10 @@ QDataStream &operator<<(QDataStream &out, const Credentials &myObj)
{ {
#ifdef ENABLE_REMOTE_WIDGETS #ifdef ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) { if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES; kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return out; return out;
} }
QString privateKeyPem; QString privateKeyPem;
QString publicKeyPem; QString publicKeyPem;
@ -262,10 +262,10 @@ QDataStream &operator>>(QDataStream &in, Credentials &myObj)
{ {
#ifdef ENABLE_REMOTE_WIDGETS #ifdef ENABLE_REMOTE_WIDGETS
if (!QCA::isSupported(REQUIRED_FEATURES)) { if (!QCA::isSupported(REQUIRED_FEATURES)) {
kWarning() << "QCA doesn't support " << REQUIRED_FEATURES; kWarning() << "QCA doesn't support " << REQUIRED_FEATURES;
return in; return in;
} }
QString privateKeyString; QString privateKeyString;
QString publicKeyString; QString publicKeyString;
uint version; uint version;
@ -277,6 +277,7 @@ QDataStream &operator>>(QDataStream &in, Credentials &myObj)
myObj.d->privateKey = QCA::PrivateKey::fromPEM(privateKeyString, myObj.d->privateKey = QCA::PrivateKey::fromPEM(privateKeyString,
QByteArray(), &conversionResult); QByteArray(), &conversionResult);
} }
if (!publicKeyString.isEmpty()) { if (!publicKeyString.isEmpty()) {
myObj.d->publicKey = QCA::PublicKey::fromPEM(publicKeyString, &conversionResult); myObj.d->publicKey = QCA::PublicKey::fromPEM(publicKeyString, &conversionResult);
} }