From 7413c83bc6ea02e9f159d77d9f71a5c39d9bb0ef Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 8 Sep 2009 19:36:34 +1000
Subject: Update license headers.

Reviewed-by: Trust Me
---
 tools/assistant/lib/fulltextsearch/qanalyzer.cpp   | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qanalyzer_p.h   | 15 ++++++++---
 .../lib/fulltextsearch/qclucene-config_p.h         | 15 ++++++++---
 .../lib/fulltextsearch/qclucene_global_p.h         | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qdocument.cpp   | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qdocument_p.h   | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qfield.cpp      | 21 ++++++++++-----
 tools/assistant/lib/fulltextsearch/qfield_p.h      | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qfilter.cpp     | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qfilter_p.h     | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qhits.cpp       | 19 ++++++++-----
 tools/assistant/lib/fulltextsearch/qhits_p.h       | 15 ++++++++---
 .../assistant/lib/fulltextsearch/qindexreader.cpp  | 15 ++++++++---
 .../assistant/lib/fulltextsearch/qindexreader_p.h  | 15 ++++++++---
 .../assistant/lib/fulltextsearch/qindexwriter.cpp  | 15 ++++++++---
 .../assistant/lib/fulltextsearch/qindexwriter_p.h  | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qquery.cpp      | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qquery_p.h      | 15 ++++++++---
 .../assistant/lib/fulltextsearch/qqueryparser.cpp  | 25 ++++++++++-------
 .../assistant/lib/fulltextsearch/qqueryparser_p.h  | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qreader.cpp     | 30 ++++++++++++---------
 tools/assistant/lib/fulltextsearch/qreader_p.h     | 21 ++++++++++-----
 tools/assistant/lib/fulltextsearch/qsearchable.cpp | 31 +++++++++++++---------
 tools/assistant/lib/fulltextsearch/qsearchable_p.h | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qsort.cpp       | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qsort_p.h       | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qterm.cpp       | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qterm_p.h       | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qtoken.cpp      | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qtoken_p.h      | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qtokenizer.cpp  | 15 ++++++++---
 tools/assistant/lib/fulltextsearch/qtokenizer_p.h  | 15 ++++++++---
 .../assistant/lib/fulltextsearch/qtokenstream.cpp  | 17 ++++++++----
 .../assistant/lib/fulltextsearch/qtokenstream_p.h  | 15 ++++++++---
 34 files changed, 403 insertions(+), 166 deletions(-)

diff --git a/tools/assistant/lib/fulltextsearch/qanalyzer.cpp b/tools/assistant/lib/fulltextsearch/qanalyzer.cpp
index ed018bf..97df475 100644
--- a/tools/assistant/lib/fulltextsearch/qanalyzer.cpp
+++ b/tools/assistant/lib/fulltextsearch/qanalyzer.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qanalyzer_p.h b/tools/assistant/lib/fulltextsearch/qanalyzer_p.h
index 56c9ade..6329ba3 100644
--- a/tools/assistant/lib/fulltextsearch/qanalyzer_p.h
+++ b/tools/assistant/lib/fulltextsearch/qanalyzer_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qclucene-config_p.h b/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
index 4b2b1d5..ffa5f5d 100644
--- a/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
+++ b/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
index 83f1c20..dd1e4d2 100644
--- a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
+++ b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qdocument.cpp b/tools/assistant/lib/fulltextsearch/qdocument.cpp
index bad8ea9..06f8340 100644
--- a/tools/assistant/lib/fulltextsearch/qdocument.cpp
+++ b/tools/assistant/lib/fulltextsearch/qdocument.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qdocument_p.h b/tools/assistant/lib/fulltextsearch/qdocument_p.h
index df207ca..e388cb7 100644
--- a/tools/assistant/lib/fulltextsearch/qdocument_p.h
+++ b/tools/assistant/lib/fulltextsearch/qdocument_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qfield.cpp b/tools/assistant/lib/fulltextsearch/qfield.cpp
index dc878f3..364ad7d 100644
--- a/tools/assistant/lib/fulltextsearch/qfield.cpp
+++ b/tools/assistant/lib/fulltextsearch/qfield.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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,7 +30,7 @@ QCLuceneFieldPrivate::QCLuceneFieldPrivate()
     field = 0;
     deleteCLuceneField = true;
 }
