Rename KEduVocLesson::inQuery to inPractice

and setInQuery to setInPractice

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

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index ffd9f3f90206bf66883a467b329561d5a1a78df2..f7b3767dd3b7be48707b21f8784c896193abe7b6 100644 (file)
--- a/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@ -448,8 +448,8 @@ void KEduVocDocument::merge( KEduVocDocument *docToMerge, bool matchIdentifiers
 
         QStringList new_tenses = docToMerge->tenseDescriptions();
 
-        QList<int> old_in_query = lessonsInQuery();
-        QList<int> new_in_query = docToMerge->lessonsInQuery();
+        QList<int> old_in_query = lessonsInPractice();
+        QList<int> new_in_query = docToMerge->lessonsInPractice();
 
         QStringList new_usages = docToMerge->usageDescriptions();
 
@@ -460,7 +460,7 @@ void KEduVocDocument::merge( KEduVocDocument *docToMerge, bool matchIdentifiers
 
         for (int i = 0; i < new_in_query.count(); i++)
           old_in_query.append(new_in_query[i] + lesson_offset);
-        setLessonsInQuery(old_in_query);
+        setLessonsInPractice(old_in_query);
 
         int types_offset = d->m_typeDescriptions.count();
         for (int i = 0; i < new_types.count(); i++) {
@@ -835,11 +835,11 @@ kDebug() << "appendIdentifier: " << i << id.name() << id.locale();
 }
 
 
-int KEduVocDocument::appendLesson( const QString &lessonName, bool inQuery )
+int KEduVocDocument::appendLesson( const QString &lessonName, bool inPractice )
 {
     KEduVocLesson lesson;
     lesson.setName( lessonName );
-    lesson.setInQuery( inQuery );
+    lesson.setInPractice( inPractice );
     d->m_lessons.append( lesson );
     return d->m_lessons.count() - 1;
 }

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index bcfa0368a7923a42cacf59ccd511be1543b9bd71..8a04958a366fca30a3a25b309a99c81279a2a625 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -280,9 +280,9 @@ bool KEduVocKvtml2Reader::readEntry( QDomElement &entryElement )
 //     if ( !currentElement.isNull() ) {
 //         // set the inquery information
 //         if ( currentElement.text() == KVTML_TRUE ) {
-//             expr.setInQuery( true );
+//             expr.setInPractice( true );
 //         } else {
-//             expr.setInQuery( false );
+//             expr.setInPractice( false );
 //         }
 //     }
 
@@ -449,7 +449,7 @@ bool KEduVocKvtml2Reader::readLesson( QDomElement &lessonElement )
 
     //<query>true</query>
     currentElement = lessonElement.firstChildElement( KVTML_QUERY );
-    m_doc->lesson(lessonId).setInQuery(currentElement.text() == KVTML_TRUE);
+    m_doc->lesson(lessonId).setInPractice(currentElement.text() == KVTML_TRUE);
 
     //<current>true</current>
     currentElement = lessonElement.firstChildElement( KVTML_CURRENT );

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index a65542e8b251bdff7ca85bd6de55719a1e07a797..0682a1237bd692244b062da2ddc533e5ca755895 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -182,7 +182,7 @@ bool KEduVocKvtml2Writer::writeLessons( QDomElement &lessonsElement )
         thisLessonElement.appendChild( newTextElement( KVTML_NAME, m_doc->lesson(lessonId).name() ) );
 
         // add a inquery tag
-        if ( m_doc->lesson(lessonId).inQuery() ) {
+        if ( m_doc->lesson(lessonId).inPractice() ) {
             thisLessonElement.appendChild( newTextElement( KVTML_QUERY, KVTML_TRUE ) );
         }
 

diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp
index 1be5b88ceda6cc2f4bdc2fc5805ab2a63547f8b8..4fb1671026c61fc66b8b6ec87e8342fa06d4ceff 100644 (file)
--- a/keduvocdocument/keduvockvtmlwriter.cpp
+++ b/keduvocdocument/keduvockvtmlwriter.cpp
@@ -308,7 +308,7 @@ bool KEduVocKvtmlWriter::writeLesson( QDomElement &domElementParent )
         if ( m_doc->currentLesson() == i ) {
             domElementDesc.setAttribute( KV_LESS_CURR, 1 );
         }
-        if ( m_doc->lesson(i).inQuery() ) {
+        if ( m_doc->lesson(i).inPractice() ) {
             domElementDesc.setAttribute( KV_LESS_QUERY, 1 );
         }
         domElementDesc.appendChild( domTextDesc );

diff --git a/keduvocdocument/keduvoclesson.cpp b/keduvocdocument/keduvoclesson.cpp
index bf125187e125e17cda547831f3203102cb8a64b8..2028c0d7095d1ca10e3a01ff53aefb50aa7508eb 100644 (file)
--- a/keduvocdocument/keduvoclesson.cpp
+++ b/keduvocdocument/keduvoclesson.cpp
@@ -28,7 +28,7 @@ class KEduVocLesson::Private
 public:
     QSet<int> m_entries;
     QString m_name;
-    bool m_inQuery;
+    bool m_inPractice;
 };
 
 KEduVocLesson::KEduVocLesson()
@@ -40,7 +40,7 @@ KEduVocLesson::KEduVocLesson( const KEduVocLesson &other )
 {
     d->m_entries = other.d->m_entries;
     d->m_name = other.d->m_name;
-    d->m_inQuery = other.d->m_inQuery;
+    d->m_inPractice = other.d->m_inPractice;
 }
 
 KEduVocLesson::~KEduVocLesson()
@@ -52,7 +52,7 @@ KEduVocLesson& KEduVocLesson::operator= ( const KEduVocLesson &other )
 {
     d->m_entries = other.d->m_entries;
     d->m_name = other.d->m_name;
-    d->m_inQuery = other.d->m_inQuery;
+    d->m_inPractice = other.d->m_inPractice;
     return *this;
 }
 
@@ -60,7 +60,7 @@ bool KEduVocLesson::operator==(const KEduVocLesson &other)
 {
     return d->m_entries == other.d->m_entries &&
         d->m_name == other.d->m_name &&
-        d->m_inQuery == other.d->m_inQuery;;
+        d->m_inPractice == other.d->m_inPractice;;
 }
 
 void KEduVocLesson::setName( const QString &name )
@@ -131,12 +131,12 @@ void KEduVocLesson::decrementEntriesAbove( int entryid )
     d->m_entries = entries.toSet();
 }
 
-bool KEduVocLesson::inQuery()
+bool KEduVocLesson::inPractice()
 {
-    return d->m_inQuery;
+    return d->m_inPractice;
 }
 
-void KEduVocLesson::setInQuery(bool inQuery)
+void KEduVocLesson::setInPractice(bool inPractice)
 {
-    d->m_inQuery = inQuery;
+    d->m_inPractice = inPractice;
 }

diff --git a/keduvocdocument/keduvoclesson.h b/keduvocdocument/keduvoclesson.h
index 14e6b9fe4ca8a0237d226af91d7465e54cd9f3a8..829beab3f275c36cc7c9f8fae7e1bd42728809b1 100644 (file)
--- a/keduvocdocument/keduvoclesson.h
+++ b/keduvocdocument/keduvoclesson.h
@@ -76,8 +76,8 @@ public:
      */
     void decrementEntriesAbove( int entryid );
 
-    bool inQuery();
-    void setInQuery( bool inQuery );
+    bool inPractice();
+    void setInPractice( bool inPractice );
 
     /** equality operator */
     bool operator==(const KEduVocLesson &other);