From 0cb439ac8d7a37294c2d56e640a67bd152bbe165 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 22 Oct 2007 16:21:16 +0000 Subject: [PATCH] Rename KEduVocLesson::inQuery to inPractice and setInQuery to setInPractice svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=728174 --- keduvocdocument/keduvocdocument.cpp | 10 +++++----- keduvocdocument/keduvockvtml2reader.cpp | 6 +++--- keduvocdocument/keduvockvtml2writer.cpp | 2 +- keduvocdocument/keduvockvtmlwriter.cpp | 2 +- keduvocdocument/keduvoclesson.cpp | 16 ++++++++-------- keduvocdocument/keduvoclesson.h | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp index ffd9f3f..f7b3767 100644 --- 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 old_in_query = lessonsInQuery(); - QList new_in_query = docToMerge->lessonsInQuery(); + QList old_in_query = lessonsInPractice(); + QList 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 bcfa036..8a04958 100644 --- 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 ) //true currentElement = lessonElement.firstChildElement( KVTML_QUERY ); - m_doc->lesson(lessonId).setInQuery(currentElement.text() == KVTML_TRUE); + m_doc->lesson(lessonId).setInPractice(currentElement.text() == KVTML_TRUE); //true currentElement = lessonElement.firstChildElement( KVTML_CURRENT ); diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp index a65542e..0682a12 100644 --- 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 1be5b88..4fb1671 100644 --- 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 bf12518..2028c0d 100644 --- a/keduvocdocument/keduvoclesson.cpp +++ b/keduvocdocument/keduvoclesson.cpp @@ -28,7 +28,7 @@ class KEduVocLesson::Private public: QSet 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 14e6b9f..829beab 100644 --- 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); -- 2.47.3