merge soc branch into trunk

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

diff --cc keduvocdocument/keduvocdocument.cpp
index 564a4cd56a3d4623079b7d540fa3836db7c37e57,fdabf69bebfcc9e25aa67d26cbe1a1e82b058185..ae8320126d215b1de64c9af67f05f86f38bcf678
--- 1/keduvocdocument/keduvocdocument.cpp
--- 2/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@@ -108,12 -111,21 +111,17 @@@ KEduVocDocument::KEduVocDocumentPrivate
  
  void KEduVocDocument::KEduVocDocumentPrivate::init()
  {
 -    if ( m_lessonContainer ) {
 -        delete m_lessonContainer;
 -    }
 +    delete m_lessonContainer;
      m_lessonContainer = new KEduVocLesson(i18nc("The top level lesson which contains all other lessons of the document.", "Document Lesson"));
      m_lessonContainer->setContainerType(KEduVocLesson::Lesson);
 -    if ( m_wordTypeContainer ) {
 -        delete m_wordTypeContainer;
 -    }
 +    delete m_wordTypeContainer;
      m_wordTypeContainer = new KEduVocWordType(i18n( "Word types" ));
  
+     if ( m_leitnerContainer ) {
+         delete m_leitnerContainer;
+     }
+     m_leitnerContainer = new KEduVocLeitnerBox(i18n( "Leitner Box" ));
+ 
      m_tenseDescriptions.clear();
      m_identifiers.clear();
      m_extraSizeHints.clear();