From: Pino Toscano <pino@kde.org>
Date: Mon, 10 Apr 2006 19:18:27 +0000 (+0000)
Subject: make them compile with the new snapshot
X-Git-Tag: v3.80.2~128
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=3408b688473233775c5674a2f8292fb3f441368f;p=libqmvoc.git

make them compile with the new snapshot

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

diff --git a/kdeeducore/keduvockvtmlreader.cpp b/kdeeducore/keduvockvtmlreader.cpp
index 6026132..899dfc5 100644
--- a/kdeeducore/keduvockvtmlreader.cpp
+++ b/kdeeducore/keduvockvtmlreader.cpp
@@ -131,7 +131,7 @@ bool KEduVocKvtmlReader::readArticle(QDomElement &domElementParent)
   {
     if (domElementEntry.tagName() != KV_ART_ENTRY)
     {
-      domError(i18n("expected tag <%1>", KV_ART_ENTRY));
+      domError(i18n("expected tag <%1>", QString(KV_ART_ENTRY)));
       return false;
     }
 
@@ -1044,7 +1044,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
   if (domElementExpressionChild.tagName() != KV_ORG)
   {
     // must be preceded by "original"
-    domError(i18n("starting tag <%1> is missing", KV_ORG));
+    domError(i18n("starting tag <%1> is missing", QString(KV_ORG)));
     return false;
   }
 
@@ -1221,7 +1221,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
     if (domElementExpressionChild.tagName() != KV_TRANS)
     {
       // "original" must be followed by "translations"
-      domError(i18n("starting tag <%1> is missing", KV_TRANS));
+      domError(i18n("starting tag <%1> is missing", QString(KV_TRANS)));
       return false;
     }
 
@@ -1578,7 +1578,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
   if( domElementKvtml.tagName() != KV_DOCTYPE )
   {
     domError(i18n("Tag <%1> was expected "
-            "but tag <%2> was read." , KV_DOCTYPE, domElementKvtml.tagName()));
+            "but tag <%2> was read." , QString(KV_DOCTYPE), domElementKvtml.tagName()));
     return false;
   }
 
diff --git a/kdeeducore/prefleitner.h b/kdeeducore/prefleitner.h
index 7143d63..cb75693 100644
--- a/kdeeducore/prefleitner.h
+++ b/kdeeducore/prefleitner.h
@@ -21,7 +21,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  **************************************************************************/
 
-#include "prefleitnerbase.h"
+#include "ui_prefleitnerbase.h"
 
 class LeitnerSystemView;
 class LeitnerSystem;