Load document in thread

source/fb2main.cpp

@@ -28,7 +28,7 @@ MainWindow::MainWindow(const QString &filename, Fb2MainDocument * document)
     init();
     createText();
     thread = new Fb2ReadThread(this, filename);
-    connect(thread, SIGNAL(sendDocument(const QString&, Fb2MainDocument*)), SLOT(sendDocument(const QString&, Fb2MainDocument*)));
+    connect(thread, SIGNAL(sendDocument()), SLOT(sendDocument()));
     thread->start();
 }
 
@@ -113,7 +113,7 @@ void MainWindow::fileOpen()
     if (textEdit) {
         if (isUntitled && textEdit->document()->isEmpty() && !isWindowModified()) {
             thread = new Fb2ReadThread(this, filename);
-            connect(thread, SIGNAL(sendDocument(const QString&, Fb2MainDocument*)), SLOT(sendDocument(const QString&, Fb2MainDocument*)));
+            connect(thread, SIGNAL(sendDocument()), SLOT(sendDocument()));
             thread->start();
         } else {
             MainWindow * other = new MainWindow(filename, NULL);
@@ -129,14 +129,12 @@ void MainWindow::fileOpen()
             other->move(x() + 40, y() + 40);
             other->show();
         }
-
     }
-
 }
 
-void MainWindow::sendDocument(const QString &filename, Fb2MainDocument * document)
+void MainWindow::sendDocument()
 {
-    setCurrentFile(filename, document);
+    setCurrentFile(thread->file(), thread->doc());
 }
 
 bool MainWindow::fileSave()
@@ -481,7 +479,7 @@ bool MainWindow::saveFile(const QString &fileName)
     return true;
 }
 
