Get rid of the m_inQuery for KEduVocExpression.

Only KVoc used to use it and it will just no longer be used.
It had no meaning for quite a while in parley, only confusing things.
The main table now only shows (in)active for the words.
(the chainsaw was here...)

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

diff --git a/keduvocdocument/keduvocdocument.h b/keduvocdocument/keduvocdocument.h
index a44ef1a0ba9b839044dca5728a04d67d8735c2fd..0e4d0cf8ee5fb4781982687bad1e370a78a3f6f3 100644 (file)
--- a/keduvocdocument/keduvocdocument.h
+++ b/keduvocdocument/keduvocdocument.h
@@ -237,11 +237,9 @@ public:
     /**
      * Appends a new identifier (usually a language)
      *
-     * @param name the identifier to append
+     * @param identifier the identifier to append. If empty default names are used.
      * @returns the identifier number
      */
-//     int appendIdentifier( const QString& name );
-
     int appendIdentifier( const KEduVocIdentifier & identifier = KEduVocIdentifier());
 
     /**
@@ -258,7 +256,6 @@ public:
      * @param index            number of translation 0..x
      * @returns                the language identifier: en=english, de=german, ...
      */
-//     QString identifier( int index ) const;
     KEduVocIdentifier& identifier( int index );
 
     /**

diff --git a/keduvocdocument/keduvocexpression.cpp b/keduvocdocument/keduvocexpression.cpp
index 9462390a42d797aa2d8eae145da5392d0ba2c0a7..46bfac3737dd52cba6ba20016776e7659018a7d7 100644 (file)
--- a/keduvocdocument/keduvocexpression.cpp
+++ b/keduvocdocument/keduvocexpression.cpp
@@ -39,7 +39,6 @@ public:
     QString m_leitnerBox;
     int m_sortIndex;
     int m_lesson;
-    bool m_inQuery;
     bool m_active;
     int m_sizeHint;
 
@@ -50,8 +49,6 @@ public:
 void KEduVocExpression::KEduVocExpressionPrivate::init()
 {
     m_translations.clear();
-
-    m_inQuery = false;
     m_active = true;
     m_lesson = -1;
     m_sortIndex = 0;
@@ -66,7 +63,6 @@ bool KEduVocExpression::KEduVocExpressionPrivate::operator== ( const KEduVocExpr
         m_leitnerBox == p.m_leitnerBox &&
         m_lesson == p.m_lesson &&
         m_sortIndex == p.m_sortIndex &&
-        m_inQuery == p.m_inQuery &&
         m_active == p.m_active;
 }
 
@@ -140,18 +136,6 @@ void KEduVocExpression::setLeitnerBox( const QString& box )
 }
 
 
-bool KEduVocExpression::isInQuery() const
-{
-    return d->m_inQuery;
-}
-
-
-void KEduVocExpression::setInQuery( bool flag )
-{
-    d->m_inQuery = flag;
-}
-
-
 bool KEduVocExpression::isActive() const
 {
     return d->m_active;

diff --git a/keduvocdocument/keduvocexpression.h b/keduvocdocument/keduvocexpression.h
index 10ecef4c1eebfb0ac1f900983c12c0c57a205256..5520f25765c4f231ec2e606ace6eab107b8ef900 100644 (file)
--- a/keduvocdocument/keduvocexpression.h
+++ b/keduvocdocument/keduvocexpression.h
@@ -70,14 +70,6 @@ public:
      */
     void resetGrades( int index );
 
-    /** returns flag if entry is "selected" for queries
-     */
-    bool isInQuery() const;
-
-    /** set entry "selected"
-     */
-    void setInQuery( bool flag = true );
-
     /** returns flag if entry is activated for queries
      */
     bool isActive() const;

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index 5890fb1be8ca924d4daa97542ceacda6b776ea4f..37ba4ddc4fde83503ab8597f1d21755985c8dc68 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -276,15 +276,15 @@ bool KEduVocKvtml2Reader::readEntry( QDomElement &entryElement )
         }
     }
 
