From 8004983e3e7e6de58bb48c6206cea321ef4d3ced Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 28 Aug 2007 00:08:05 +0000 Subject: [PATCH] Make usages a QSet in the document. svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=705458 --- keduvocdocument/keduvocdocument.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp index d9d9774..a8c7380 100644 --- a/keduvocdocument/keduvocdocument.cpp +++ b/keduvocdocument/keduvocdocument.cpp @@ -83,7 +83,7 @@ public: QList m_lessonsInQuery; QStringList m_tenseDescriptions; - QStringList m_usages; + QSet m_usages; QString m_title; QString m_author; QString m_license; @@ -1382,24 +1382,22 @@ KEduVocWordType* KEduVocDocument::wordTypes() { QStringList KEduVocDocument::usages(){ - return d->m_usages; + return d->m_usages.values(); } -/* -void KEduVocDocument::setUsageDescriptions(const QStringList &names) -{ - d->m_usageDescriptions = names; -}*/ - - void KEduVocDocument::addUsage(const QString &usage){ - d->m_usages.append(usage); + d->m_usages.insert(usage); } void KEduVocDocument::renameUsage(const QString &oldName, const QString &newName){ - d->m_usages[d->m_usages.indexOf(oldName)]=newName; + if ( d->m_usages.contains(oldName) ) { + d->m_usages.remove(oldName); + d->m_usages.insert(newName); + } else { + return; + } for ( int i = 0; i < d->m_vocabulary.count(); i++) { foreach (int translationIndex, d->m_vocabulary[i].translationIndices()) { @@ -1413,7 +1411,7 @@ void KEduVocDocument::renameUsage(const QString &oldName, const QString &newName void KEduVocDocument::removeUsage(const QString &name){ - d->m_usages.removeAt(d->m_usages.indexOf(name)); + d->m_usages.remove(name); for ( int i = 0; i < d->m_vocabulary.count(); i++) { foreach (int translationIndex, d->m_vocabulary[i].translationIndices()) { -- 2.47.3