- Use QSslConfiguration instead of modifying QSslSocket directly
- Use default constructors instead of nullptr for empty QFlags
query.bindValue(":lastseenmsgid", lastSeenMsgId.toQint64());
safeExec(query);
watchQuery(query);
query.bindValue(":lastseenmsgid", lastSeenMsgId.toQint64());
safeExec(query);
watchQuery(query);
- Message::Types result = Message::Types(nullptr);
+ Message::Types result{};
if (query.first())
result = Message::Types(query.value(0).toInt());
return result;
if (query.first())
result = Message::Types(query.value(0).toInt());
return result;
QSqlDatabase db = logDb();
db.transaction();
QSqlDatabase db = logDb();
db.transaction();
- Message::Types result = Message::Types(nullptr);
+ Message::Types result{};
{
QSqlQuery query(db);
query.prepare(queryString("select_buffer_bufferactivity"));
{
QSqlQuery query(db);
query.prepare(queryString("select_buffer_bufferactivity"));
#include "sslserver.h"
#include <QDateTime>
#include "sslserver.h"
#include <QDateTime>
+#include <QSslConfiguration>
#include <QSslSocket>
#include "core.h"
#include <QSslSocket>
#include "core.h"
auto* socket = new QSslSocket(this);
if (socket->setSocketDescriptor(socketDescriptor)) {
if (isCertValid()) {
auto* socket = new QSslSocket(this);
if (socket->setSocketDescriptor(socketDescriptor)) {
if (isCertValid()) {
- socket->setLocalCertificate(_cert);
- socket->setPrivateKey(_key);
- socket->addCaCertificates(_ca);
+ auto config = socket->sslConfiguration();
+ config.setLocalCertificate(_cert);
+ config.setPrivateKey(_key);
+ auto certificates = config.caCertificates();
+ certificates += _ca;
+ config.setCaCertificates(certificates);
+ socket->setSslConfiguration(config);
}
addPendingConnection(socket);
}
}
addPendingConnection(socket);
}
-void SslServer::setMetricsServer(MetricsServer* metricsServer) {
+void SslServer::setMetricsServer(MetricsServer* metricsServer)
+{
_metricsServer = metricsServer;
if (_metricsServer) {
_metricsServer->setCertificateExpires(_certificateExpires);
_metricsServer = metricsServer;
if (_metricsServer) {
_metricsServer->setCertificateExpires(_certificateExpires);