/***************************************************************************
- * Copyright (C) 2005-2013 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 *
#include "uisettings.h"
+#include <utility>
+
#include "action.h"
#include "actioncollection.h"
-UiSettings::UiSettings(const QString &group)
- : ClientSettings(group)
+UiSettings::UiSettings(QString group)
+ : ClientSettings(std::move(group))
+{}
+
+void UiSettings::setValue(const QString& key, const QVariant& data)
{
+ setLocalValue(key, data);
}
-
-/**************************************************************************/
-
-UiStyleSettings::UiStyleSettings() : UiSettings("UiStyle") {}
-UiStyleSettings::UiStyleSettings(const QString &subGroup) : UiSettings(QString("UiStyle/%1").arg(subGroup))
+QVariant UiSettings::value(const QString& key, const QVariant& def) const
{
+ return localValue(key, def);
}
+bool UiSettings::valueExists(const QString& key) const
+{
+ return localKeyExists(key);
+}
-void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, QTextCharFormat format)
+void UiSettings::remove(const QString& key)
{
- setLocalValue(QString("Format/%1").arg(ftype), format);
+ removeLocalKey(key);
}
+/**************************************************************************/
+
+UiStyleSettings::UiStyleSettings()
+ : UiSettings("UiStyle")
+{}
-QTextCharFormat UiStyleSettings::customFormat(UiStyle::FormatType ftype)
+UiStyleSettings::UiStyleSettings(const QString& subGroup)
+ : UiSettings(QString("UiStyle/%1").arg(subGroup))
+{}
+
+void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, const QTextCharFormat& format)
{
- return localValue(QString("Format/%1").arg(ftype), QTextFormat()).value<QTextFormat>().toCharFormat();
+ setLocalValue(QString("Format/%1").arg(static_cast<quint32>(ftype)), format);
}
+QTextCharFormat UiStyleSettings::customFormat(UiStyle::FormatType ftype) const
+{
+ return localValue(QString("Format/%1").arg(static_cast<quint32>(ftype)), QTextFormat()).value<QTextFormat>().toCharFormat();
+}
void UiStyleSettings::removeCustomFormat(UiStyle::FormatType ftype)
{
- removeLocalKey(QString("Format/%1").arg(ftype));
+ removeLocalKey(QString("Format/%1").arg(static_cast<quint32>(ftype)));
}
-
-QList<UiStyle::FormatType> UiStyleSettings::availableFormats()
+QList<UiStyle::FormatType> UiStyleSettings::availableFormats() const
{
QList<UiStyle::FormatType> formats;
QStringList list = localChildKeys("Format");
- foreach(QString type, list) {
+ foreach (QString type, list) {
formats << (UiStyle::FormatType)type.toInt();
}
return formats;
}
-
/**************************************************************************
* SessionSettings
**************************************************************************/
-SessionSettings::SessionSettings(const QString &sessionId, const QString &group)
- : UiSettings(group), _sessionId(sessionId)
-{
-}
+SessionSettings::SessionSettings(QString sessionId, QString group)
+ : UiSettings(std::move(group))
+ , _sessionId(std::move(sessionId))
+{}
-
-void SessionSettings::setValue(const QString &key, const QVariant &data)
+void SessionSettings::setValue(const QString& key, const QVariant& data)
{
setLocalValue(QString("%1/%2").arg(_sessionId, key), data);
}
-
-QVariant SessionSettings::value(const QString &key, const QVariant &def)
+QVariant SessionSettings::value(const QString& key, const QVariant& def) const
{
return localValue(QString("%1/%2").arg(_sessionId, key), def);
}
-
-void SessionSettings::removeKey(const QString &key)
+void SessionSettings::removeKey(const QString& key)
{
removeLocalKey(QString("%1/%2").arg(_sessionId, key));
}
-
void SessionSettings::cleanup()
{
QStringList sessions = localChildGroups();
QString str;
SessionSettings s(sessionId());
- foreach(str, sessions) {
+ foreach (str, sessions) {
// load session and check age
s.setSessionId(str);
if (s.sessionAge() > 3) {
}
}
+QString SessionSettings::sessionId() const
+{
+ return _sessionId;
+}
+
+void SessionSettings::setSessionId(QString sessionId)
+{
+ _sessionId = std::move(sessionId);
+}
int SessionSettings::sessionAge()
{
}
else {
// no int saved, delete session
- //qDebug() << QString("deleting invalid session %1 (invalid session age found)").arg(_sessionId);
+ // qDebug() << QString("deleting invalid session %1 (invalid session age found)").arg(_sessionId);
removeSession();
}
return 10;
}
-
void SessionSettings::removeSession()
{
QStringList keys = localChildKeys(sessionId());
- foreach(QString k, keys) {
+ foreach (QString k, keys) {
removeKey(k);
}
}
-
void SessionSettings::setSessionAge(int age)
{
setValue(QString("_sessionAge"), age);
}
-
void SessionSettings::sessionAging()
{
QStringList sessions = localChildGroups();
QString str;
SessionSettings s(sessionId());
- foreach(str, sessions) {
+ foreach (str, sessions) {
// load session and check age
s.setSessionId(str);
- s.setSessionAge(s.sessionAge()+1);
+ s.setSessionAge(s.sessionAge() + 1);
}
}
-
/**************************************************************************
* ShortcutSettings
**************************************************************************/
-ShortcutSettings::ShortcutSettings() : UiSettings("Shortcuts")
-{
-}
-
+ShortcutSettings::ShortcutSettings()
+ : UiSettings("Shortcuts")
+{}
void ShortcutSettings::clear()
{
- foreach(const QString &key, allLocalKeys())
- removeLocalKey(key);
+ for (auto&& key : allLocalKeys()) {
+ removeLocalKey(key);
+ }
}
-
-QStringList ShortcutSettings::savedShortcuts()
+QStringList ShortcutSettings::savedShortcuts() const
{
return localChildKeys();
}
-
-QKeySequence ShortcutSettings::loadShortcut(const QString &name)
+QKeySequence ShortcutSettings::loadShortcut(const QString& name) const
{
return localValue(name, QKeySequence()).value<QKeySequence>();
}
-
-void ShortcutSettings::saveShortcut(const QString &name, const QKeySequence &seq)
+void ShortcutSettings::saveShortcut(const QString& name, const QKeySequence& seq)
{
setLocalValue(name, seq);
}