EBN/Krazy fixes.

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=663039

diff --git a/kdeeducore/keduvockvtmlreader.cpp b/kdeeducore/keduvockvtmlreader.cpp
index 719304e6afea0a2d0989e98b4a6f2cbf8d73de85..925a879673d85508ab2707ee392ba42e90c210d4 100644 (file)
--- a/kdeeducore/keduvockvtmlreader.cpp
+++ b/kdeeducore/keduvockvtmlreader.cpp
@@ -825,7 +825,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( QDomElement &domElementE
                                                         QString &remark,
                                                         int &bcount, int &rev_bcount,
                                                         QString &query_id,
-                                                        QString &pronunce,
+                                                        QString &pronunciation,
                                                         int &width,
                                                         QString &type,
                                                         QString &faux_ami_f,
@@ -1004,10 +1004,10 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( QDomElement &domElementE
     }
   }
 
-  pronunce = "";
+  pronunciation = "";
   attribute = domElementExpressionChild.attributeNode(KV_PRONUNCE);
   if (!attribute.isNull())
-    pronunce = attribute.value();
+    pronunciation = attribute.value();
 
   query_id = "";
   attribute = domElementExpressionChild.attributeNode(KV_QUERY);
@@ -1027,7 +1027,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
   int                       bcount;
   int                       r_bcount;
   QString                   remark;
-  QString                   pronunce;
+  QString                   pronunciation;
   QDateTime                 qdate;
   QDateTime                 r_qdate;
   bool                      inquery;
@@ -1142,7 +1142,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
   //-----------
   // Attributes
   if (!readExpressionChildAttributes(currentElement, lang, grade, r_grade, qcount, r_qcount, qdate, r_qdate, remark, bcount, r_bcount, query_id,
-                                     pronunce, width, type, faux_ami_t, faux_ami_f, synonym, example, antonym, usage, paraphrase))
+                                     pronunciation, width, type, faux_ami_t, faux_ami_f, synonym, example, antonym, usage, paraphrase))
     return false;
 
 
@@ -1227,8 +1227,8 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
   }
   if (!remark.isEmpty() )
     expr.setRemark (0, remark);
-  if (!pronunce.isEmpty() )
-    expr.setPronunciation(0, pronunce);
+  if (!pronunciation.isEmpty() )
+    expr.setPronunciation(0, pronunciation);
   if (!type.isEmpty() )
     expr.setType(0, type);
   if (!synonym.isEmpty() )
@@ -1261,7 +1261,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
       // Attributes
 
       if (!readExpressionChildAttributes( currentElement, lang, grade, r_grade, qcount, r_qcount, qdate, r_qdate, remark, bcount, r_bcount, query_id,
-                                          pronunce, width, type, faux_ami_f, faux_ami_t, synonym, example, antonym, usage, paraphrase))
+                                          pronunciation, width, type, faux_ami_f, faux_ami_t, synonym, example, antonym, usage, paraphrase))
         return false;
 
       if (m_doc->entryCount() == 0)
@@ -1353,8 +1353,8 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
         expr.setType (count, type);
       if (!remark.isEmpty() )
         expr.setRemark (count, remark);
-      if (!pronunce.isEmpty() )
-        expr.setPronunciation(count, pronunce);
+      if (!pronunciation.isEmpty() )
+        expr.setPronunciation(count, pronunciation);
       if (!faux_ami_f.isEmpty() )
         expr.setFauxAmi (count, faux_ami_f, false);
       if (!faux_ami_t.isEmpty() )

diff --git a/kdeeducore/keduvockvtmlreader.h b/kdeeducore/keduvockvtmlreader.h
index e2962f9c3457c6a1768a5ac52d6f0cb7f69e9128..369584b9fa183e7c9b4cf99e3fdce45e0353ed4f 100644 (file)
--- a/kdeeducore/keduvockvtmlreader.h
+++ b/kdeeducore/keduvockvtmlreader.h
@@ -95,7 +95,7 @@ public:
                                      QString &remark,
                                      int &bcount, int &rev_bcount,
                                      QString &query_id,
-                                     QString &pronunce,
+                                     QString &pronunciation,
                                      int &width,
                                      QString &type,
                                      QString &faux_ami_f,

diff --git a/kdeeducore/keduvocmultiplechoice.h b/kdeeducore/keduvocmultiplechoice.h
index 005a385027177be579cc369781ec1f1089c975ac..1afba7093eca0129db6ee5717ece13fedcaddd78 100644 (file)
--- a/kdeeducore/keduvocmultiplechoice.h
+++ b/kdeeducore/keduvocmultiplechoice.h
@@ -29,7 +29,7 @@
 
 #include <libkdeedu_core_export.h>
 
-#include <QString>
+#include <QtCore/QString>
 
 #define MAX_MULTIPLE_CHOICE  5  // select one out of x
 

diff --git a/kdeeducore/leitnerbox.h b/kdeeducore/leitnerbox.h
index 1d4b7b2a05202dbe513d6cb52ac53827c5a0470c..8736958a10b2c2efbfe91786172fe7911279a1e0 100644 (file)
--- a/kdeeducore/leitnerbox.h
+++ b/kdeeducore/leitnerbox.h
@@ -22,7 +22,7 @@
 
 #include <libkdeedu_core_export.h>
 
-#include <QString>
+#include <QtCore/QString>
 
 /**
  * A box in a LeitnerSystem - a LeitnerBox

diff --git a/kdeeducore/leitnersystem.h b/kdeeducore/leitnersystem.h
index f5d3f51dce70a887570eed31d331a13be03b9281..f1a5bc5416913be57f37fa22bfbfacfe6c047b2e 100644 (file)
--- a/kdeeducore/leitnersystem.h
+++ b/kdeeducore/leitnersystem.h
@@ -22,7 +22,7 @@
 
 #include <libkdeedu_core_export.h>
 
-#include <QStringList>
+#include <QtCore/QStringList>
 
 #include "leitnerbox.h"