Rename documentRemark to documentComment

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

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index 505e905fc2c0a68e557d0177a53e7303f5e766be..377bcaa6d18cbd836af33cfecc45fc1f8f2daffe 100644 (file)
--- a/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@ -86,7 +86,7 @@ public:
     QString                   m_title;
     QString                   m_author;
     QString                   m_license;
-    QString                   m_remark;
+    QString                   m_comment;
     QString                   m_version;
     QString                   m_csvDelimiter;
 
@@ -126,7 +126,7 @@ void KEduVocDocument::KEduVocDocumentPrivate::init()
     m_url.setFileName( i18n( "Untitled" ) );
     m_title = "";
     m_author = "";
-    m_remark = "";
+    m_comment = "";
     m_version = "";
     m_generator = "";
     m_csvDelimiter = QString( '\t' );
@@ -1003,9 +1003,9 @@ QString KEduVocDocument::license() const
 }
 
 
-QString KEduVocDocument::documentRemark() const
+QString KEduVocDocument::documentComment() const
 {
-    return d->m_remark;
+    return d->m_comment;
 }
 
 
@@ -1041,9 +1041,9 @@ void KEduVocDocument::setLicense( const QString & s )
 }
 
 
-void KEduVocDocument::setDocumentRemark( const QString & s )
+void KEduVocDocument::setDocumentComment( const QString & s )
 {
-    d->m_remark = s.simplified();
+    d->m_comment = s.simplified();
 }
 
 

diff --git a/keduvocdocument/keduvocdocument.h b/keduvocdocument/keduvocdocument.h
index 7b84711a86b0364ff1f58a9d0b2018532f36deea..54e1141ea80172124394e3892d55cb197673486f 100644 (file)
--- a/keduvocdocument/keduvocdocument.h
+++ b/keduvocdocument/keduvocdocument.h
@@ -140,12 +140,12 @@ public:
     /** @returns the license of the file */
     QString license() const;
 
-    /** set the remark of the file
-     * @param rem remark to set */
-    void setDocumentRemark( const QString & rem );
+    /** set the comment of the file
+     * @param comment comment to set */
+    void setDocumentComment( const QString & comment );
 