-    currentElement = entryElement.firstChildElement( KVTML_INQUERY );
-    if ( !currentElement.isNull() ) {
-        // set the inquery information
-        if ( currentElement.text() == KVTML_TRUE ) {
-            expr.setInQuery( true );
-        } else {
-            expr.setInQuery( false );
-        }
-    }
+//     currentElement = entryElement.firstChildElement( KVTML_INQUERY );
+//     if ( !currentElement.isNull() ) {
+//         // set the inquery information
+//         if ( currentElement.text() == KVTML_TRUE ) {
+//             expr.setInQuery( true );
+//         } else {
+//             expr.setInQuery( false );
+//         }
+//     }
 
     currentElement = entryElement.firstChildElement( KVTML_SIZEHINT );
     if ( !currentElement.isNull() ) {

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index 2dc621d23324a0fdb06d66aad94fd897e4188813..4435c2fbf61368f82a57be300c0064d097a57923 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -325,8 +325,9 @@ bool KEduVocKvtml2Writer::writeEntries( QDomElement &entriesElement )
         // write inactive
         entryElement.appendChild( newTextElement( KVTML_INACTIVE, thisEntry->isActive() ? KVTML_FALSE : KVTML_TRUE ) );
 
-        // write inquery
-        entryElement.appendChild( newTextElement( KVTML_INQUERY, thisEntry->isInQuery() ? KVTML_TRUE : KVTML_FALSE ) );
+// kvtml 1 relic no longer used
+//         // write inquery
+//         entryElement.appendChild( newTextElement( KVTML_INQUERY, thisEntry->isInQuery() ? KVTML_TRUE : KVTML_FALSE ) );
 
         // write sizehint
         if ( thisEntry->sizeHint() > 0 ) {

diff --git a/keduvocdocument/keduvockvtmlcompability.cpp b/keduvocdocument/keduvockvtmlcompability.cpp
index 3897b97b3ea6309c7606033f3788bd5f9923d090..4ff9d313e4691157fe3423660bda543c0f60dcb0 100644 (file)
--- a/keduvocdocument/keduvockvtmlcompability.cpp
+++ b/keduvocdocument/keduvockvtmlcompability.cpp
@@ -261,4 +261,4 @@ QString KEduVocKvtmlCompability::oldTense(const QString & tense)
         m_oldTenses[KVTML_1_USER_DEFINED + QString::number( m_userdefinedTenseCounter )] = tense;
     }
     return m_oldTenses.key(tense);
-}
\ No newline at end of file
+}

diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp
index 43af42ee00ce9ea1c836682dc665d84737ee7440..637d3423b8e7c841cc8c4b356fcb14496cdbcf04 100644 (file)
--- a/keduvocdocument/keduvockvtmlreader.cpp
+++ b/keduvocdocument/keduvockvtmlreader.cpp
@@ -1005,7 +1005,9 @@ bool KEduVocKvtmlReader::readExpression( QDomElement &domElementParent )
         if ( i == 0 ) {
             expr = KEduVocExpression( textstr );
             expr.setLesson( lesson );
-            expr.setInQuery( inquery );
+
+///@todo inquery is old and no longer used. get rid of reading it.
+//             expr.setInQuery( inquery );
             expr.setActive( active );
         } else {
             expr.setTranslation( i, textstr );
@@ -1070,9 +1072,9 @@ bool KEduVocKvtmlReader::readExpression( QDomElement &domElementParent )
         i++;
     }
 
-    if ( m_doc->entryCount() == 0 ) {
-        m_doc->setQueryIdentifier( q_org, q_trans );
-    }
+//     if ( m_doc->entryCount() == 0 ) {
+//         m_doc->setQueryIdentifier( q_org, q_trans );
+//     }
     m_doc->appendEntry( &expr );
 
     // also add this entryid to the lesson it's part of

diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp
index 5cc34bd6423150444bd8075c51bdfd3d4dfe9881..629fa66b4c2852d91c27fe579b94ed6aad51780a 100644 (file)
--- a/keduvocdocument/keduvockvtmlwriter.cpp
+++ b/keduvocdocument/keduvockvtmlwriter.cpp
@@ -108,8 +108,9 @@ bool KEduVocKvtmlWriter::writeDoc( KEduVocDocument *doc, const QString &generato
             domElementExpression.setAttribute( KV_LESS_MEMBER, lm );
         }
 
-        if ( entry->isInQuery() )
-            domElementExpression.setAttribute( KV_SELECTED, 1 );
+// Sorry, but we don't support this any more.
+//         if ( entry->isInQuery() )
+//             domElementExpression.setAttribute( KV_SELECTED, 1 );
 
         if ( !entry->isActive() )
             domElementExpression.setAttribute( KV_INACTIVE, 1 );