Warnings--

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

diff --git a/kdeeducore/keduvockvtmlreader.cpp b/kdeeducore/keduvockvtmlreader.cpp
index 6639b4c3ab788d030880ff8010ad232532792c66..864dc93ae6c06d74c4cf969475330dfa4cd200df 100644 (file)
--- a/kdeeducore/keduvockvtmlreader.cpp
+++ b/kdeeducore/keduvockvtmlreader.cpp
@@ -130,7 +130,7 @@ bool KEduVocKvtmlReader::readBody(QDomElement &domElementParent)
   currentElement = domElementParent.firstChildElement(KV_CONJUG_GRP);
   if (!currentElement.isNull()) {
     QList<KEduVocConjugation> conjugations;
-    result = readConjug(currentElement, conjugations, KV_CON_ENTRY);
+    result = readConjug(currentElement, conjugations);
     if (result) {
       KEduVocConjugation conjug;
       for (int i = 0; i< conjugations.count(); i++) {
@@ -266,7 +266,6 @@ bool KEduVocKvtmlReader::readArticle(QDomElement &domElementParent)
 */
 {
 
-  int count = 0;
   QString s;
   QDomAttr attribute;
   QDomElement currentElement;
@@ -361,7 +360,7 @@ bool KEduVocKvtmlReader::readArticle(QDomElement &domElementParent)
 }
 
 
-bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent, QList<KEduVocConjugation> &curr_conjug, const QString &entry_tag)
+bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent, QList<KEduVocConjugation> &curr_conjug)
 /*
  <conjugation>        used in header for definiton of "prefix"
   <e l="de">          lang determines also lang order in entries !!
@@ -1177,12 +1176,11 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
 
   //---------
   // Children
-  bool result = false;
 
   currentChild = currentElement.firstChildElement(KV_CONJUG_GRP);
   if (!currentChild.isNull()) {
       conjug.clear();
-      if (!readConjug(currentChild, conjug, (QString) KV_CON_TYPE))
+      if (!readConjug(currentChild, conjug))
         return false;
   }
 
@@ -1300,12 +1298,10 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
       //---------
       // Children
 
-      bool result = false;
-
       currentChild = currentElement.firstChildElement(KV_CONJUG_GRP);
       if (!currentChild.isNull()) {
           conjug.clear();
-          if (!readConjug(currentChild, conjug, (QString) KV_CON_TYPE))
+          if (!readConjug(currentChild, conjug))
             return false;
       }
 

diff --git a/kdeeducore/keduvockvtmlreader.h b/kdeeducore/keduvockvtmlreader.h
index 1ed8a102635035bf76bfa6fae79929c12d7a420d..ea3a06683a8b1b33d55602c3f98e0767b3fa5a64 100644 (file)
--- a/kdeeducore/keduvockvtmlreader.h
+++ b/kdeeducore/keduvockvtmlreader.h
@@ -82,7 +82,7 @@ public:
 
   bool readLesson(QDomElement &domElementParent);
   bool readArticle(QDomElement &domElementParent);
-  bool readConjug(QDomElement &domElementParent, QList<KEduVocConjugation> &curr_conjug, const QString &entry_tag);
+  bool readConjug(QDomElement &domElementParent, QList<KEduVocConjugation> &curr_conjug);
   bool readOptions(QDomElement &domElementParent);
   bool readType(QDomElement &domElementParent);
   bool readTense(QDomElement &domElementParent);

diff --git a/kdeeducore/keduvocwqlreader.cpp b/kdeeducore/keduvocwqlreader.cpp
index 69f18e25f5e826d60f78250fd0f93cacb0a2970d..724161c62c622460695ee0b23a483b25f751a672 100644 (file)
--- a/kdeeducore/keduvocwqlreader.cpp
+++ b/kdeeducore/keduvocwqlreader.cpp
@@ -68,7 +68,7 @@ bool KEduVocWqlReader::readDoc(KEduVocDocument *doc)
   s = inputStream.readLine();
   p = s.indexOf("=", 0);
   s = s.right(s.length() - (p + 1));
-  int ps = s.toInt(0);
+  //int ps = s.toInt(0);
 
   s = inputStream.readLine();
   p = s.indexOf("=", 0);
@@ -82,7 +82,7 @@ bool KEduVocWqlReader::readDoc(KEduVocDocument *doc)
   s = inputStream.readLine();
   p = s.indexOf("=", 0);
   s = s.right(s.length() - (p + 1));
-  bool it = (s == "1");
+  //bool it = (s == "1");
 
   //m_doc->setFont(new QFont(fam, ps, b, it));
 
@@ -147,8 +147,8 @@ bool KEduVocWqlReader::readDoc(KEduVocDocument *doc)
   {
     s = inputStream.readLine();
     p = s.indexOf("[", 0);
-    QString r = s.mid(p + 1, 10);
-    int h = r.toInt();
+    //QString r = s.mid(p + 1, 10);
+    //int h = r.toInt();
     s = s.left(p);
     s = s.simplified();