Changeset 561 for trunk/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/assistant/lib/qhelpsearchindexreader_clucene_p.h (modified) (6 diffs)

trunk/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -54 +54 @@
 //
 
-#include "qhelpsearchengine.h"
+#include "qhelpsearch.h"
 
 #include "fulltextsearch/qanalyzer_p.h"
 #include "fulltextsearch/qquery_p.h"
-
-#include <QtCore/QList>
-#include <QtCore/QMutex>
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QThread>
-#include <QtCore/QWaitCondition>
-
-class QHelpEngineCore;
 
 QT_BEGIN_NAMESPACE
@@ -74 +65 @@
         namespace clucene {
 
-class QHelpSearchIndexReader : public QThread
+class QHelpSearchIndexReader
 {
     Q_OBJECT
 
 public:
-    QHelpSearchIndexReader();
-    ~QHelpSearchIndexReader();
-
-    void cancelSearching();
-    void search(const QString &collectionFile,
-        const QString &indexFilesFolder,
-        const QList<QHelpSearchQuery> &queryList);
-
-    int hitsCount() const;
-    QHelpSearchEngine::SearchHit hit(int index) const;
-
-signals:
-    void searchingStarted();
-    void searchingFinished(int hits);
+    QHelpSearchIndexReaderClucene();
+    ~QHelpSearchIndexReaderClucene();
 
 private:
@@ -104 +83 @@
     void boostSearchHits(const QHelpEngineCore &engine, QList<QHelpSearchEngine::SearchHit> &hitList,
         const QList<QHelpSearchQuery> &queryList);
-
-private:
-    QMutex mutex;
-    QList<QHelpSearchEngine::SearchHit> hitList;
-    QWaitCondition waitCondition;
-
-    bool m_cancel;
-    QString m_collectionFile;
-    QList<QHelpSearchQuery> m_query;
-    QString m_indexFilesFolder;
 };