From 11585e2fccf742798ab3396726f87323b54b3ac9 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Tue, 3 Feb 2015 18:51:20 +0100 Subject: skip empty parts when parsing the default value for string lists, skip empty parts also, an empty string means an empty list (not a list containing an empty string) --- src/gui/kconfigloader.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/gui/kconfigloader.cpp') diff --git a/src/gui/kconfigloader.cpp b/src/gui/kconfigloader.cpp index acccf91c..3121c3b7 100644 --- a/src/gui/kconfigloader.cpp +++ b/src/gui/kconfigloader.cpp @@ -238,8 +238,9 @@ void ConfigLoaderHandler::addItem() item = m_config->addItemString(m_name, *d->newString(), m_default, m_key); } else if (m_type == QStringLiteral("stringlist")) { //FIXME: the split() is naive and will break on lists with ,'s in them + //empty parts are not wanted in this case item = m_config->addItemStringList(m_name, *d->newStringList(), - m_default.split(QLatin1Char(',')), m_key); + m_default.split(QLatin1Char(','), QString::SkipEmptyParts), m_key); } else if (m_type == QStringLiteral("uint")) { KConfigSkeleton::ItemUInt *uintItem = m_config->addItemUInt(m_name, *d->newUint(), m_default.toUInt(), m_key); -- cgit v1.2.1