-    /** @return the remark of the file */
-    QString documentRemark() const;
+    /** @return the comment of the file */
+    QString documentComment() const;
 
     /**
      * Sets the generator of the file

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index 92b6f940ad20f2eb7bdff1e6893cbbcfa28e1d6b..58532231cc747d615b39a7fbd94d173175621b71 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -121,7 +121,7 @@ bool KEduVocKvtml2Reader::readInformation( QDomElement &informationElement )
     // read the comment
     currentElement = informationElement.firstChildElement( KVTML_COMMENT );
     if ( !currentElement.isNull() ) {
-        m_doc->setDocumentRemark( currentElement.text() );
+        m_doc->setDocumentComment( currentElement.text() );
     }
 
     return true;

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index 2d8960f841fc81bbcaffc535d8c0622e844dd66d..d0caf5fb653e987a2b16893b42bf2f0988e375fa 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -124,8 +124,8 @@ bool KEduVocKvtml2Writer::writeInformation( QDomElement &informationElement, con
     }
 
     // comment
-    if ( !m_doc->documentRemark().isEmpty() ) {
-        informationElement.appendChild( newTextElement( KVTML_COMMENT, m_doc->documentRemark() ) );
+    if ( !m_doc->documentComment().isEmpty() ) {
+        informationElement.appendChild( newTextElement( KVTML_COMMENT, m_doc->documentComment() ) );
     }
 
     return true;

diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp
index 5b1cc3fd0856ea3950f5dd7bf362c20494a7cb73..42f8b7c2399c6c8e5d5b353113b90049a82f1c75 100644 (file)
--- a/keduvocdocument/keduvockvtmlreader.cpp
+++ b/keduvocdocument/keduvockvtmlreader.cpp
@@ -82,7 +82,7 @@ bool KEduVocKvtmlReader::readDoc( KEduVocDocument *doc )
 
     documentAttribute = domElementKvtml.attributeNode( KV_DOC_REM );
     if ( !documentAttribute.isNull() )
-        m_doc->setDocumentRemark( documentAttribute.value() );
+        m_doc->setDocumentComment( documentAttribute.value() );
 
     documentAttribute = domElementKvtml.attributeNode( KV_GENERATOR );
     if ( !documentAttribute.isNull() ) {

diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp
index 10c58014e5ee25a7b589c5bef342560835a36140..0f887c05da661834cf797c62157ef01c46974cc3 100644 (file)
--- a/keduvocdocument/keduvockvtmlwriter.cpp
+++ b/keduvocdocument/keduvockvtmlwriter.cpp
@@ -63,8 +63,8 @@ bool KEduVocKvtmlWriter::writeDoc( KEduVocDocument *doc, const QString &generato
     if ( !m_doc->license().isEmpty() )
         domElementKvtml.setAttribute( KV_LICENSE, m_doc->license() );
 
-    if ( !m_doc->documentRemark().isEmpty() )
-        domElementKvtml.setAttribute( KV_DOC_REM, m_doc->documentRemark() );
+    if ( !m_doc->documentComment().isEmpty() )
+        domElementKvtml.setAttribute( KV_DOC_REM, m_doc->documentComment() );
 
     if ( !writeLesson( domDoc, domElementKvtml ) )
         return false;

diff --git a/keduvocdocument/keduvocpaukerreader.cpp b/keduvocdocument/keduvocpaukerreader.cpp
index 915dcfee1e1d57cab4fb60bad62daf9095dbc510..d102710291ef405138c6dc6a6bb846a9e34e342d 100644 (file)
--- a/keduvocdocument/keduvocpaukerreader.cpp
+++ b/keduvocdocument/keduvocpaukerreader.cpp
@@ -77,7 +77,7 @@ void KEduVocPaukerReader::readPauker()
 
         if ( isStartElement() ) {
             if ( name() == "Description" )
-                m_doc->setDocumentRemark( readElementText() );
+                m_doc->setDocumentComment( readElementText() );
             else if ( name() == "Batch" )
                 readBatch();
             else

diff --git a/keduvocdocument/keduvocxdxfreader.cpp b/keduvocdocument/keduvocxdxfreader.cpp
index 4b7a923b952e1a7ff4eaa73523ca4a9bf8db8083..f5d272b5a4c31e2a54418246c21344d1f45cd3c0 100644 (file)
--- a/keduvocdocument/keduvocxdxfreader.cpp
+++ b/keduvocdocument/keduvocxdxfreader.cpp
@@ -85,7 +85,7 @@ void KEduVocXdxfReader::readXdxf()
 
         if ( isStartElement() ) {
             if ( name() == "description" )
-                m_doc->setDocumentRemark( readElementText() );
+                m_doc->setDocumentComment( readElementText() );
             else if ( name() == "full_name" )
                 m_doc->setTitle( readElementText() );
             else if ( name() == "ar" )

diff --git a/keduvocdocument/sharedkvtmlfiles.cpp b/keduvocdocument/sharedkvtmlfiles.cpp
index b1ac0dc7101c4b485f1508b8e6fb0b19f4eb07e0..6862d15a377070575de6494012d2aba1d68c791a 100644 (file)
--- a/keduvocdocument/sharedkvtmlfiles.cpp
+++ b/keduvocdocument/sharedkvtmlfiles.cpp
@@ -98,7 +98,7 @@ void SharedKvtmlFilesPrivate::rescan()
         this->m_titleList.append( doc->title() );
 
         // add it's comment to the comment list
-        this->m_commentList.append( doc->documentRemark() );
+        this->m_commentList.append( doc->documentComment() );
     }
     // plug a memory leak
     delete doc;