Changeset 561 for trunk/tools/assistant/lib/fulltextsearch/qhits.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/qhits.cpp (modified) (3 diffs)

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

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
+** All rights reserved.
 **
-** 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.
+** 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.
 **
 ****************************************************************************/
@@ -23 +30 @@
     deleteCLuceneHits = true;
 }
-    
+
 QCLuceneHitsPrivate::QCLuceneHitsPrivate(const QCLuceneHitsPrivate &other)
     : QSharedData()
 {
     hits = _CL_POINTER(other.hits);
+    deleteCLuceneHits = other.deleteCLuceneHits;
 }
 
@@ -37 +45 @@
 
 
-QCLuceneHits::QCLuceneHits(const QCLuceneSearcher &searcher, 
+QCLuceneHits::QCLuceneHits(const QCLuceneSearcher &searcher,
                            const QCLuceneQuery &query, const QCLuceneFilter &filter)
     : d(new QCLuceneHitsPrivate())