projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Always let QVariant::fromValue() deduce the type
[quassel.git]
/
src
/
core
/
coreidentity.h
diff --git
a/src/core/coreidentity.h
b/src/core/coreidentity.h
index
a211a72
..
573f9c5
100644
(file)
--- a/
src/core/coreidentity.h
+++ b/
src/core/coreidentity.h
@@
-20,6
+20,8
@@
#pragma once
#pragma once
+#include "core-export.h"
+
#include "identity.h"
#ifdef HAVE_SSL
#include "identity.h"
#ifdef HAVE_SSL
@@
-34,12
+36,12
@@
class SignalProxy;
// ========================================
#ifdef HAVE_SSL
class CoreIdentity;
// ========================================
#ifdef HAVE_SSL
class CoreIdentity;
-class CoreCertManager : public CertManager
+class C
ORE_EXPORT C
oreCertManager : public CertManager
{
Q_OBJECT
public:
{
Q_OBJECT
public:
- CoreCertManager(CoreIdentity
&
identity);
+ CoreCertManager(CoreIdentity
*
identity);
# ifdef HAVE_SSL
const QSslKey& sslKey() const override;
# ifdef HAVE_SSL
const QSslKey& sslKey() const override;
@@
-53,7
+55,7
@@
public slots:
void setId(IdentityId id);
private:
void setId(IdentityId id);
private:
- CoreIdentity
& identity
;
+ CoreIdentity
* _identity{nullptr}
;
};
#endif // HAVE_SSL
};
#endif // HAVE_SSL
@@
-61,7
+63,7
@@
private:
// =========================================
// CoreIdentity
// =========================================
// =========================================
// CoreIdentity
// =========================================
-class CoreIdentity : public Identity
+class C
ORE_EXPORT C
oreIdentity : public Identity
{
Q_OBJECT
{
Q_OBJECT
@@
-81,8
+83,6
@@
public:
void setSslCert(const QByteArray& encoded);
#endif /* HAVE_SSL */
void setSslCert(const QByteArray& encoded);
#endif /* HAVE_SSL */
- CoreIdentity& operator=(const CoreIdentity& identity);
-
private:
#ifdef HAVE_SSL
QSslKey _sslKey;
private:
#ifdef HAVE_SSL
QSslKey _sslKey;
@@
-95,12
+95,12
@@
private:
#ifdef HAVE_SSL
inline const QSslKey& CoreCertManager::sslKey() const
{
#ifdef HAVE_SSL
inline const QSslKey& CoreCertManager::sslKey() const
{
- return
identity.
sslKey();
+ return
_identity->
sslKey();
}
inline const QSslCertificate& CoreCertManager::sslCert() const
{
}
inline const QSslCertificate& CoreCertManager::sslCert() const
{
- return
identity.
sslCert();
+ return
_identity->
sslCert();
}
#endif
}
#endif