projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show notices in current buffer by default
[quassel.git]
/
src
/
client
/
clientidentity.h
diff --git
a/src/client/clientidentity.h
b/src/client/clientidentity.h
index
680ac95
..
730b662
100644
(file)
--- a/
src/client/clientidentity.h
+++ b/
src/client/clientidentity.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-26,6
+26,7
@@
class ClientCertManager;
class CertIdentity : public Identity {
class ClientCertManager;
class CertIdentity : public Identity {
+ SYNCABLE_OBJECT
Q_OBJECT
public:
Q_OBJECT
public:
@@
-33,9
+34,14
@@
public:
CertIdentity(const Identity &other, QObject *parent = 0);
CertIdentity(const CertIdentity &other, QObject *parent = 0);
CertIdentity(const Identity &other, QObject *parent = 0);
CertIdentity(const CertIdentity &other, QObject *parent = 0);
- void enableEditSsl(bool enable = true);
+#ifdef HAVE_SSL
inline bool isDirty() const { return _isDirty; }
inline bool isDirty() const { return _isDirty; }
+#else
+ inline bool isDirty() const { return false; }
+#endif
+#ifdef HAVE_SSL
+ void enableEditSsl(bool enable = true);
inline const QSslKey &sslKey() const { return _sslKey; }
inline const QSslCertificate &sslCert() const { return _sslCert; }
inline const QSslKey &sslKey() const { return _sslKey; }
inline const QSslCertificate &sslCert() const { return _sslCert; }
@@
-56,11
+62,13
@@
private:
bool _isDirty;
QSslKey _sslKey;
QSslCertificate _sslCert;
bool _isDirty;
QSslKey _sslKey;
QSslCertificate _sslCert;
+#endif //HAVE_SSL
};
// ========================================
// ClientCertManager
// ========================================
};
// ========================================
// ClientCertManager
// ========================================
+#ifdef HAVE_SSL
class ClientCertManager : public CertManager {
Q_OBJECT
class ClientCertManager : public CertManager {
Q_OBJECT
@@
-77,5
+85,6
@@
public slots:
private:
CertIdentity *_certIdentity;
};
private:
CertIdentity *_certIdentity;
};
+#endif //HAVE_SSL
#endif //CLIENTIDENTITY_H
#endif //CLIENTIDENTITY_H