API changes in KEduVocDocument:

- renamed URL()/setURL() to the more Qt4-ish url() and setUrl()
- renamed docRemark()/setDocRemark() to documentRemark()/setDocumentRemark()

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

diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp
index 8c08c1011ae98f0f33582156551f74b975bb4e74..cf94b3a019e01128ec52b7123fa074e0a6a81d15 100644 (file)
--- a/kdeeducore/keduvocdocument.cpp
+++ b/kdeeducore/keduvocdocument.cpp
@@ -868,13 +868,13 @@ void KEduVocDocument::setLessonsInQuery(const QList<int> &lesson_iq)
 }
 
 
-KUrl KEduVocDocument::URL() const
+KUrl KEduVocDocument::url() const
 {
   return d->m_url;
 }
 
 
-void KEduVocDocument::setURL(const KUrl& url)
+void KEduVocDocument::setUrl(const KUrl& url)
 {
   d->m_url = url;
 }
@@ -901,7 +901,7 @@ QString KEduVocDocument::license() const
 }
 
 
-QString KEduVocDocument::docRemark() const
+QString KEduVocDocument::documentRemark() const
 {
   return d->m_remark;
 }
@@ -939,7 +939,7 @@ void KEduVocDocument::setLicense(const QString & s)
 }
 
 
-void KEduVocDocument::setDocRemark(const QString & s)
+void KEduVocDocument::setDocumentRemark(const QString & s)
 {
   d->m_remark = s.simplified();
 }

diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h
index 07f7fb851e289bbe0d4e4efb042edec32f6ae48d..037838d862794ee37c591cd77dc1a8815d29e967 100644 (file)
--- a/kdeeducore/keduvocdocument.h
+++ b/kdeeducore/keduvocdocument.h
@@ -547,12 +547,12 @@ public:
   /**
    * @returns the URL of the XML file
    */
-  KUrl URL() const;
+  KUrl url() const;
 
   /**
    * Sets the URL of the XML file
    */
-  void setURL(const KUrl& url);
+  void setUrl(const KUrl& url);
 
   /**
    * @returns the title of the XML file
@@ -572,7 +572,7 @@ public:
   /**
    * @return the remark of the file
    */
-  QString docRemark() const;
+  QString documentRemark() const;
 
   /**
    * Retrieves the identifiers for the current query
@@ -608,7 +608,7 @@ public:
   /**
    * Sets the remark of the file
    */
-  void setDocRemark(const QString & rem);
+  void setDocumentRemark(const QString & rem);
 
   /**
    * Sets the generator of the file

diff --git a/kdeeducore/keduvockvtmlreader.cpp b/kdeeducore/keduvockvtmlreader.cpp
index 864dc93ae6c06d74c4cf969475330dfa4cd200df..89cbf6a9ec651bed965efca2f031bd9d8384ba72 100644 (file)
--- a/kdeeducore/keduvockvtmlreader.cpp
+++ b/kdeeducore/keduvockvtmlreader.cpp
@@ -78,7 +78,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
 
   documentAttribute = domElementKvtml.attributeNode(KV_DOC_REM);
   if (!documentAttribute.isNull())
-    m_doc->setDocRemark(documentAttribute.value());
+    m_doc->setDocumentRemark(documentAttribute.value());
 
   documentAttribute = domElementKvtml.attributeNode(KV_GENERATOR);
   if (!documentAttribute.isNull())

diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp
index a8db91c9ca1f060af7c8037887958326538e841f..1f5af4a605879f8968de0ecfc048ac43d7b454b7 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.cpp
+++ b/kdeeducore/keduvockvtmlwriter.cpp
@@ -56,8 +56,8 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
   if (!m_doc->license().isEmpty())
     domElementKvtml.setAttribute(KV_LICENSE, m_doc->license());
 
-  if (!m_doc->docRemark().isEmpty())
-    domElementKvtml.setAttribute(KV_DOC_REM, m_doc->docRemark());
+  if (!m_doc->documentRemark().isEmpty())
+    domElementKvtml.setAttribute(KV_DOC_REM, m_doc->documentRemark());
 
   if (!writeLesson(domDoc, domElementKvtml))
     return false;

diff --git a/kdeeducore/keduvocpaukerreader.cpp b/kdeeducore/keduvocpaukerreader.cpp
index c596b52397d764e6909f57000229cbf5f708ca23..19c150c06a0bea6d84e8112276bb8d5aef8631a8 100644 (file)
--- a/kdeeducore/keduvocpaukerreader.cpp
+++ b/kdeeducore/keduvocpaukerreader.cpp
@@ -40,7 +40,7 @@ bool KEduVocPaukerReader::readDoc(KEduVocDocument * doc)
 
   QDomElement description = domDoc.documentElement().firstChildElement("Description");
   if(!description.isNull())
-    m_doc->setDocRemark(description.text());
+    m_doc->setDocumentRemark(description.text());
 
   QDomNodeList entries = domDoc.elementsByTagName("Card");