Changeset 846 for trunk/tools/assistant/lib/fulltextsearch

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/assistant/lib/fulltextsearch/fulltextsearch.pro (modified) (2 diffs)
• tools/assistant/lib/fulltextsearch/qanalyzer.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qanalyzer_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qclucene-config_p.h (modified) (2 diffs)
• tools/assistant/lib/fulltextsearch/qclucene_global_p.h (modified) (2 diffs)
• tools/assistant/lib/fulltextsearch/qdocument.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qdocument_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qfield.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qfield_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qfilter.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qfilter_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qhits.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qhits_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qindexreader.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qindexreader_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qindexwriter.cpp (modified) (2 diffs)
• tools/assistant/lib/fulltextsearch/qindexwriter_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qquery.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qquery_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qqueryparser.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qqueryparser_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qreader.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qreader_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qsearchable.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qsearchable_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qsort.cpp (modified) (2 diffs)
• tools/assistant/lib/fulltextsearch/qsort_p.h (modified) (3 diffs)
• tools/assistant/lib/fulltextsearch/qterm.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qterm_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qtoken.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qtoken_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qtokenizer.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qtokenizer_p.h (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qtokenstream.cpp (modified) (1 diff)
• tools/assistant/lib/fulltextsearch/qtokenstream_p.h (modified) (1 diff)

trunk/tools/assistant/lib/fulltextsearch/fulltextsearch.pro

@@ -32 +32 @@
     CONFIG -= exceptions_off
     CONFIG += exceptions
-    !win32|win32-g++ {
+    !win32|win32-g++* {
         QMAKE_CFLAGS -= -fno-exceptions
         QMAKE_CXXFLAGS -= -fno-exceptions
@@ -49 +49 @@
 # the following define could be set globally in case we need it elsewhere
 solaris* {
-    DEFINES += Q_SOLARIS_VERSION=$$system(uname -r | sed -e 's/5\.//')
+    DEFINES += Q_SOLARIS_VERSION=$$system(uname -r | sed -e 's/5\\.//')
 }

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
@@ -315 +315 @@
 #endif
 
-// Do not use the tchar.h that ships with mingw, this causes the qt build to
-// fail (211547, 211401, etc...), reuse the replacement as with any other compiler
-// #if defined(__MINGW32__)
-//     /* Define to 1 if you have the <tchar.h> header file. */
-// #   ifndef _CL_HAVE_TCHAR_H
-// #   define _CL_HAVE_TCHAR_H  1
-// #   endif
-// #endif
+#if defined(__MINGW32__)
+     /* Define to 1 if you have the <tchar.h> header file. */
+ #   ifndef _CL_HAVE_TCHAR_H
+ #   define _CL_HAVE_TCHAR_H  1
+ #   endif
+#endif
 
 #if defined(__MINGW32__) || defined(__SUNPRO_CC) || defined(__SUNPRO_C)

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
@@ -37 +37 @@
 #include <QtCore/QString>
 
-#if !defined(_MSC_VER)
+#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
 #   if !defined(TCHAR)
 #       if defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T) && !defined(_ASCII)

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
@@ -89 +89 @@
 
     d->writer->addIndexes(readerArray);
-    delete readerArray; 
+    delete [] readerArray;
 }
 

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
@@ -85 +85 @@
     for (int i = 0; i < fieldNames.count(); ++i)
         delete [] nameArray[i];
-    delete nameArray;
+    delete [] nameArray;
 }
 

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
@@ -65 +65 @@
 {
 public:
-        QCLuceneSort();
-        QCLuceneSort(const QStringList &fieldNames);
-    QCLuceneSort(const QString &field, bool reverse = false);
+    QCLuceneSort();
+    explicit QCLuceneSort(const QStringList &fieldNames);
+    explicit QCLuceneSort(const QString &field, bool reverse = false);
 
     virtual ~QCLuceneSort();
@@ -73 +73 @@
     QString toString() const;
     void setSort(const QStringList &fieldNames);
-        void setSort(const QString &field, bool reverse = false);
+    void setSort(const QString &field, bool reverse = false);
 
 protected:

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **

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

@@ -4 +4 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **