From 71b63dcd6a0144f29e30d727ea9195f81d73d9ef Mon Sep 17 00:00:00 2001 From: lupoDharkael Date: Wed, 24 Jan 2018 01:27:25 +0100 Subject: [PATCH] Maintain config compatibility until 1.0 --- src/main.cpp | 3 ++- src/utils/confighandler.cpp | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8c65ffe0..fca067fa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,7 +36,8 @@ int main(int argc, char *argv[]) { // required for the button serialization - qRegisterMetaTypeStreamOperators >("QVector"); + // TODO: change to QVector in v1.0 + qRegisterMetaTypeStreamOperators >("QList"); qApp->setApplicationVersion(static_cast(APP_VERSION)); QTranslator translator; diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp index 5797fea1..52a9d966 100644 --- a/src/utils/confighandler.cpp +++ b/src/utils/confighandler.cpp @@ -28,10 +28,12 @@ ConfigHandler::ConfigHandler(){ QVector ConfigHandler::getButtons() { QVector buttons; if (m_settings.contains("buttons")) { - QVector buttonsInt = m_settings.value("buttons").value >(); + // TODO: remove toList in v1.0 + QVector buttonsInt = + m_settings.value("buttons").value >().toVector(); bool modified = normalizeButtons(buttonsInt); if (modified) { - m_settings.setValue("buttons", QVariant::fromValue(buttonsInt)); + m_settings.setValue("buttons", QVariant::fromValue(buttonsInt.toList())); } buttons = fromIntToButton(buttonsInt); } else { @@ -43,7 +45,8 @@ QVector ConfigHandler::getButtons() { void ConfigHandler::setButtons(const QVector &buttons) { QVector l = fromButtonToInt(buttons); normalizeButtons(l); - m_settings.setValue("buttons", QVariant::fromValue(l)); + // TODO: remove toList in v1.0 + m_settings.setValue("buttons", QVariant::fromValue(l.toList())); } QVector ConfigHandler::getUserColors() { @@ -241,7 +244,8 @@ void ConfigHandler::setAllTheButtons() { for (const CaptureButton::ButtonType t: listTypes) { buttons << static_cast(t); } - m_settings.setValue("buttons", QVariant::fromValue(buttons)); + // TODO: remove toList in v1.0 + m_settings.setValue("buttons", QVariant::fromValue(buttons.toList())); } QString ConfigHandler::configFilePath() const {