From: Patrick Spendrin <ps_ml@gmx.de>
Date: Thu, 31 Jul 2008 20:46:55 +0000 (+0000)
Subject: my gsoc commits to parley;-)
X-Git-Tag: v4.1.80~30
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=357ac92d50a8b079523c04d9c282054ed150035d;p=libqmvoc.git

my gsoc commits to parley;-)

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

diff --git a/keduvocdocument/tests/keduvocdocumentvalidatortest.cpp b/keduvocdocument/tests/keduvocdocumentvalidatortest.cpp
index 601b69d..9299f8e 100644
--- a/keduvocdocument/tests/keduvocdocumentvalidatortest.cpp
+++ b/keduvocdocument/tests/keduvocdocumentvalidatortest.cpp
@@ -191,8 +191,8 @@ void KEduVocDocumentValidatorTest::testDeclensions()
 void KEduVocDocumentValidatorTest::testConjugations()
 {
     KEduVocConjugation conjugation;
-    conjugation.setConjugation(KEduVocText("first-singular"), KEduVocWordFlag::First, KEduVocWordFlag::Singular);
-    QCOMPARE(conjugation.conjugation(KEduVocWordFlag::First, KEduVocWordFlag::Singular).text(), QString("first-singular"));
+    conjugation.setConjugation(KEduVocText("first-singular"), KEduVocWordFlag::First | KEduVocWordFlag::Singular);
+    QCOMPARE(conjugation.conjugation(KEduVocWordFlag::First | KEduVocWordFlag::Singular).text(), QString("first-singular"));
 
     QDomDocument doc = QDomDocument("test doc");
     QDomElement root = doc.createElement( "kvtml" );
@@ -201,9 +201,9 @@ void KEduVocDocumentValidatorTest::testConjugations()
 
     qDebug() << root.text();
 
-    KEduVocConjugation *con2 = KEduVocWordFlag::fromKVTML2(root);
+    KEduVocConjugation *con2 = KEduVocConjugation::fromKVTML2(root);
 
-    QCOMPARE(conjugation.conjugation(KEduVocWordFlag::First, KEduVocWordFlag::Singular).text(), con2->conjugation(KEduVocWordFlag::First, KEduVocWordFlag::Singular).text());
+    QCOMPARE(conjugation.conjugation(KEduVocWordFlag::First | KEduVocWordFlag::Singular).text(), con2->conjugation(KEduVocWordFlag::First | KEduVocWordFlag::Singular).text());
     delete con2;
 }