From: Frederik Gladhorn <gladhorn@kde.org>
Date: Tue, 18 Sep 2007 17:30:48 +0000 (+0000)
Subject: Avoid adding empty strings to the multiple choice class.
X-Git-Tag: v3.94.0~40
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=a48fa3843bb42c78fb2fa51b6c6a29055c739e55;p=libqmvoc.git

Avoid adding empty strings to the multiple choice class.
Please report if this is working.
Thanks to Johannes Simon.
CCMAIL: johannes.simon@gmail.com

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=714068
---

diff --git a/keduvocdocument/keduvocmultiplechoice.cpp b/keduvocdocument/keduvocmultiplechoice.cpp
index 7a38074..68d360c 100644
--- a/keduvocdocument/keduvocmultiplechoice.cpp
+++ b/keduvocdocument/keduvocmultiplechoice.cpp
@@ -44,7 +44,10 @@ KEduVocMultipleChoice::KEduVocMultipleChoice( const KEduVocMultipleChoice &other
 KEduVocMultipleChoice::KEduVocMultipleChoice( const QStringList &choices )
         : d( new KEduVocMultipleChoicePrivate )
 {
-    setChoices( choices );
+    foreach ( QString choice, choices ) {
+        // use appendChoice to check for empty entries
+        appendChoice(choice);
+    }
 }
 
 KEduVocMultipleChoice::~KEduVocMultipleChoice()
@@ -58,11 +61,6 @@ KEduVocMultipleChoice &KEduVocMultipleChoice::operator= ( const KEduVocMultipleC
     return *this;
 }
 
-void KEduVocMultipleChoice::setChoices( const QStringList &choices )
-{
-    d->m_choices = choices;
-}
-
 QStringList KEduVocMultipleChoice::choices() const
 {
     return d->m_choices;
@@ -89,14 +87,6 @@ QString KEduVocMultipleChoice::choice( int index ) const
     return choice;
 }
 
-void KEduVocMultipleChoice::setChoice( int index, const QString &s )
-{
-    while ( d->m_choices.size() <= index ) {
-        d->m_choices.append( QString() );
-    }
-    d->m_choices[index] = s;
-}
-
 unsigned KEduVocMultipleChoice::size() const
 {
     return d->m_choices.size();
@@ -109,5 +99,7 @@ bool KEduVocMultipleChoice::operator== ( const KEduVocMultipleChoice &choice ) c
 
 void KEduVocMultipleChoice::appendChoice( const QString &s )
 {
-    d->m_choices.append( s );
+    if ( !s.isEmpty() ) {
+        d->m_choices.append( s );
+    }
 }
diff --git a/keduvocdocument/keduvocmultiplechoice.h b/keduvocdocument/keduvocmultiplechoice.h
index 41e5145..6a9d8e6 100644
--- a/keduvocdocument/keduvocmultiplechoice.h
+++ b/keduvocdocument/keduvocmultiplechoice.h
@@ -40,12 +40,9 @@ public:
 
     ~KEduVocMultipleChoice();
 
-    void setChoices( const QStringList &choices );
     QStringList choices() const;
-
     void appendChoice( const QString &s );
 
-    void setChoice( int index, const QString &s );
     QString choice( int index ) const;
 
     bool isEmpty() const;