projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #102 from mamarley/qcaqt5
[quassel.git]
/
src
/
core
/
sslserver.h
diff --git
a/src/core/sslserver.h
b/src/core/sslserver.h
index
d8a8bba
..
bd72f29
100644
(file)
--- a/
src/core/sslserver.h
+++ b/
src/core/sslserver.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
2
by the Quassel Project *
+ * Copyright (C) 2005-201
5
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 *
@@
-43,7
+43,12
@@
public:
virtual inline bool isCertValid() const { return _isCertValid; }
protected:
virtual inline bool isCertValid() const { return _isCertValid; }
protected:
+#if QT_VERSION >= 0x050000
+ virtual void incomingConnection(qintptr socketDescriptor);
+#else
virtual void incomingConnection(int socketDescriptor);
virtual void incomingConnection(int socketDescriptor);
+#endif
+
virtual bool setCertificate(const QString &path);
private:
virtual bool setCertificate(const QString &path);
private: