/***************************************************************************
- * Copyright (C) 2005-2015 by the Quassel Project *
+ * Copyright (C) 2005-2018 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 <utility>
+
#include <QStringList>
#include "clientsettings.h"
}
-ClientSettings::~ClientSettings()
-{
-}
-
-
/***********************************************************************************************/
-CoreAccountSettings::CoreAccountSettings(const QString &subgroup)
+CoreAccountSettings::CoreAccountSettings(QString subgroup)
: ClientSettings("CoreAccounts"),
- _subgroup(subgroup)
+ _subgroup(std::move(subgroup))
{
}
{
QSet<int> viewIds;
QVariantList variants = accountValue("BufferViewOverlay").toList();
- for (QVariantList::const_iterator iter = variants.constBegin(); iter != variants.constEnd(); iter++) {
+ for (QVariantList::const_iterator iter = variants.constBegin(); iter != variants.constEnd(); ++iter) {
viewIds << iter->toInt();
}
return viewIds;
CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettings::networkDetectionMode()
{
-#ifdef HAVE_KDE4
- NetworkDetectionMode def = UseSolid;
-#else
- NetworkDetectionMode def = UseQNetworkConfigurationManager;
-#endif
- return (NetworkDetectionMode)localValue("NetworkDetectionMode", def).toInt();
+ auto mode = localValue("NetworkDetectionMode", UseQNetworkConfigurationManager).toInt();
+ if (mode == 0)
+ mode = UseQNetworkConfigurationManager; // UseSolid is gone, map that to the new default
+ return static_cast<NetworkDetectionMode>(mode);
}
NotificationSettings::HighlightNickType NotificationSettings::highlightNick()
{
- return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", CurrentNick).toInt();
+ return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick",
+ CurrentNick).toInt();
}