summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNiels Weber <niels.weber@digia.com>2013-03-21 12:52:25 +0100
committerNiels Weber <niels.weber@digia.com>2013-03-21 16:33:41 +0100
commitf2521981f09a066bd9d3c1a0864483e0e6d823d7 (patch)
tree266e41741047c32d239fd1b12a0275380ff7f36f /src
parentf65954d9033cbd1d342ecb6c202920a0df992dc7 (diff)
Remove blacklist as it is no longer necessary.
Change-Id: Ia6c003694b7297c30b019db3882375127ff04c03 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/libs/installer/settings.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index 36a35fc87..9fc31c3cb 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -190,9 +190,6 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix)
<< scRepositorySettingsPageVisible << scTargetConfigurationFile
<< scRemoteRepositories;
- QStringList blackList;
- blackList << scRemoteRepositories;
-
Settings s;
s.d->m_data.insert(scPrefix, prefix);
while (reader.readNextStartElement()) {
@@ -207,12 +204,12 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix)
if (name == scIcon)
qWarning() << "Deprecated element 'Icon'.";
- if (blackList.contains(name)) {
- if (name == scRemoteRepositories)
- s.addDefaultRepositories(readRepositories(reader, true));
+ if (s.d->m_data.contains(name))
+ reader.raiseError(QString::fromLatin1("Element '%1' has been defined before.").arg(name));
+
+ if (name == scRemoteRepositories) {
+ s.addDefaultRepositories(readRepositories(reader, true));
} else {
- if (s.d->m_data.contains(name))
- reader.raiseError(QString::fromLatin1("Element '%1' has been defined before.").arg(name));
s.d->m_data.insert(name, reader.readElementText(QXmlStreamReader::SkipChildElements));
}
}