Let open clean up the old doc properly. Use old way for sharedkvtmlfiles of opening...

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

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index 2b476a741a20d081f47b82076e8c3a0441f6bd44..09c87209528a9579b1dccea1ec2b56b0cbcbfc52 100644 (file)
--- a/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@ -108,6 +108,7 @@ void KEduVocDocument::KEduVocDocumentPrivate::init()
     m_lessons.clear();
     m_tenseDescriptions.clear();
     m_identifiers.clear();
+    m_wordTypes.clear();
     m_extraSizeHints.clear();
     m_sizeHints.clear();
     m_vocabulary.clear();
@@ -122,6 +123,9 @@ void KEduVocDocument::KEduVocDocumentPrivate::init()
     m_version = "";
     m_generator = "";
     m_csvDelimiter = QString( '\t' );
+    m_usages.clear();
+    m_license.clear();
+    m_category.clear();
 }
 
 

diff --git a/keduvocdocument/keduvocwordtype.cpp b/keduvocdocument/keduvocwordtype.cpp
index 80854e9f7a2ce8a29df412b26089bac625e4805f..2005b02d2fd47c8f85739ec9282f006b65dc3aca 100644 (file)
--- a/keduvocdocument/keduvocwordtype.cpp
+++ b/keduvocdocument/keduvocwordtype.cpp
@@ -363,3 +363,8 @@ void KEduVocWordType::setSpecialSubType(const QString & mainTypeName, const QStr
     }
 }
 
+void KEduVocWordType::clear()
+{
+    d->m_wordTypeList.clear();
+}
+

diff --git a/keduvocdocument/keduvocwordtype.h b/keduvocdocument/keduvocwordtype.h
index 79cb26ceb477a16bf7bc758d3ffa0d4b77fb1349..0bf1cb3851f7c1345daa20f8cea490c6d6105647 100644 (file)
--- a/keduvocdocument/keduvocwordtype.h
+++ b/keduvocdocument/keduvocwordtype.h
@@ -139,6 +139,8 @@ public:
     QString specialTypeAdjective() const;
     QString specialTypeAdverb() const;
 
+    void clear();
+
 private:
 
 

diff --git a/keduvocdocument/sharedkvtmlfiles.cpp b/keduvocdocument/sharedkvtmlfiles.cpp
index 77fcbbb0b14e6cc0a86c041aad810e798a2ed0a2..5cc6c686cc9a4304866f594aeae2c0f83b30cf17 100644 (file)
--- a/keduvocdocument/sharedkvtmlfiles.cpp
+++ b/keduvocdocument/sharedkvtmlfiles.cpp
@@ -89,9 +89,8 @@ void SharedKvtmlFilesPrivate::rescan()
         }
     }
 
-
+    KEduVocDocument *doc = new KEduVocDocument();
     for ( int i = 0; i < this->m_fileList.size(); ++i ) {
-        KEduVocDocument *doc = new KEduVocDocument();
 
         // open the file
         doc->open( KUrl::fromPath( this->m_fileList[i] ) );
@@ -101,8 +100,8 @@ void SharedKvtmlFilesPrivate::rescan()
 
         // add it's comment to the comment list
         this->m_commentList.append( doc->documentComment() );
-        delete doc;
     }
+    delete doc;
 }
 
 void SharedKvtmlFiles::rescan()