[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kwordquiz/src
From:       Peter Hedlund <peter () peterandlinda ! com>
Date:       2005-07-04 3:18:50
Message-ID: 1120447130.012422.13649.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 431354 by hedlund:

Improved loading of example files shipped with KWordQuiz and KVocTrain

 M  +6 -6      keduvockvtmlreader.cpp  


--- branches/work/kwordquiz/src/keduvockvtmlreader.cpp #431353:431354
@@ -1144,7 +1144,7 @@
         return false;
     }
 
-    if (domElementOriginalChild.tagName() == KV_COMPARISON_GRP)
+    else if (domElementOriginalChild.tagName() == KV_COMPARISON_GRP)
     {
       if (bComparison)
       {
@@ -1157,7 +1157,7 @@
         return false;
     }
 
-    if (domElementOriginalChild.tagName() == KV_MULTIPLECHOICE_GRP)
+    else if (domElementOriginalChild.tagName() == KV_MULTIPLECHOICE_GRP)
     {
       if (bMultipleChoice)
       {
@@ -1179,7 +1179,7 @@
     domElementOriginalChild = domElementOriginalChild.nextSibling().toElement();
   }
 
-  textstr = domElementExpressionChild.text();
+  textstr = domElementExpressionChild.lastChild().toText().data();
   if (textstr.isNull())
     textstr = "";
 
@@ -1322,7 +1322,7 @@
           return false;
       }
 
-      if (domElementOriginalChild.tagName() == KV_COMPARISON_GRP)
+      else if (domElementOriginalChild.tagName() == KV_COMPARISON_GRP)
       {
         if (bComparison)
         {
@@ -1335,7 +1335,7 @@
           return false;
       }
 
-      if (domElementOriginalChild.tagName() == KV_MULTIPLECHOICE_GRP)
+      else if (domElementOriginalChild.tagName() == KV_MULTIPLECHOICE_GRP)
       {
         if (bMultipleChoice)
         {
@@ -1357,7 +1357,7 @@
       domElementOriginalChild = domElementOriginalChild.nextSibling().toElement();
     }
 
-    textstr = domElementExpressionChild.text();
+    textstr = domElementExpressionChild.lastChild().toText().data();
     if (textstr.isNull())
       textstr = "";
 
[prev in list] [next in list] [prev in thread] [next in thread]