diff options
| -rw-r--r-- | doc/changelog.doc | 2 | ||||
| -rw-r--r-- | qtools/qdir.cpp | 8 | ||||
| -rw-r--r-- | qtools/qtl.doc | 2 | ||||
| -rw-r--r-- | qtools/qxml.cpp | 2 | ||||
| -rw-r--r-- | src/code.l | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/doc/changelog.doc b/doc/changelog.doc index 3efb31e..0dcbfa9 100644 --- a/doc/changelog.doc +++ b/doc/changelog.doc @@ -285,7 +285,7 @@ <li>Fix STRIP_FROM_PATH when running from drive root [<a href="http://github.com/doxygen/doxygen/commit/fd808ae3c1e37a8d476d250cf6b4325624a9eccb">view</a>] <li>Fix Windows build instructions. [<a href="http://github.com/doxygen/doxygen/commit/eec8d0a31161746041fc94ccbba5a54aecd8cf93">view</a>] <li>Fix documentation typos [<a href="http://github.com/doxygen/doxygen/commit/770adb37b2072bbea5412f9cc2058d98d1de60e4">view</a>] -<li>Fix for HTML output when using server side search and the the new menu bar [<a href="http://github.com/doxygen/doxygen/commit/0faf45600c6c640bfaf11b017d43a4b9de193ebf">view</a>] +<li>Fix for HTML output when using server side search and the new menu bar [<a href="http://github.com/doxygen/doxygen/commit/0faf45600c6c640bfaf11b017d43a4b9de193ebf">view</a>] <li>Fix for changed references due to different removeRedudantWhiteSpace() implementation [<a href="http://github.com/doxygen/doxygen/commit/f26cc41d0d3d436c809c293a56c66c1f5f953745">view</a>] <li>Fix for empty file name [<a href="http://github.com/doxygen/doxygen/commit/0fead5249b8ef2c3c5cbbbd712855bae877aa27b">view</a>] <li>Fix for error in travis.yml [<a href="http://github.com/doxygen/doxygen/commit/81cf39f249c58db66368d60d596ac164d886ae90">view</a>] diff --git a/qtools/qdir.cpp b/qtools/qdir.cpp index 120abe7..782a9c6 100644 --- a/qtools/qdir.cpp +++ b/qtools/qdir.cpp @@ -705,7 +705,7 @@ QStrList QDir::encodedEntryList( const QString &nameFilter, indicated by the setSorting(), setFilter() and setNameFilter() specifications. - The the filter and sorting specifications can be overridden using the + The filter and sorting specifications can be overridden using the \e filterSpec and \e sortSpec arguments. Returns an empty list if the directory is unreadable or does not exist. @@ -727,7 +727,7 @@ QStringList QDir::entryList( int filterSpec, int sortSpec ) const indicated by the setSorting(), setFilter() and setNameFilter() specifications. - The the filter and sorting specifications can be overridden using the + The filter and sorting specifications can be overridden using the \e nameFilter, \e filterSpec and \e sortSpec arguments. Returns and empty list if the directory is unreadable or does not exist. @@ -755,7 +755,7 @@ QStringList QDir::entryList( const QString &nameFilter, the directory pointed to using the setSorting(), setFilter() and setNameFilter() specifications. - The the filter and sorting specifications can be overridden using the + The filter and sorting specifications can be overridden using the \e filterSpec and \e sortSpec arguments. Returns 0 if the directory is unreadable or does not exist. @@ -782,7 +782,7 @@ const QFileInfoList *QDir::entryInfoList( int filterSpec, int sortSpec ) const the directory pointed to using the setSorting(), setFilter() and setNameFilter() specifications. - The the filter and sorting specifications can be overridden using the + The filter and sorting specifications can be overridden using the \e nameFilter, \e filterSpec and \e sortSpec arguments. Returns 0 if the directory is unreadable or does not exist. diff --git a/qtools/qtl.doc b/qtools/qtl.doc index db5b994..e83b177 100644 --- a/qtools/qtl.doc +++ b/qtools/qtl.doc @@ -111,7 +111,7 @@ end() returns an iterator that points \e after the last element. end() marks an invalid position, it can never be dereferenced. It's the break condition in any iteration, may it be from begin() or fromLast(). For maximum speed, use increment or -decrement iterators with the prefix operator (++it, --it) instead of the the +decrement iterators with the prefix operator (++it, --it) instead of the postfix one (it++, it--), since the former is slightly faster. The same concept applies to the other container classes: diff --git a/qtools/qxml.cpp b/qtools/qxml.cpp index 072997e..4138a28 100644 --- a/qtools/qxml.cpp +++ b/qtools/qxml.cpp @@ -1959,7 +1959,7 @@ bool QXmlSimpleReader::feature( const QString& name, bool *ok ) const <li> http://xml.org/sax/features/namespaces: if this feature is TRUE, namespace processing is performed <li> http://xml.org/sax/features/namespace-prefixes: - if this feature is TRUE, the the original prefixed names and attributes + if this feature is TRUE, the original prefixed names and attributes used for namespace declarations are reported <li> http://trolltech.com/xml/features/report-whitespace-only-CharData: if this feature is TRUE, CharData that consists only of whitespace (and @@ -904,7 +904,7 @@ static bool getLinkInScope(const QCString &c, // scope return TRUE; } } - else // found member, but is is not linkable, so make sure content inside is not assign + else // found member, but it is not linkable, so make sure content inside is not assigned // to the previous member, see bug762760 { DBG_CTX((stderr,"unlinkable member %s\n",md->name().data())); |