projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding code for migrating settings and database to the new location
[quassel.git]
/
src
/
core
/
coreidentity.h
diff --git
a/src/core/coreidentity.h
b/src/core/coreidentity.h
index
0f13577
..
57b39e0
100644
(file)
--- a/
src/core/coreidentity.h
+++ b/
src/core/coreidentity.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 *
@@
-41,8
+41,6
@@
class CoreCertManager : public CertManager {
public:
CoreCertManager(CoreIdentity &identity);
public:
CoreCertManager(CoreIdentity &identity);
- void setId(IdentityId id);
-
#ifdef HAVE_SSL
virtual const QSslKey &sslKey() const;
virtual const QSslCertificate &sslCert() const;
#ifdef HAVE_SSL
virtual const QSslKey &sslKey() const;
virtual const QSslCertificate &sslCert() const;
@@
-52,6
+50,8
@@
public slots:
virtual void setSslCert(const QByteArray &encoded);
#endif
virtual void setSslCert(const QByteArray &encoded);
#endif
+ void setId(IdentityId id);
+
private:
CoreIdentity &identity;
};
private:
CoreIdentity &identity;
};