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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • 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 ([email protected])
     3** Copyright (C) 200.
     4**
    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
    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;
Note: See TracChangeset for help on using the changeset viewer.