projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssl: Remove fallback code for missing SSL support
[quassel.git]
/
src
/
core
/
core.h
diff --git
a/src/core/core.h
b/src/core/core.h
index
d2b8092
..
4428f02
100644
(file)
--- a/
src/core/core.h
+++ b/
src/core/core.h
@@
-27,19
+27,11
@@
#include <QDateTime>
#include <QPointer>
#include <QDateTime>
#include <QPointer>
+#include <QSslSocket>
#include <QString>
#include <QTimer>
#include <QVariant>
#include <QString>
#include <QTimer>
#include <QVariant>
-#ifdef HAVE_SSL
-# include <QSslSocket>
-
-# include "sslserver.h"
-#else
-# include <QTcpServer>
-# include <QTcpSocket>
-#endif
-
#include "authenticator.h"
#include "bufferinfo.h"
#include "deferredptr.h"
#include "authenticator.h"
#include "bufferinfo.h"
#include "deferredptr.h"
@@
-49,6
+41,7
@@
#include "oidentdconfiggenerator.h"
#include "sessionthread.h"
#include "singleton.h"
#include "oidentdconfiggenerator.h"
#include "sessionthread.h"
#include "singleton.h"
+#include "sslserver.h"
#include "storage.h"
#include "types.h"
#include "storage.h"
#include "types.h"
@@
-781,11
+774,7
@@
private:
QTimer _storageSyncTimer;
QTimer _storageSyncTimer;
-#ifdef HAVE_SSL
SslServer _server, _v6server;
SslServer _server, _v6server;
-#else
- QTcpServer _server, _v6server;
-#endif
OidentdConfigGenerator* _oidentdConfigGenerator{nullptr};
OidentdConfigGenerator* _oidentdConfigGenerator{nullptr};