Merge pull request #125 from schaal/sslcert

[quassel.git] / src / core / sslserver.h

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index dbf2802..9b69a8c 100644 (file)
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -43,8 +43,13 @@ public:
     virtual inline bool isCertValid() const { return _isCertValid; }
 
 protected:
+#if QT_VERSION >= 0x050000
+    virtual void incomingConnection(qintptr socketDescriptor);
+#else
     virtual void incomingConnection(int socketDescriptor);
-    virtual bool setCertificate(const QString &path);
+#endif
+
+    virtual bool setCertificate(const QString &path, const QString &keyPath);
 
 private:
     QLinkedList<QTcpSocket *> _pendingConnections;