-    
+
 QCLuceneFieldPrivate::QCLuceneFieldPrivate(const QCLuceneFieldPrivate &other)
     : QSharedData()
 {
@@ -51,7 +58,7 @@ QCLuceneField::QCLuceneField(const QString &name, const QString &value, int conf
 {
     TCHAR* fieldName = QStringToTChar(name);
     TCHAR* fieldValue = QStringToTChar(value);
-    
+
     d->field = new lucene::document::Field(fieldName, fieldValue, configs);
 
     delete [] fieldName;
@@ -67,7 +74,7 @@ QCLuceneField::QCLuceneField(const QString &name, QCLuceneReader *reader,
 
     reader->d->deleteCLuceneReader = false; // clucene takes ownership
     d->field = new lucene::document::Field(fieldName, reader->d->reader, configs);
-    
+
     delete [] fieldName;
 }
 
diff --git a/tools/assistant/lib/fulltextsearch/qfield_p.h b/tools/assistant/lib/fulltextsearch/qfield_p.h
index b4e1afa..77f6c82 100644
--- a/tools/assistant/lib/fulltextsearch/qfield_p.h
+++ b/tools/assistant/lib/fulltextsearch/qfield_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qfilter.cpp b/tools/assistant/lib/fulltextsearch/qfilter.cpp
index 837f590..7514121 100644
--- a/tools/assistant/lib/fulltextsearch/qfilter.cpp
+++ b/tools/assistant/lib/fulltextsearch/qfilter.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qfilter_p.h b/tools/assistant/lib/fulltextsearch/qfilter_p.h
index 0438902..dc81972 100644
--- a/tools/assistant/lib/fulltextsearch/qfilter_p.h
+++ b/tools/assistant/lib/fulltextsearch/qfilter_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qhits.cpp b/tools/assistant/lib/fulltextsearch/qhits.cpp
index c2fbf1b..3dc380e 100644
--- a/tools/assistant/lib/fulltextsearch/qhits.cpp
+++ b/tools/assistant/lib/fulltextsearch/qhits.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
@@ -22,7 +29,7 @@ QCLuceneHitsPrivate::QCLuceneHitsPrivate()
     hits = 0;
     deleteCLuceneHits = true;
 }
-    
+
 QCLuceneHitsPrivate::QCLuceneHitsPrivate(const QCLuceneHitsPrivate &other)
     : QSharedData()
 {
@@ -37,7 +44,7 @@ QCLuceneHitsPrivate::~QCLuceneHitsPrivate()
 }
 
 
-QCLuceneHits::QCLuceneHits(const QCLuceneSearcher &searcher, 
+QCLuceneHits::QCLuceneHits(const QCLuceneSearcher &searcher,
                            const QCLuceneQuery &query, const QCLuceneFilter &filter)
     : d(new QCLuceneHitsPrivate())
 {
diff --git a/tools/assistant/lib/fulltextsearch/qhits_p.h b/tools/assistant/lib/fulltextsearch/qhits_p.h
index ae7c61f..80a9c70 100644
--- a/tools/assistant/lib/fulltextsearch/qhits_p.h
+++ b/tools/assistant/lib/fulltextsearch/qhits_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qindexreader.cpp b/tools/assistant/lib/fulltextsearch/qindexreader.cpp
index fc1a3bb..56a1372 100644
--- a/tools/assistant/lib/fulltextsearch/qindexreader.cpp
+++ b/tools/assistant/lib/fulltextsearch/qindexreader.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qindexreader_p.h b/tools/assistant/lib/fulltextsearch/qindexreader_p.h
index a967b9d..2b62344 100644
--- a/tools/assistant/lib/fulltextsearch/qindexreader_p.h
+++ b/tools/assistant/lib/fulltextsearch/qindexreader_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qindexwriter.cpp b/tools/assistant/lib/fulltextsearch/qindexwriter.cpp
index 93e23e7..66ea6b3 100644
--- a/tools/assistant/lib/fulltextsearch/qindexwriter.cpp
+++ b/tools/assistant/lib/fulltextsearch/qindexwriter.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qindexwriter_p.h b/tools/assistant/lib/fulltextsearch/qindexwriter_p.h
index 5630520..8b31e9b 100644
--- a/tools/assistant/lib/fulltextsearch/qindexwriter_p.h
+++ b/tools/assistant/lib/fulltextsearch/qindexwriter_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qquery.cpp b/tools/assistant/lib/fulltextsearch/qquery.cpp
index 1760b05..39e2507 100644
--- a/tools/assistant/lib/fulltextsearch/qquery.cpp
+++ b/tools/assistant/lib/fulltextsearch/qquery.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qquery_p.h b/tools/assistant/lib/fulltextsearch/qquery_p.h
index b1d0931..53c42d3 100644
--- a/tools/assistant/lib/fulltextsearch/qquery_p.h
+++ b/tools/assistant/lib/fulltextsearch/qquery_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qqueryparser.cpp b/tools/assistant/lib/fulltextsearch/qqueryparser.cpp
index 6f546be..2a27bcc 100644
--- a/tools/assistant/lib/fulltextsearch/qqueryparser.cpp
+++ b/tools/assistant/lib/fulltextsearch/qqueryparser.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
@@ -38,15 +45,15 @@ QCLuceneQueryParserPrivate::~QCLuceneQueryParserPrivate()
 }
 
 
-QCLuceneQueryParser::QCLuceneQueryParser(const QString &field, 
+QCLuceneQueryParser::QCLuceneQueryParser(const QString &field,
                                          QCLuceneAnalyzer &analyzer)
     : d(new QCLuceneQueryParserPrivate())
     , field(field)
     , analyzer(analyzer)
 {
     TCHAR *fieldName = QStringToTChar(field);
-    
-    d->queryParser = new lucene::queryParser::QueryParser(fieldName, 
+
+    d->queryParser = new lucene::queryParser::QueryParser(fieldName,
         analyzer.d->analyzer);
 
     delete [] fieldName;
@@ -114,7 +121,7 @@ QCLuceneMultiFieldQueryParser::~QCLuceneMultiFieldQueryParser()
     // nothing todo
 }
 
-QCLuceneQuery* QCLuceneMultiFieldQueryParser::parse(const QString &query, 
+QCLuceneQuery* QCLuceneMultiFieldQueryParser::parse(const QString &query,
                                                     const QStringList &fieldList,
                                                     QCLuceneAnalyzer &analyzer)
 {
@@ -144,7 +151,7 @@ QCLuceneQuery* QCLuceneMultiFieldQueryParser::parse(const QString &query,
         if (q) {
             qint32 flag = flags.at(i);
             switch (flag) {
-                case QCLuceneMultiFieldQueryParser::REQUIRED_FIELD: {    
+                case QCLuceneMultiFieldQueryParser::REQUIRED_FIELD: {
                     retValue->add(q, true, true, false);
                 }   break;
 
diff --git a/tools/assistant/lib/fulltextsearch/qqueryparser_p.h b/tools/assistant/lib/fulltextsearch/qqueryparser_p.h
index 5a79662..acb4a98 100644
--- a/tools/assistant/lib/fulltextsearch/qqueryparser_p.h
+++ b/tools/assistant/lib/fulltextsearch/qqueryparser_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qreader.cpp b/tools/assistant/lib/fulltextsearch/qreader.cpp
index 3b2d6f5..2d3f39a 100644
--- a/tools/assistant/lib/fulltextsearch/qreader.cpp
+++ b/tools/assistant/lib/fulltextsearch/qreader.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
@@ -16,26 +23,25 @@
 
 QT_BEGIN_NAMESPACE
 
-QCLuceneReaderPrivate::QCLuceneReaderPrivate() 
+QCLuceneReaderPrivate::QCLuceneReaderPrivate()
     : QSharedData()
-{ 
-    reader = 0; 
+{
+    reader = 0;
     deleteCLuceneReader = true;
 }
 
 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()
     : d(new QCLuceneReaderPrivate())
@@ -63,7 +69,7 @@ QCLuceneStringReader::QCLuceneStringReader(const QString &value, qint32 length)
     d->reader = new lucene::util::StringReader(string, int32_t(length));
 }
 
-QCLuceneStringReader::QCLuceneStringReader(const QString &value, qint32 length, 
+QCLuceneStringReader::QCLuceneStringReader(const QString &value, qint32 length,
                                            bool copyData)
     : QCLuceneReader()
     , string(QStringToTChar(value))
diff --git a/tools/assistant/lib/fulltextsearch/qreader_p.h b/tools/assistant/lib/fulltextsearch/qreader_p.h
index b870db1..53ba011 100644
--- a/tools/assistant/lib/fulltextsearch/qreader_p.h
+++ b/tools/assistant/lib/fulltextsearch/qreader_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
@@ -44,11 +51,11 @@ class QCLuceneStandardTokenizer;
 class QHELP_EXPORT QCLuceneReaderPrivate : public QSharedData
 {
 public:
-    QCLuceneReaderPrivate(); 
+    QCLuceneReaderPrivate();
     QCLuceneReaderPrivate(const QCLuceneReaderPrivate &other);
-    
+
     ~QCLuceneReaderPrivate();
-    
+
     Reader* reader;
     bool deleteCLuceneReader;
 
diff --git a/tools/assistant/lib/fulltextsearch/qsearchable.cpp b/tools/assistant/lib/fulltextsearch/qsearchable.cpp
index 70cae91..40a9f1b 100644
--- a/tools/assistant/lib/fulltextsearch/qsearchable.cpp
+++ b/tools/assistant/lib/fulltextsearch/qsearchable.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
@@ -64,19 +71,19 @@ QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query)
     return search(query, QCLuceneFilter());
 }
 
-QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query, 
+QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query,
                                       const QCLuceneFilter &filter)
 {
     return QCLuceneHits(*this, query, filter);
 }
 
-QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query, 
+QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query,
                                       const QCLuceneSort &sort)
 {
     return QCLuceneHits(*this, query, QCLuceneFilter(), sort);
 }
 
-QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query, 
+QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query,
                                       const QCLuceneFilter &filter,
                                       const QCLuceneSort &sort)
 {
@@ -87,7 +94,7 @@ QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query,
 QCLuceneIndexSearcher::QCLuceneIndexSearcher(const QString &path)
     : QCLuceneSearcher()
 {
-    lucene::search::IndexSearcher *searcher = 
+    lucene::search::IndexSearcher *searcher =
         new lucene::search::IndexSearcher(path);
 
     reader.d->reader = searcher->getReader();
@@ -132,7 +139,7 @@ bool QCLuceneIndexSearcher::doc(qint32 i, QCLuceneDocument &document)
 QCLuceneMultiSearcher::QCLuceneMultiSearcher(const QList<QCLuceneSearchable> searchables)
 : QCLuceneSearcher()
 {
-    lucene::search::Searchable** list= 
+    lucene::search::Searchable** list=
         _CL_NEWARRAY(lucene::search::Searchable*, searchables.count());
 
     d->searchable = new lucene::search::MultiSearcher(list);
@@ -162,7 +169,7 @@ qint32 QCLuceneMultiSearcher::subDoc(qint32 index) const
 
     if (searcher == 0)
         return 0;
-    
+
     return qint32(searcher->subDoc(int32_t(index)));
 }
 
@@ -173,7 +180,7 @@ qint32 QCLuceneMultiSearcher::subSearcher(qint32 index) const
 
     if (searcher == 0)
         return 0;
-    
+
     return qint32(searcher->subSearcher(int32_t(index)));
 }
 
@@ -184,7 +191,7 @@ qint32 QCLuceneMultiSearcher::searcherIndex(qint32 index) const
 
     if (searcher == 0)
         return 0;
-    
+
     return qint32(searcher->searcherIndex(int32_t(index)));
 }
 
diff --git a/tools/assistant/lib/fulltextsearch/qsearchable_p.h b/tools/assistant/lib/fulltextsearch/qsearchable_p.h
index 0244b22..7cb8eaa 100644
--- a/tools/assistant/lib/fulltextsearch/qsearchable_p.h
+++ b/tools/assistant/lib/fulltextsearch/qsearchable_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qsort.cpp b/tools/assistant/lib/fulltextsearch/qsort.cpp
index 97ed128..276c3af 100644
--- a/tools/assistant/lib/fulltextsearch/qsort.cpp
+++ b/tools/assistant/lib/fulltextsearch/qsort.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qsort_p.h b/tools/assistant/lib/fulltextsearch/qsort_p.h
index 2eb67a7..455878e 100644
--- a/tools/assistant/lib/fulltextsearch/qsort_p.h
+++ b/tools/assistant/lib/fulltextsearch/qsort_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qterm.cpp b/tools/assistant/lib/fulltextsearch/qterm.cpp
index 10a2f3a..75b9649 100644
--- a/tools/assistant/lib/fulltextsearch/qterm.cpp
+++ b/tools/assistant/lib/fulltextsearch/qterm.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qterm_p.h b/tools/assistant/lib/fulltextsearch/qterm_p.h
index 8a5d691..a93ed44 100644
--- a/tools/assistant/lib/fulltextsearch/qterm_p.h
+++ b/tools/assistant/lib/fulltextsearch/qterm_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qtoken.cpp b/tools/assistant/lib/fulltextsearch/qtoken.cpp
index 9056a7c..d099e27 100644
--- a/tools/assistant/lib/fulltextsearch/qtoken.cpp
+++ b/tools/assistant/lib/fulltextsearch/qtoken.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qtoken_p.h b/tools/assistant/lib/fulltextsearch/qtoken_p.h
index 02979ec..8e8c687 100644
--- a/tools/assistant/lib/fulltextsearch/qtoken_p.h
+++ b/tools/assistant/lib/fulltextsearch/qtoken_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qtokenizer.cpp b/tools/assistant/lib/fulltextsearch/qtokenizer.cpp
index a52410e..ff7367b 100644
--- a/tools/assistant/lib/fulltextsearch/qtokenizer.cpp
+++ b/tools/assistant/lib/fulltextsearch/qtokenizer.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qtokenizer_p.h b/tools/assistant/lib/fulltextsearch/qtokenizer_p.h
index f327336..ab96ac6 100644
--- a/tools/assistant/lib/fulltextsearch/qtokenizer_p.h
+++ b/tools/assistant/lib/fulltextsearch/qtokenizer_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
diff --git a/tools/assistant/lib/fulltextsearch/qtokenstream.cpp b/tools/assistant/lib/fulltextsearch/qtokenstream.cpp
index 0f4ab95..5304cff 100644
--- a/tools/assistant/lib/fulltextsearch/qtokenstream.cpp
+++ b/tools/assistant/lib/fulltextsearch/qtokenstream.cpp
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
@@ -57,4 +64,4 @@ bool QCLuceneTokenStream::next(QCLuceneToken &token)
     return d->tokenStream->next(token.d->token);   
 }
 
-QT_END_NAMESPACE
\ No newline at end of file
+QT_END_NAMESPACE
diff --git a/tools/assistant/lib/fulltextsearch/qtokenstream_p.h b/tools/assistant/lib/fulltextsearch/qtokenstream_p.h
index eff2338..5aab73f 100644
--- a/tools/assistant/lib/fulltextsearch/qtokenstream_p.h
+++ b/tools/assistant/lib/fulltextsearch/qtokenstream_p.h
@@ -1,10 +1,17 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (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.
 **
 ****************************************************************************/
 
-- 
cgit v0.12