Changeset 561 for trunk/tools/assistant/lib/fulltextsearch/qsearchable.cpp

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/fulltextsearch/qsearchable.cpp (modified) (10 diffs)

trunk/tools/assistant/lib/fulltextsearch/qsearchable.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the QCLucene library and is distributable under
-** the terms of the LGPL license as specified in the license.txt file.
+** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
+** All rights reserved.
+**
+** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ****************************************************************************/
@@ -27 +34 @@
 {
     searchable = _CL_POINTER(other.searchable);
+    deleteCLuceneSearchable = other.deleteCLuceneSearchable;
 }
 
@@ -64 +72 @@
 }
 
-QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query, 
+QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query,
                                       const QCLuceneFilter &filter)
 {
@@ -70 +78 @@
 }
 
-QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query, 
+QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query,
                                       const QCLuceneSort &sort)
 {
@@ -76 +84 @@
 }
 
-QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query, 
+QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query,
                                       const QCLuceneFilter &filter,
                                       const QCLuceneSort &sort)
@@ -87 +95 @@
     : QCLuceneSearcher()
 {
-    lucene::search::IndexSearcher *searcher = 
+    lucene::search::IndexSearcher *searcher =
         new lucene::search::IndexSearcher(path);
 
@@ -132 +140 @@
 : QCLuceneSearcher()
 {
-    lucene::search::Searchable** list= 
+    lucene::search::Searchable** list=
         _CL_NEWARRAY(lucene::search::Searchable*, searchables.count());
 
@@ -162 +170 @@
     if (searcher == 0)
         return 0;
-    
+
     return qint32(searcher->subDoc(int32_t(index)));
 }
@@ -173 +181 @@
     if (searcher == 0)
         return 0;
-    
+
     return qint32(searcher->subSearcher(int32_t(index)));
 }
@@ -184 +192 @@
     if (searcher == 0)
         return 0;
-    
+
     return qint32(searcher->searcherIndex(int32_t(index)));
 }