-void MainWindow::setCurrentFile(const QString &filename, Fb2MainDocument * document)
+void MainWindow::setCurrentFile(const QString &filename, QTextDocument * document)
 {
     static int sequenceNumber = 1;
 
@@ -498,19 +496,10 @@ void MainWindow::setCurrentFile(const QString &filename, Fb2MainDocument * docum
     title += QString(" - ") += qApp->applicationName();
 
     if (textEdit && document) {
+        document->clearUndoRedoStacks();
+        document->setModified(false);
         textEdit->setDocument(document);
         connectTextDocument(textEdit->document());
-        if (!document->child().isEmpty()) {
-            if (!noteEdit) {
-                noteEdit = new QTextEdit(this);
-                noteEdit->setDocument(&document->child());
-                QDockWidget * dock = new QDockWidget("Footnotes", this);
-                dock->setAttribute(Qt::WA_DeleteOnClose);
-                dock->setFeatures(QDockWidget::AllDockWidgetFeatures);
-                dock->setWidget(noteEdit);
-                addDockWidget(Qt::BottomDockWidgetArea, dock);
-            }
-        }
     }
 
     setWindowModified(false);

source/fb2main.h

@@ -15,6 +15,7 @@ QT_END_NAMESPACE
 
 class QsciScintilla;
 class Fb2MainDocument;
+class Fb2ReadThread;
 
 class MainWindow : public QMainWindow
 {
@@ -30,7 +31,7 @@ protected:
 
 public slots:
     void logMessage(const QString &message);
-    void sendDocument(const QString &filename, Fb2MainDocument * document);
+    void sendDocument();
 
 private slots:
     void fileNew();
@@ -67,11 +68,11 @@ private:
     void writeSettings();
     bool maybeSave();
     bool saveFile(const QString &fileName);
-    void setCurrentFile(const QString &fileName, Fb2MainDocument * document = NULL);
+    void setCurrentFile(const QString &fileName, QTextDocument * document = NULL);
     void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
     MainWindow *findMainWindow(const QString &fileName);
 
-    QThread *thread;
+    Fb2ReadThread *thread;
     QTextEdit *textEdit;
     QTextEdit *noteEdit;
     QTextEdit *messageEdit;

source/fb2read.cpp

@@ -10,20 +10,34 @@
 
 Fb2ReadThread::Fb2ReadThread(QObject *parent, const QString &filename)
     : QThread(parent)
+    , m_document(NULL)
     , m_filename(filename)
     , m_abort(false)
 {
 }
 
 Fb2ReadThread::~Fb2ReadThread()
+{
+    stop();
+    wait();
+    if (m_document) delete m_document;
+}
+
+QTextDocument * Fb2ReadThread::doc()
 {
     QMutexLocker locker(&mutex);
     Q_UNUSED(locker);
-    m_abort = true;
-    wait();
+    return m_document ? m_document->clone() : NULL;
+}
+
+const QString & Fb2ReadThread::file()
+{
+    QMutexLocker locker(&mutex);
+    Q_UNUSED(locker);
+    return m_filename;
 }
 
-void Fb2ReadThread::stopProcess()
+void Fb2ReadThread::stop()
 {
     QMutexLocker locker(&mutex);
     Q_UNUSED(locker);
@@ -38,20 +52,18 @@ void Fb2ReadThread::run()
         return;
     }
 
-    Fb2MainDocument * document = new Fb2MainDocument();
-
-    Fb2Handler handler(*document);
+    m_document = new QTextDocument();
+    Fb2Handler handler(*m_document);
     QXmlSimpleReader reader;
     reader.setContentHandler(&handler);
     reader.setErrorHandler(&handler);
     QXmlInputSource source(&file);
 
-    if (reader.parse(source)) {
-        document->moveToThread(QApplication::instance()->thread());
-        emit sendDocument(m_filename, document);
-    } else {
-        delete document;
-    }
+    bool ok = reader.parse(source);
+
+    m_document->moveToThread(QApplication::instance()->thread());
+
+    if (ok) emit sendDocument();
 }
 
 //---------------------------------------------------------------------------
@@ -127,27 +139,24 @@ FB2_BEGIN_KEYHASH(RootHandler)
     insert("binary", Binary);
 FB2_END_KEYHASH
 
-Fb2Handler::RootHandler::RootHandler(Fb2MainDocument &document, const QString &name)
+Fb2Handler::RootHandler::RootHandler(QTextDocument &document, const QString &name)
     : BaseHandler(name)
     , m_document(document)
     , m_cursor1(&document, false)
-    , m_cursor2(&document.child(), true)
     , m_empty(true)
 {
     m_cursor1.beginEditBlock();
-    m_cursor2.beginEditBlock();
 }
 
 Fb2Handler::RootHandler::~RootHandler()
 {
     m_cursor1.endEditBlock();
-    m_cursor2.endEditBlock();
 }
 
 Fb2Handler::BaseHandler * Fb2Handler::RootHandler::NewTag(const QString &name, const QXmlAttributes &attributes)
 {
     switch (toKeyword(name)) {
-        case Body   : { BaseHandler * handler = new BodyHandler(m_empty ? m_cursor1 : m_cursor2, name); m_empty = false; return handler; }
+        case Body   : { BaseHandler * handler = new BodyHandler(m_cursor1, name); m_empty = false; return handler; }
         case Descr  : return new DescrHandler(name);
         case Binary : return new BinaryHandler(m_document, name, attributes);
         default: return NULL;
@@ -521,22 +530,15 @@ void Fb2Handler::BinaryHandler::EndTag(const QString &name)
 //  Fb2Handler
 //---------------------------------------------------------------------------
 
-Fb2Handler::Fb2Handler(Fb2MainDocument & document)
+Fb2Handler::Fb2Handler(QTextDocument & document)
     : m_document(document)
     , m_handler(NULL)
 {
     document.clear();
-    m_document.child().clear();
 }
 
 Fb2Handler::~Fb2Handler()
 {
-    m_document.clearUndoRedoStacks();
-    m_document.child().clearUndoRedoStacks();
-
-    m_document.setModified(false);
-    m_document.child().setModified(false);
-
     if (m_handler) delete m_handler;
 }
 

source/fb2read.h

@@ -26,18 +26,21 @@ public:
     Fb2ReadThread(QObject *parent, const QString &filename);
     ~Fb2ReadThread();
     void Read(const QString &filename);
+    QTextDocument * doc();
+    const QString & file();
 
 signals:
-    void sendDocument(QString filename, Fb2MainDocument * document);
+    void sendDocument();
 
 public slots:
-    void stopProcess();
+    void stop();
 
 protected:
     void run();
 
 private:
     const QString m_filename;
+    QTextDocument * m_document;
     bool m_abort;
     QMutex mutex;
 };
@@ -52,7 +55,7 @@ static Keyword toKeyword(const QString &name); private:
 class Fb2Handler : public QXmlDefaultHandler
 {
 public:
-    explicit Fb2Handler(Fb2MainDocument & document);
+    explicit Fb2Handler(QTextDocument & document);
     virtual ~Fb2Handler();
     bool startElement(const QString &namespaceURI, const QString &localName, const QString &qName, const QXmlAttributes &attributes);
     bool endElement(const QString &namespaceURI, const QString &localName, const QString &qName);
@@ -102,14 +105,13 @@ private:
             Binary,
         FB2_END_KEYLIST
     public:
-        explicit RootHandler(Fb2MainDocument &document, const QString &name);
+        explicit RootHandler(QTextDocument &document, const QString &name);
         virtual ~RootHandler();
     protected:
         virtual BaseHandler * NewTag(const QString & name, const QXmlAttributes &attributes);
     private:
-        Fb2MainDocument &m_document;
+        QTextDocument &m_document;
         Fb2TextCursor m_cursor1;
-        Fb2TextCursor m_cursor2;
         bool m_empty;
     };
 
@@ -274,10 +276,10 @@ private:
     };
 
 public:
-    Fb2MainDocument & document() { return m_document; }
+    QTextDocument & document() { return m_document; }
 
 private:
-    Fb2MainDocument & m_document;
+    QTextDocument & m_document;
     RootHandler * m_handler;
     QString m_error;
 };