From d27d6dd808e5e842436294065cc4314874a37851 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sat, 3 Mar 2007 00:18:05 +0000 Subject: [PATCH] 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 --- kdeeducore/keduvocdocument.cpp | 8 ++++---- kdeeducore/keduvocdocument.h | 8 ++++---- kdeeducore/keduvockvtmlreader.cpp | 2 +- kdeeducore/keduvockvtmlwriter.cpp | 4 ++-- kdeeducore/keduvocpaukerreader.cpp | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp index 8c08c10..cf94b3a 100644 --- a/kdeeducore/keduvocdocument.cpp +++ b/kdeeducore/keduvocdocument.cpp @@ -868,13 +868,13 @@ void KEduVocDocument::setLessonsInQuery(const QList &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 07f7fb8..037838d 100644 --- 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 864dc93..89cbf6a 100644 --- 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 a8db91c..1f5af4a 100644 --- 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 c596b52..19c150c 100644 --- 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"); -- 2.47.3