Ignore:
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:
35 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/assistant/lib/fulltextsearch/qanalyzer.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
    5 **
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
     5**
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2835{
    2936    analyzer = _CL_POINTER(other.analyzer);
     37    deleteCLuceneAnalyzer = other.deleteCLuceneAnalyzer;
    3038}
    3139

  • trunk/tools/assistant/lib/fulltextsearch/qanalyzer_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qclucene-config_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qclucene_global_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2936#include <QtCore/QChar>
    3037#include <QtCore/QString>
     38
     39#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
     40#   if !defined(TCHAR)
     41#       define TCHAR wchar_t
     42#   endif
     43#else
     44#   include <windows.h>
     45#endif
    3146
    3247QT_BEGIN_HEADER
    … …  
    88103#endif
    89104
    90 #if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
    91 #   if !defined(TCHAR)
    92 #       define TCHAR wchar_t
    93 #   endif
    94 #else
    95 #   include <windows.h>
    96 #endif
    97 
    98105namespace {
    99106    TCHAR* QStringToTChar(const QString &str)

  • trunk/tools/assistant/lib/fulltextsearch/qdocument.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    3037{
    3138    document = _CL_POINTER(other.document);
     39    deleteCLuceneDocument = other.deleteCLuceneDocument;
    3240}
    3341

  • trunk/tools/assistant/lib/fulltextsearch/qdocument_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qfield.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2431    deleteCLuceneField = true;
    2532}
    26    
     33
    2734QCLuceneFieldPrivate::QCLuceneFieldPrivate(const QCLuceneFieldPrivate &other)
    2835    : QSharedData()
    2936{
    3037    field = _CL_POINTER(other.field);
     38    deleteCLuceneField = other.deleteCLuceneField;
    3139}
    3240
    … …  
    5159    TCHAR* fieldName = QStringToTChar(name);
    5260    TCHAR* fieldValue = QStringToTChar(value);
    53    
     61
    5462    d->field = new lucene::document::Field(fieldName, fieldValue, configs);
    5563
    … …  
    6775    reader->d->deleteCLuceneReader = false; // clucene takes ownership
    6876    d->field = new lucene::document::Field(fieldName, reader->d->reader, configs);
    69    
     77
    7078    delete [] fieldName;
    7179}

  • trunk/tools/assistant/lib/fulltextsearch/qfield_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qfilter.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2734{
    2835    filter = _CL_POINTER(other.filter);
     36    deleteCLuceneFilter = other.deleteCLuceneFilter;
    2937}
    3038

  • trunk/tools/assistant/lib/fulltextsearch/qfilter_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

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

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2330    deleteCLuceneHits = true;
    2431}
    25    
     32
    2633QCLuceneHitsPrivate::QCLuceneHitsPrivate(const QCLuceneHitsPrivate &other)
    2734    : QSharedData()
    2835{
    2936    hits = _CL_POINTER(other.hits);
     37    deleteCLuceneHits = other.deleteCLuceneHits;
    3038}
    3139
    … …  
    3745
    3846
    39 QCLuceneHits::QCLuceneHits(const QCLuceneSearcher &searcher, 
     47QCLuceneHits::QCLuceneHits(const QCLuceneSearcher &searcher,
    4048                           const QCLuceneQuery &query, const QCLuceneFilter &filter)
    4149    : d(new QCLuceneHitsPrivate())

  • trunk/tools/assistant/lib/fulltextsearch/qhits_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qindexreader.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2835{
    2936    reader = _CL_POINTER(other.reader);
     37    deleteCLuceneIndexReader = other.deleteCLuceneIndexReader;
    3038}
    3139

  • trunk/tools/assistant/lib/fulltextsearch/qindexreader_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qindexwriter.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2835{
    2936    writer = _CL_POINTER(other.writer);
     37    deleteCLuceneIndexWriter = other.deleteCLuceneIndexWriter;
    3038}
    3139

  • trunk/tools/assistant/lib/fulltextsearch/qindexwriter_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qquery.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2936{
    3037    query = _CL_POINTER(other.query);
     38    deleteCLuceneQuery = other.deleteCLuceneQuery;
    3139}
    3240

  • trunk/tools/assistant/lib/fulltextsearch/qquery_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qqueryparser.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2936{
    3037    queryParser = _CL_POINTER(other.queryParser);
     38    deleteCLuceneQueryParser = other.deleteCLuceneQueryParser;
    3139}
    3240
    … …  
    3846
    3947
    40 QCLuceneQueryParser::QCLuceneQueryParser(const QString &field, 
     48QCLuceneQueryParser::QCLuceneQueryParser(const QString &field,
    4149                                         QCLuceneAnalyzer &analyzer)
    4250    : d(new QCLuceneQueryParserPrivate())
    … …  
    4553{
    4654    TCHAR *fieldName = QStringToTChar(field);
    47    
    48     d->queryParser = new lucene::queryParser::QueryParser(fieldName, 
     55
     56    d->queryParser = new lucene::queryParser::QueryParser(fieldName,
    4957        analyzer.d->analyzer);
    5058
    … …  
    114122}
    115123
    116 QCLuceneQuery* QCLuceneMultiFieldQueryParser::parse(const QString &query, 
     124QCLuceneQuery* QCLuceneMultiFieldQueryParser::parse(const QString &query,
    117125                                                    const QStringList &fieldList,
    118126                                                    QCLuceneAnalyzer &analyzer)
    … …  
    144152            qint32 flag = flags.at(i);
    145153            switch (flag) {
    146                 case QCLuceneMultiFieldQueryParser::REQUIRED_FIELD: {   
     154                case QCLuceneMultiFieldQueryParser::REQUIRED_FIELD: {
    147155                    retValue->add(q, true, true, false);
    148156                }   break;

  • trunk/tools/assistant/lib/fulltextsearch/qqueryparser_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

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

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    1724QT_BEGIN_NAMESPACE
    1825
    19 QCLuceneReaderPrivate::QCLuceneReaderPrivate() 
     26QCLuceneReaderPrivate::QCLuceneReaderPrivate()
    2027    : QSharedData()
    21 { 
    22     reader = 0; 
     28{
     29    reader = 0;
    2330    deleteCLuceneReader = true;
    2431}
    … …  
    2633QCLuceneReaderPrivate::QCLuceneReaderPrivate(const QCLuceneReaderPrivate &other)
    2734    : QSharedData()
    28 {
    29     reader = _CL_POINTER(other.reader);
     35{
     36    reader = _CL_POINTER(other.reader);
     37    deleteCLuceneReader = other.deleteCLuceneReader;
    3038}
    3139
    32 QCLuceneReaderPrivate::~QCLuceneReaderPrivate() 
    33 { 
     40QCLuceneReaderPrivate::~QCLuceneReaderPrivate()
     41{
    3442    if (deleteCLuceneReader)
    3543        _CLDECDELETE(reader);
    3644}
    37    
    3845
    3946QCLuceneReader::QCLuceneReader()
    … …  
    6370}
    6471
    65 QCLuceneStringReader::QCLuceneStringReader(const QString &value, qint32 length, 
     72QCLuceneStringReader::QCLuceneStringReader(const QString &value, qint32 length,
    6673                                           bool copyData)
    6774    : QCLuceneReader()

  • trunk/tools/assistant/lib/fulltextsearch/qreader_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    4552{
    4653public:
    47     QCLuceneReaderPrivate(); 
     54    QCLuceneReaderPrivate();
    4855    QCLuceneReaderPrivate(const QCLuceneReaderPrivate &other);
    49    
     56
    5057    ~QCLuceneReaderPrivate();
    51    
     58
    5259    Reader* reader;
    5360    bool deleteCLuceneReader;

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

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
    5 **
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
     5**
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2734{
    2835    searchable = _CL_POINTER(other.searchable);
     36    deleteCLuceneSearchable = other.deleteCLuceneSearchable;
    2937}
    3038
    … …  
    6472}
    6573
    66 QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query, 
     74QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query,
    6775                                      const QCLuceneFilter &filter)
    6876{
    … …  
    7078}
    7179
    72 QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query, 
     80QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query,
    7381                                      const QCLuceneSort &sort)
    7482{
    … …  
    7684}
    7785
    78 QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query, 
     86QCLuceneHits QCLuceneSearcher::search(const QCLuceneQuery &query,
    7987                                      const QCLuceneFilter &filter,
    8088                                      const QCLuceneSort &sort)
    … …  
    8795    : QCLuceneSearcher()
    8896{
    89     lucene::search::IndexSearcher *searcher = 
     97    lucene::search::IndexSearcher *searcher =
    9098        new lucene::search::IndexSearcher(path);
    9199
    … …  
    132140: QCLuceneSearcher()
    133141{
    134     lucene::search::Searchable** list= 
     142    lucene::search::Searchable** list=
    135143        _CL_NEWARRAY(lucene::search::Searchable*, searchables.count());
    136144
    … …  
    162170    if (searcher == 0)
    163171        return 0;
    164    
     172
    165173    return qint32(searcher->subDoc(int32_t(index)));
    166174}
    … …  
    173181    if (searcher == 0)
    174182        return 0;
    175    
     183
    176184    return qint32(searcher->subSearcher(int32_t(index)));
    177185}
    … …  
    184192    if (searcher == 0)
    185193        return 0;
    186    
     194
    187195    return qint32(searcher->searcherIndex(int32_t(index)));
    188196}

  • trunk/tools/assistant/lib/fulltextsearch/qsearchable_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qsort.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2835{
    2936    sort = _CL_POINTER(other.sort);
     37    deleteCLuceneSort = other.deleteCLuceneSort;
    3038}
    3139

  • trunk/tools/assistant/lib/fulltextsearch/qsort_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qterm.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2835{
    2936    term = _CL_POINTER(other.term);
     37    deleteCLuceneTerm = other.deleteCLuceneTerm;
    3038}
    3139

  • trunk/tools/assistant/lib/fulltextsearch/qterm_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qtoken.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2835{
    2936    token = _CL_POINTER(other.token);
     37    deleteCLuceneToken = other.deleteCLuceneToken;
    3038}
    3139

  • trunk/tools/assistant/lib/fulltextsearch/qtoken_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qtokenizer.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qtokenizer_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/

  • trunk/tools/assistant/lib/fulltextsearch/qtokenstream.cpp

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
    … …  
    2734{
    2835    tokenStream = _CL_POINTER(other.tokenStream);
     36    deleteCLuceneTokenStream = other.deleteCLuceneTokenStream;
    2937}
    3038

  • trunk/tools/assistant/lib/fulltextsearch/qtokenstream_p.h

    r2 r561  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     3** Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team.
     4** All rights reserved.
    55**
    6 ** This file is part of the QCLucene library and is distributable under
    7 ** the terms of the LGPL license as specified in the license.txt file.
     6** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     7** All rights reserved.
     8**
     9** This file may be used under the terms of the GNU Lesser General Public
     10** License version 2.1 as published by the Free Software Foundation and
     11** appearing in the file LICENSE.LGPL included in the packaging of this file.
     12** Please review the following information to ensure the GNU Lesser General
     13** Public License version 2.1 requirements will be met:
     14** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    815**
    916****************************************************************************/
Note: See TracChangeset for help on using the changeset viewer.