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

Convert #ifdef to #if

Browse Source
This commit is contained in:
Nicolas Lécureuil 2012-08-24 03:19:29 +02:00
parent d50d3a3162
commit d6902786bf
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
remote/credentials.cpp
View File

@ -22,7 +22,7 @@
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QObject> #include <QObject>
#ifdef ENABLE_REMOTE_WIDGETS #if ENABLE_REMOTE_WIDGETS
#include <QtCrypto> #include <QtCrypto>
#endif #endif
@ -46,7 +46,7 @@ public:
: id(id), : id(id),
name(name) name(name)
{ {
#ifdef ENABLE_REMOTE_WIDGETS #if 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;
@ -68,7 +68,7 @@ public:
QString id; QString id;
QString name; QString name;
#ifdef ENABLE_REMOTE_WIDGETS #if ENABLE_REMOTE_WIDGETS
QCA::PublicKey publicKey; QCA::PublicKey publicKey;
QCA::PrivateKey privateKey; QCA::PrivateKey privateKey;
#endif #endif
@ -104,7 +104,7 @@ Credentials &Credentials::operator=(const Credentials &other)
Credentials Credentials::createCredentials(const QString &name) Credentials Credentials::createCredentials(const QString &name)
{ {
#ifdef ENABLE_REMOTE_WIDGETS #if 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();
@ -138,7 +138,7 @@ TrustLevel Credentials::trustLevel() const
bool Credentials::isValid() const bool Credentials::isValid() const
{ {
#ifdef ENABLE_REMOTE_WIDGETS #if 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;
@ -170,7 +170,7 @@ QString Credentials::id() const
bool Credentials::isValidSignature(const QByteArray &signature, const QByteArray &payload) bool Credentials::isValidSignature(const QByteArray &signature, const QByteArray &payload)
{ {
#ifdef ENABLE_REMOTE_WIDGETS #if 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;
@ -199,7 +199,7 @@ bool Credentials::isValidSignature(const QByteArray &signature, const QByteArray
bool Credentials::canSign() const bool Credentials::canSign() const
{ {
#ifdef ENABLE_REMOTE_WIDGETS #if 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;
@ -213,7 +213,7 @@ bool Credentials::canSign() const
QByteArray Credentials::signMessage(const QByteArray &message) QByteArray Credentials::signMessage(const QByteArray &message)
{ {
#ifdef ENABLE_REMOTE_WIDGETS #if ENABLE_REMOTE_WIDGETS
if(!QCA::isSupported(REQUIRED_FEATURES)) { if(!QCA::isSupported(REQUIRED_FEATURES)) {
#ifndef NDEBUG #ifndef NDEBUG
kDebug() << "RSA not supported"; kDebug() << "RSA not supported";
@ -235,7 +235,7 @@ QByteArray Credentials::signMessage(const QByteArray &message)
Credentials Credentials::toPublicCredentials() const Credentials Credentials::toPublicCredentials() const
{ {
#ifdef ENABLE_REMOTE_WIDGETS #if ENABLE_REMOTE_WIDGETS
Credentials result(*this); Credentials result(*this);
result.d->privateKey = QCA::PrivateKey(); result.d->privateKey = QCA::PrivateKey();
return result; return result;
@ -246,7 +246,7 @@ Credentials Credentials::toPublicCredentials() const
QDataStream &operator<<(QDataStream &out, const Credentials &myObj) QDataStream &operator<<(QDataStream &out, const Credentials &myObj)
{ {
#ifdef ENABLE_REMOTE_WIDGETS #if 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;
@ -270,7 +270,7 @@ QDataStream &operator<<(QDataStream &out, const Credentials &myObj)
QDataStream &operator>>(QDataStream &in, Credentials &myObj) QDataStream &operator>>(QDataStream &in, Credentials &myObj)
{ {
#ifdef ENABLE_REMOTE_WIDGETS #if 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;