Implemented all ways to open and close a document file with the new classes.

Added a proper 'title' handling.

svn path=/branches/work/kwordquiz/src/keduvocdocument.h; revision=430848

diff --git a/kwordquiz/keduvocdocument.cpp b/kwordquiz/keduvocdocument.cpp
index ba9f546d2d68c56d9d3d90785fc2992829a06eb4..8a8bfb0bbf52f36e770232c1ae789a5f1806773c 100644 (file)
--- a/kwordquiz/keduvocdocument.cpp
+++ b/kwordquiz/keduvocdocument.cpp
@@ -179,15 +179,11 @@ bool KEduVocDocument::open(const KURL& url, bool append)
 }
 
 
-bool KEduVocDocument::saveAs(QObject *parent, const KURL & url, QString title, FileType ft)
+bool KEduVocDocument::saveAs(QObject *parent, const KURL & url, FileType ft)
 {
   connect( this, SIGNAL(progressChanged(KEduVocDocument*,int)), parent, SLOT(slotProgress(KEduVocDocument*,int)) );
 
   KURL tmp (url);
-  if (title == i18n("Untitled"))
-    title = QString::null;
-  if (title == doc_url.fileName())
-    title = QString::null;
 
   if (ft == automatic)
   {
@@ -221,7 +217,6 @@ bool KEduVocDocument::saveAs(QObject *parent, const KURL & url, QString title, F
     QApplication::setOverrideCursor( waitCursor );
     switch (ft) {
       case kvtml: {
-        //TODO handle title
         KEduVocKvtmlWriter kvtmlWriter(&f);
         saved = kvtmlWriter.writeDoc(this);
       }

diff --git a/kwordquiz/keduvocdocument.h b/kwordquiz/keduvocdocument.h
index 0036ef50fe9404f295612835d05b012a47a8ccd8..38e620273bb2c5ddf7915180d94bc7280314582b 100644 (file)
--- a/kwordquiz/keduvocdocument.h
+++ b/kwordquiz/keduvocdocument.h
@@ -438,7 +438,7 @@ class KEduVocDocument : public QObject
    * @param url     if url is empty (or NULL) actual name is preserved
    * @result         true if successful
    */
-  bool saveAs (QObject *parent, const KURL & url, QString title, FileType ft);
+  bool saveAs(QObject *parent, const KURL & url, FileType ft);
 
   /** returns count of entries
    */

diff --git a/kwordquiz/keduvockvtmlwriter.cpp b/kwordquiz/keduvockvtmlwriter.cpp
index 4569efd13ff93af5927c6aba94e01d973f4a116d..435b78c65c50d4f837b75d3690237ce31ed86cfa 100644 (file)
--- a/kwordquiz/keduvockvtmlwriter.cpp
+++ b/kwordquiz/keduvockvtmlwriter.cpp
@@ -650,13 +650,8 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc)
   domElementKvtml.setAttribute(KV_GENERATOR, (QString) "kwordquiz");// TODO EPT KVD_VERS_PREFIX KVOCTRAIN_VERSION_STRING);
   domElementKvtml.setAttribute(KV_COLS, m_doc->numLangs() );
   domElementKvtml.setAttribute(KV_LINES, m_doc->numEntries() );
-/* TODO EPT add title management
-  if (!title.isEmpty())
-  {
-    domElementKvtml.setAttribute(KV_TITLE, m_doc->getTitle() );
-    m_doc->doctitle = title;
-  }
-  else */if (!m_doc->doctitle.isEmpty())
+  
+  if (!m_doc->doctitle.isEmpty())
     domElementKvtml.setAttribute(KV_TITLE, m_doc->doctitle);
 
   if (!m_doc->author.isEmpty())