From 1176180a40b0691f7df2b445abf7bcfb6d65221e Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Mon, 22 Oct 2007 01:28:48 +0000 Subject: [PATCH] * return keys instead of paths; that's what the path(const char* key) method is for * files and requiredFiles were reversed (unit testing is indeed good) svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=727888 --- packagestructure.cpp | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/packagestructure.cpp b/packagestructure.cpp index dae8331e1..074fa6224 100644 --- a/packagestructure.cpp +++ b/packagestructure.cpp @@ -89,54 +89,53 @@ QString PackageStructure::type() return d->type; } -QStringList PackageStructure::directories() +QList PackageStructure::directories() { - QStringList dirs; + QList dirs; QHash::const_iterator it = d->contents.constBegin(); while (it != d->contents.constEnd()) { if (it.value().directory) { - dirs << it.value().path; + dirs << it.key(); } ++it; } return dirs; } -QStringList PackageStructure::requiredDirectories() +QList PackageStructure::requiredDirectories() { - QStringList dirs; + QList dirs; QHash::const_iterator it = d->contents.constBegin(); while (it != d->contents.constEnd()) { if (it.value().directory && it.value().required) { - dirs << it.value().path; + dirs << it.key(); } ++it; } return dirs; } -QStringList PackageStructure::files() +QList PackageStructure::files() { - QStringList files; + QList files; QHash::const_iterator it = d->contents.constBegin(); while (it != d->contents.constEnd()) { - if (!it.value().directory && - it.value().required) { - files << it.value().path; + if (!it.value().directory) { + files << it.key(); } ++it; } return files; } -QStringList PackageStructure::requiredFiles() +QList PackageStructure::requiredFiles() { - QStringList files; + QList files; QHash::const_iterator it = d->contents.constBegin(); while (it != d->contents.constEnd()) { - if (!it.value().directory) { - files << it.value().path; + if (!it.value().directory && it.value().required) { + files << it.key(); } ++it; }