Lessons have names not descriptions. lesson->description() is now lesson->name().

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

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index 4345abd91eb352f2015ec0e37cb5cb314c322b77..7164db6bd880229b7600ac11506e1c639b0e724f 100644 (file)
--- a/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@ -897,7 +897,7 @@ int KEduVocDocument::addLesson( const QString &lessonName, int position )
     }
 
     KEduVocLesson *lesson = new KEduVocLesson;
-    lesson->setDescription( lessonName );
+    lesson->setName( lessonName );
     d->m_lessons.insert( position, lesson );
     return position;
 }
@@ -1066,12 +1066,12 @@ void KEduVocDocument::setCurrentLesson( int lesson )
 }
 
 
-QStringList KEduVocDocument::lessonDescriptions() const
+QStringList KEduVocDocument::lessonNames() const
 {
     QStringList descriptions;
     QList<KEduVocLesson*> lessonObjects = lessons().values();
     for ( int i = 0; i < lessonObjects.count(); ++i ) {
-        descriptions.append( lessonObjects[i]->description() );
+        descriptions.append( lessonObjects[i]->name() );
     }
     return descriptions;
 }

diff --git a/keduvocdocument/keduvocdocument.h b/keduvocdocument/keduvocdocument.h
index 94cfd76185717f543a7272b5ea7bab95deda6f2a..1dbcf94792df49eccefe4353dc5e1f3d1bb86682 100644 (file)
--- a/keduvocdocument/keduvocdocument.h
+++ b/keduvocdocument/keduvocdocument.h
@@ -472,7 +472,7 @@ public:
      * All lesson descriptions as stringlist.
      * @returns a list of defined lessons
      */
-    QStringList lessonDescriptions() const;
+    QStringList lessonNames() const;
 
     /**
      * Sets the description of the lesson

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index d0caf5fb653e987a2b16893b42bf2f0988e375fa..f198baf9bbb598c53a83f795c3887d25cc79fe08 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -179,7 +179,7 @@ bool KEduVocKvtml2Writer::writeLessons( QDomElement &lessonsElement )
         QDomElement thisLessonElement = m_domDoc.createElement( KVTML_LESSON );
 
         // add a name
-        thisLessonElement.appendChild( newTextElement( KVTML_NAME, thisLesson->description() ) );
+        thisLessonElement.appendChild( newTextElement( KVTML_NAME, thisLesson->name() ) );
 
         // add a inquery tag
         thisLessonElement.appendChild( newTextElement( KVTML_QUERY, m_doc->lessonInQuery( lessonid ) ? KVTML_TRUE : KVTML_FALSE ) );

diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp
index 0f887c05da661834cf797c62157ef01c46974cc3..4595d5a92599dcc2b1ed5c58f783694465e3dcb2 100644 (file)
--- a/keduvocdocument/keduvockvtmlwriter.cpp
+++ b/keduvocdocument/keduvockvtmlwriter.cpp
@@ -301,7 +301,7 @@ bool KEduVocKvtmlWriter::writeLesson( QDomDocument &domDoc, QDomElement &domElem
     for ( int i = 0; i < keys.size(); ++i ) {
         int thiskey = keys[i];
         QDomElement domElementDesc = domDoc.createElement( KV_LESS_DESC );
-        QDomText domTextDesc = domDoc.createTextNode( lessons[thiskey]->description() );
+        QDomText domTextDesc = domDoc.createTextNode( lessons[thiskey]->name() );
 
         domElementDesc.setAttribute( KV_LESS_NO, thiskey );
         if ( m_doc->currentLesson() == thiskey )

diff --git a/keduvocdocument/keduvoclesson.cpp b/keduvocdocument/keduvoclesson.cpp
index 2f28628e1e6821cc50101b258c5af08afecf970c..2c773aef19886ac546a9137c9048c10017ad8a56 100644 (file)
--- a/keduvocdocument/keduvoclesson.cpp
+++ b/keduvocdocument/keduvoclesson.cpp
@@ -27,7 +27,7 @@ class KEduVocLesson::Private
 {
 public:
     QSet<int> m_entries;
-    QString m_description;
+    QString m_name;
 };
 
 KEduVocLesson::KEduVocLesson()
@@ -38,7 +38,7 @@ KEduVocLesson::KEduVocLesson( const KEduVocLesson &other )
         : d( new Private )
 {
     d->m_entries = other.d->m_entries;
-    d->m_description = other.d->m_description;
+    d->m_name = other.d->m_name;
 }
 
 KEduVocLesson::~KEduVocLesson()
@@ -49,18 +49,18 @@ KEduVocLesson::~KEduVocLesson()
 KEduVocLesson& KEduVocLesson::operator= ( const KEduVocLesson &other )
 {
     d->m_entries = other.d->m_entries;
-    d->m_description = other.d->m_description;
+    d->m_name = other.d->m_name;
     return *this;
 }
 
-void KEduVocLesson::setDescription( const QString &description )
+void KEduVocLesson::setName( const QString &name )
 {
-    d->m_description = description;
+    d->m_name = name;
 }
 
-QString KEduVocLesson::description()
+QString KEduVocLesson::name()
 {
-    return d->m_description;
+    return d->m_name;
 }
 
 QList<int> KEduVocLesson::entries()

diff --git a/keduvocdocument/keduvoclesson.h b/keduvocdocument/keduvoclesson.h
index d3116f4c92dd28040d30ddd491c3dc60c23abbf1..3201fd03f9981b16a7a5a229a9d5bed389bf2b67 100644 (file)
--- a/keduvocdocument/keduvoclesson.h
+++ b/keduvocdocument/keduvoclesson.h
@@ -42,13 +42,13 @@ public:
     /** assignment operator */
     KEduVocLesson& operator= ( const KEduVocLesson& );
 
-    /** set the lesson description
-     * @param description text to set for the description
+    /** set the lesson name
+     * @param name text to set for the name
      */
-    void setDescription( const QString &description );
+    void setName( const QString &name );
 
-    /** get the lesson description */
-    QString description();
+    /** get the lesson name */
+    QString name();
 
     /** get a list of all entries in the lesson */
     QList<int> entries();