Mark a few lib lesson methods deprecated. Use a int list for the lesson filter. Break...

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

diff --git a/keduvocdocument/keduvocdocument.h b/keduvocdocument/keduvocdocument.h
index 79a03b8900b49fcb71b6460ddaaa40a66cec27d1..de3da64120cdae49ead46552f2dfad4132b70238 100644 (file)
--- a/keduvocdocument/keduvocdocument.h
+++ b/keduvocdocument/keduvocdocument.h
@@ -416,31 +416,31 @@ public:
      * Get list of ALL lessons that are selected for query.
      * @returns a list with the lessons in the current query
      */
-    QList<int> lessonsInQuery() const;
+    KDE_DEPRECATED QList<int> lessonsInQuery() const;
 
     /** DEPRECATED - USE lesson.setInQuery();
      * Sets ALL lessons in the query. Better use addLessonToQuery and removeLessonFromQuery.
      */
-    void setLessonsInQuery( const QList<int> &lesson_iq );
+    KDE_DEPRECATED void setLessonsInQuery( const QList<int> &lesson_iq );
 
     /** DEPRECATED - USE lesson.inQuery();
      * Check if @p lessonIndex is in the query.
      * @param lessonIndex - index of the lesson
      * @return true if in query
      */
-    bool lessonInQuery( int lessonIndex ) const;
+    KDE_DEPRECATED bool lessonInQuery( int lessonIndex ) const;
 
     /** DEPRECATED - USE lesson.setInQuery();
      * Add @p lessonIndex to the query.
      * @param lessonIndex - index of the lesson
      */
-    void addLessonToQuery( int lessonIndex );
+    KDE_DEPRECATED void addLessonToQuery( int lessonIndex );
 
     /** DEPRECATED - USE lesson.setInQuery();
      * Remove @p lessonIndex from the query.
      * @param lessonIndex - index of the lesson
      */
-    void removeLessonFromQuery( int lessonIndex );
+    KDE_DEPRECATED void removeLessonFromQuery( int lessonIndex );
 
     /**
      * Append a new lesson to the list of lessons.

diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp
index 4f4acaabe9658e3fe753a39abb93600e2665d46c..03f5b96050a827bd90781d248c2641bb711d3be8 100644 (file)
--- a/keduvocdocument/keduvockvtmlreader.cpp
+++ b/keduvocdocument/keduvockvtmlreader.cpp
@@ -224,7 +224,6 @@ bool KEduVocKvtmlReader::readLesson( QDomElement &domElementParent )
         currentElement = entryList.item( i ).toElement();
         if ( currentElement.parentNode() == domElementParent ) {
             int no;
-            bool isCurr = false;
 
             attribute = currentElement.attributeNode( KV_LESS_NO );
             if ( !attribute.isNull() ) {