Changeset 561 for trunk/tools/assistant/lib/qhelpprojectdata.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/assistant/lib/qhelpprojectdata.cpp (modified) (14 diffs)

trunk/tools/assistant/lib/qhelpprojectdata.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the Qt Assistant of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -42 +42 @@
 #include "qhelpprojectdata_p.h"
 
+#include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 #include <QtCore/QStack>
 #include <QtCore/QMap>
+#include <QtCore/QRegExp>
 #include <QtCore/QVariant>
 #include <QtXml/QXmlStreamReader>
@@ -74 +76 @@
     void readFiles();
     void raiseUnknownTokenError();
+    void addMatchingFiles(const QString &pattern);
+
+    QMap<QString, QStringList> dirEntriesCache;
 };
 
@@ -162 +167 @@
         if (isStartElement()) {
             if (name() == QLatin1String("filterAttribute"))
-                filterSectionList.last().addFilterAttribute(readElementText());                         
+                filterSectionList.last().addFilterAttribute(readElementText());
             else if (name() == QLatin1String("toc"))
                 readTOC();
@@ -245 +250 @@
         if (isStartElement()) {
             if (name() == QLatin1String("file"))
-                filterSectionList.last().addFile(readElementText());
+                addMatchingFiles(readElementText());
             else
                 raiseUnknownTokenError();
@@ -259 +264 @@
 }
 
-
+// Expand file pattern and add matches into list. If the pattern does not match
+// any files, insert the pattern itself so the QHelpGenerator will emit a
+// meaningful warning later.
+void QHelpProjectDataPrivate::addMatchingFiles(const QString &pattern)
+{
+    // The pattern matching is expensive, so we skip it if no
+    // wildcard symbols occur in the string.
+    if (!pattern.contains('?') && !pattern.contains('*')
+        && !pattern.contains('[') && !pattern.contains(']')) {
+        filterSectionList.last().addFile(pattern);
+        return;
+    }
+
+    QFileInfo fileInfo(rootPath + '/' + pattern);
+    const QDir &dir = fileInfo.dir();
+    const QString &path = dir.canonicalPath();
+
+    // QDir::entryList() is expensive, so we cache the results.
+    QMap<QString, QStringList>::ConstIterator it = dirEntriesCache.find(path);
+    const QStringList &entries = it != dirEntriesCache.constEnd() ?
+                                 it.value() : dir.entryList(QDir::Files);
+    if (it == dirEntriesCache.constEnd())
+        dirEntriesCache.insert(path, entries);
+
+    bool matchFound = false;
+#ifdef Q_OS_WIN
+    Qt::CaseSensitivity cs = Qt::CaseInsensitive;
+#else
+    Qt::CaseSensitivity cs = Qt::CaseSensitive;
+#endif
+    QRegExp regExp(fileInfo.fileName(), cs, QRegExp::Wildcard);
+    foreach (const QString &file, entries) {
+        if (regExp.exactMatch(file)) {
+            matchFound = true;
+            filterSectionList.last().
+                addFile(QFileInfo(pattern).dir().path() + '/' + file);
+        }
+    }
+    if (!matchFound)
+        filterSectionList.last().addFile(pattern);
+}
 
 /*!
@@ -325 +370 @@
 
 /*!
-    \reimp
+    \internal
 */
 QString QHelpProjectData::namespaceName() const
@@ -333 +378 @@
 
 /*!
-    \reimp
+    \internal
 */
 QString QHelpProjectData::virtualFolder() const
@@ -341 +386 @@
 
 /*!
-    \reimp
+    \internal
 */
 QList<QHelpDataCustomFilter> QHelpProjectData::customFilters() const
@@ -349 +394 @@
 
 /*!
-    \reimp
+    \internal
 */
 QList<QHelpDataFilterSection> QHelpProjectData::filterSections() const
@@ -357 +402 @@
 
 /*!
-    \reimp
+    \internal
 */
 QMap<QString, QVariant> QHelpProjectData::metaData() const
@@ -365 +410 @@
 
 /*!
-    \reimp
+    \internal
 */
 QString QHelpProjectData::rootPath() const