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

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

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** Copyright (C) 200.
+** 
 **
-** 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.
 **
 ****************************************************************************/
@@ -17 +24 @@
 QT_BEGIN_NAMESPACE
 
-QCLuceneReaderPrivate::QCLuceneReaderPrivate() 
+QCLuceneReaderPrivate::QCLuceneReaderPrivate()
     : QSharedData()
-{ 
-    reader = 0; 
+{
+    reader = 0;
     deleteCLuceneReader = true;
 }
@@ -26 +33 @@
 QCLuceneReaderPrivate::QCLuceneReaderPrivate(const QCLuceneReaderPrivate &other)
     : QSharedData()
-{ 
-    reader = _CL_POINTER(other.reader); 
+{
+    reader = _CL_POINTER(other.reader);
+    deleteCLuceneReader = other.deleteCLuceneReader;
 }
 
-QCLuceneReaderPrivate::~QCLuceneReaderPrivate() 
-{ 
+QCLuceneReaderPrivate::~QCLuceneReaderPrivate()
+{
     if (deleteCLuceneReader)
         _CLDECDELETE(reader);
 }
-    
 
 QCLuceneReader::QCLuceneReader()
@@ -63 +70 @@
 }
 
-QCLuceneStringReader::QCLuceneStringReader(const QString &value, qint32 length, 
+QCLuceneStringReader::QCLuceneStringReader(const QString &value, qint32 length,
                                            bool copyData)
     : QCLuceneReader()