diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 20:21:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-18 20:21:35 (GMT) |
| commit | 14866f7fd79f39c2f20f5e0149fe6e11d7121d70 (patch) | |
| tree | bd6ec2bdb8e9f2656a409aacf215e2a2d08345a8 /tools/assistant/lib/qhelpsearchindexreader_default.cpp | |
| parent | 52e517b50aafd6cc0bec597abd50d8b3f7e982dd (diff) | |
| parent | 4f4cc6e0ea79e1c363fd6f62de16c96f9c82b375 (diff) | |
| download | Qt-14866f7fd79f39c2f20f5e0149fe6e11d7121d70.zip Qt-14866f7fd79f39c2f20f5e0149fe6e11d7121d70.tar.gz Qt-14866f7fd79f39c2f20f5e0149fe6e11d7121d70.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Help system: Remove hard-coded qt namespace.
Help system: Handle all Clucene exceptions.
Diffstat (limited to 'tools/assistant/lib/qhelpsearchindexreader_default.cpp')
| -rw-r--r-- | tools/assistant/lib/qhelpsearchindexreader_default.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/assistant/lib/qhelpsearchindexreader_default.cpp b/tools/assistant/lib/qhelpsearchindexreader_default.cpp index d2241a5..11a50d9 100644 --- a/tools/assistant/lib/qhelpsearchindexreader_default.cpp +++ b/tools/assistant/lib/qhelpsearchindexreader_default.cpp @@ -52,9 +52,8 @@ QT_BEGIN_NAMESPACE -namespace qt { - namespace fulltextsearch { - namespace std { +namespace fulltextsearch { +namespace std { namespace { QStringList split( const QString &str ) @@ -607,8 +606,7 @@ void QHelpSearchIndexReaderDefault::run() emit searchingFinished(hitList.count()); } - } // namespace std - } // namespace fulltextsearch -} // namespace qt +} // namespace std +} // namespace fulltextsearch QT_END_NAMESPACE |