/***************************************************************************
- * Copyright (C) 2005-2015 by the Quassel Project *
+ * Copyright (C) 2005-2019 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "presetnetworks.h"
+
#include <QSettings>
-#include "presetnetworks.h"
#include "quassel.h"
QString PresetNetworks::_networksIniPath = QString();
if (_networksIniPath.isNull()) {
_networksIniPath = Quassel::findDataFilePath("networks.ini");
if (_networksIniPath.isNull()) {
- _networksIniPath = ""; // now we won't check again, as it's not null anymore
+ _networksIniPath = ""; // now we won't check again, as it's not null anymore
return QStringList();
}
}
if (!networks.isEmpty()) {
// we sort the list case-insensitive
QMap<QString, QString> sorted;
- foreach(QString net, networks) {
+ foreach (QString net, networks) {
if (onlyDefault && !s.value(QString("%1/Default").arg(net)).toBool())
continue;
sorted[net.toLower()] = net;
return QStringList();
}
-
-QStringList PresetNetworks::defaultChannels(const QString &networkName)
+QStringList PresetNetworks::defaultChannels(const QString& networkName)
{
- if (_networksIniPath.isEmpty()) // be sure to have called presetNetworks() first, else this always fails
+ if (_networksIniPath.isEmpty()) // be sure to have called presetNetworks() first, else this always fails
return QStringList();
QSettings s(_networksIniPath, QSettings::IniFormat);
return s.value(QString("%1/DefaultChannels").arg(networkName)).toStringList();
}
-
-NetworkInfo PresetNetworks::networkInfo(const QString &networkName)
+NetworkInfo PresetNetworks::networkInfo(const QString& networkName)
{
NetworkInfo info;
if (!_networksIniPath.isEmpty()) {
info.networkName = networkName;
QSettings s(_networksIniPath, QSettings::IniFormat);
s.beginGroup(info.networkName);
- foreach(QString server, s.value("Servers").toStringList()) {
+ foreach (QString server, s.value("Servers").toStringList()) {
bool ssl = false;
QStringList splitserver = server.split(':', QString::SkipEmptyParts);
if (splitserver.count() != 2) {
qWarning() << "Invalid port entry in networks.conf:" << server;
continue;
}
- info.serverList << Network::Server(splitserver[0].trimmed(), port, QString(), ssl);
+ // TODO Should networks.conf be modified to allow requiring SSL?
+ info.serverList << Network::Server(splitserver[0].trimmed(), port, QString(), ssl, false);
}
}
return info;