From 423927310882669e70f318688945bd4e51a847f7 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Fri, 29 Jan 2010 22:46:40 +0000 Subject: Minimize unnecessary accesses to SystemInfo and RbSettings. With the separation of the SystemInfo values accessing all the values will create traces, making them rather noisy due to unnecessary multiple accesses. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24373 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/base/rbsettings.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'rbutil/rbutilqt/base/rbsettings.cpp') diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp index 98d5b331b7..37f01c6c1c 100644 --- a/rbutil/rbutilqt/base/rbsettings.cpp +++ b/rbutil/rbutilqt/base/rbsettings.cpp @@ -165,16 +165,19 @@ void RbSettings::setSubValue(QString sub, enum UserSettings setting, QVariant va QString RbSettings::constructSettingPath(QString path, QString substitute) { - QString platform = userSettings->value("platform").toString(); - if(!substitute.isEmpty()) { - path.replace(":tts:", substitute); - path.replace(":encoder:", substitute); - } - else { - path.replace(":tts:", userSettings->value("tts").toString()); - path.replace(":encoder:", SystemInfo::platformValue(platform,SystemInfo::CurEncoder).toString()); + // anything to substitute? + if(path.contains(':')) { + QString platform = userSettings->value("platform").toString(); + if(!substitute.isEmpty()) { + path.replace(":tts:", substitute); + path.replace(":encoder:", substitute); + } + else { + path.replace(":tts:", userSettings->value("tts").toString()); + path.replace(":encoder:", SystemInfo::platformValue(platform,SystemInfo::CurEncoder).toString()); + } + path.replace(":platform:", platform); } - path.replace(":platform:", platform); return path; } -- cgit v1.2.3