/***************************************************************************
- * Copyright (C) 2005-2019 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include <utility>
#include <QHostAddress>
+#include <QSslSocket>
#include <QStringList>
-#ifdef HAVE_SSL
-# include <QSslSocket>
-#endif
#include "client.h"
#include "quassel.h"
QVariantMap variants;
QHash<int, BufferId>::const_iterator mapIter = keyMap.constBegin();
while (mapIter != keyMap.constEnd()) {
- variants[QString::number(mapIter.key())] = qVariantFromValue(mapIter.value());
+ variants[QString::number(mapIter.key())] = QVariant::fromValue(mapIter.value());
++mapIter;
}
setAccountValue("JumpKeyMap", variants);
{
QVariantList variants;
foreach (int viewId, viewIds) {
- variants << qVariantFromValue(viewId);
+ variants << QVariant::fromValue(viewId);
}
setAccountValue("BufferViewOverlay", variants);
}
NotificationSettings::HighlightNickType NotificationSettings::highlightNick() const
{
- return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", CurrentNick).toInt();
+ return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", NoNick).toInt();
}
void NotificationSettings::setNicksCaseSensitive(bool cs)