From: Frederik Gladhorn <gladhorn@kde.org>
Date: Wed, 14 Nov 2007 15:35:43 +0000 (+0000)
Subject: Let open clean up the old doc properly. Use old way for sharedkvtmlfiles of opening... 
X-Git-Tag: v3.97.0~12
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=f87b6b1e69e3eab90ee2b2051956927c3a973720;p=libqmvoc.git

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

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

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index 2b476a7..09c8720 100644
--- 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 80854e9..2005b02 100644
--- 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 79cb26c..0bf1cb3 100644
--- 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 77fcbbb..5cc6c68 100644
--- 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()