X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fpresetnetworks.cpp;h=99ebeee412721d5cc57e237787ed717761110d60;hp=9f8b31d8e4503d114ed0d830a21fa4e30365a6ef;hb=95848fd9232d92f388e0e533adb15f6ba9d2d492;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf diff --git a/src/common/presetnetworks.cpp b/src/common/presetnetworks.cpp index 9f8b31d8..99ebeee4 100644 --- a/src/common/presetnetworks.cpp +++ b/src/common/presetnetworks.cpp @@ -18,9 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include "presetnetworks.h" + #include -#include "presetnetworks.h" #include "quassel.h" QString PresetNetworks::_networksIniPath = QString(); @@ -34,7 +35,7 @@ QStringList PresetNetworks::names(bool onlyDefault) 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(); } } @@ -44,7 +45,7 @@ QStringList PresetNetworks::names(bool onlyDefault) if (!networks.isEmpty()) { // we sort the list case-insensitive QMap sorted; - foreach(QString net, networks) { + foreach (QString net, networks) { if (onlyDefault && !s.value(QString("%1/Default").arg(net)).toBool()) continue; sorted[net.toLower()] = net; @@ -55,24 +56,22 @@ QStringList PresetNetworks::names(bool onlyDefault) 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) {