From 3125725cc503a027a2b76d779425943b1b982295 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Sun, 17 Apr 2011 03:44:33 +0300
Subject: [PATCH] Fix SloynikEngine violation in shared ownership of index
 reader.

---
 qt/guide_page.cpp        | 6 ++++++
 qt/guide_page.hpp        | 3 +--
 words/sloynik_engine.cpp | 6 ++++--
 words/sloynik_engine.hpp | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/qt/guide_page.cpp b/qt/guide_page.cpp
index 03751c4e66..3a536d392b 100644
--- a/qt/guide_page.cpp
+++ b/qt/guide_page.cpp
@@ -1,5 +1,7 @@
 #include "guide_page.hpp"
 
+#include "../words/sloynik_engine.hpp"
+
 #include "../platform/platform.hpp"
 
 #include <QtWebKit/QWebView>
@@ -29,6 +31,10 @@ GuidePageHolder::GuidePageHolder(QWidget * pParent)
   CreateEngine();
 }
 
+GuidePageHolder::~GuidePageHolder()
+{
+}
+
 void GuidePageHolder::showEvent(QShowEvent * e)
 {
   base_type::showEvent(e);
diff --git a/qt/guide_page.hpp b/qt/guide_page.hpp
index bbef7b321b..c36e5e5fd4 100644
--- a/qt/guide_page.hpp
+++ b/qt/guide_page.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "../words/sloynik_engine.hpp"
-
 #include "../std/scoped_ptr.hpp"
 
 #include <QtGui/QWidget>
@@ -22,6 +20,7 @@ namespace qt
 
   public:
     GuidePageHolder(QWidget * pParent);
+    virtual ~GuidePageHolder();
 
   protected:
     void CreateEngine();
diff --git a/words/sloynik_engine.cpp b/words/sloynik_engine.cpp
index 61350a6dd1..137c0faee1 100644
--- a/words/sloynik_engine.cpp
+++ b/words/sloynik_engine.cpp
@@ -47,8 +47,10 @@ sl::SloynikEngine::SloynikEngine(string const & dictionaryPath,
     FileWriter stampWriter(stampPath);
     stampWriter.Write(&stamp[0], stamp.size() * sizeof(stamp[0]));
   }
-  m_pIndexReader.reset(new FileReader(indexPath + ".idx"));
-  m_pSortedIndex.reset(new sl::SortedIndex(*m_pDictionary, m_pIndexReader.get(), strFn));
+
+  // By VNG: SortedIndex takes ownership of index reader, so no need to store it here.
+  //m_pIndexReader.reset(new FileReader(indexPath + ".idx"));
+  m_pSortedIndex.reset(new sl::SortedIndex(*m_pDictionary, new FileReader(indexPath + ".idx"), strFn));
 }
 
 sl::SloynikEngine::~SloynikEngine()
diff --git a/words/sloynik_engine.hpp b/words/sloynik_engine.hpp
index a8a3b67e0b..1c1bc6d288 100644
--- a/words/sloynik_engine.hpp
+++ b/words/sloynik_engine.hpp
@@ -56,7 +56,7 @@ public:
 
 private:
   scoped_ptr<sl::Dictionary> m_pDictionary;
-  scoped_ptr<FileReader> m_pIndexReader;
+  //scoped_ptr<FileReader> m_pIndexReader;
   scoped_ptr<sl::SortedIndex> m_pSortedIndex;
 };