summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns/acceltree
diff options
context:
space:
mode:
Diffstat (limited to 'src/xmlpatterns/acceltree')
-rw-r--r--src/xmlpatterns/acceltree/qacceliterators.cpp2
-rw-r--r--src/xmlpatterns/acceltree/qacceliterators_p.h18
-rw-r--r--src/xmlpatterns/acceltree/qacceltree.cpp2
-rw-r--r--src/xmlpatterns/acceltree/qacceltree_p.h9
-rw-r--r--src/xmlpatterns/acceltree/qacceltreebuilder.cpp2
-rw-r--r--src/xmlpatterns/acceltree/qacceltreebuilder_p.h4
-rw-r--r--src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp2
-rw-r--r--src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h6
-rw-r--r--src/xmlpatterns/acceltree/qcompressedwhitespace.cpp2
-rw-r--r--src/xmlpatterns/acceltree/qcompressedwhitespace_p.h4
10 files changed, 26 insertions, 25 deletions
diff --git a/src/xmlpatterns/acceltree/qacceliterators.cpp b/src/xmlpatterns/acceltree/qacceliterators.cpp
index e6e7f4241..529ac015b 100644
--- a/src/xmlpatterns/acceltree/qacceliterators.cpp
+++ b/src/xmlpatterns/acceltree/qacceliterators.cpp
@@ -34,7 +34,7 @@
** 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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceliterators_p.h b/src/xmlpatterns/acceltree/qacceliterators_p.h
index 74433dc8f..02d7445b2 100644
--- a/src/xmlpatterns/acceltree/qacceliterators_p.h
+++ b/src/xmlpatterns/acceltree/qacceliterators_p.h
@@ -34,7 +34,7 @@
** 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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -65,7 +65,7 @@ namespace QPatternist
* @short Abstract base class for Iterators for the AccelTree, that
* contains common functions and members.
*
- * @author Frans Englich<fenglich@trolltech.com>
+ * @author Frans Englich<frans.englich@nokia.com>
*/
class AccelIterator : public QXmlNodeModelIndex::Iterator
{
@@ -110,7 +110,7 @@ namespace QPatternist
/**
* @short Iterates along the @c ancestor or @c ancestor-or-self axis in an AccelTree.
*
- * @author Frans Englich<fenglich@trolltech.com>
+ * @author Frans Englich<frans.englich@nokia.com>
*/
template<const bool IncludeSelf>
class AncestorIterator : public AccelIterator
@@ -151,7 +151,7 @@ namespace QPatternist
/**
* @short Iterates along the @c child axis in an AccelTree.
*
- * @author Frans Englich<fenglich@trolltech.com>
+ * @author Frans Englich<frans.englich@nokia.com>
*/
class ChildIterator : public AccelIterator
{
@@ -190,7 +190,7 @@ namespace QPatternist
/**
* @short Iterates along the sibling axes in an AccelTree.
*
- * @author Frans Englich<fenglich@trolltech.com>
+ * @author Frans Englich<frans.englich@nokia.com>
*/
template<const bool IsFollowing>
class SiblingIterator : public AccelIterator
@@ -262,7 +262,7 @@ namespace QPatternist
* @short Implements axis @c descendant and @c descendant-or-self for the
* AccelTree.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
template<const bool IncludeSelf>
class DescendantIterator : public AccelIterator
@@ -342,7 +342,7 @@ namespace QPatternist
/**
* @short Implements axis @c following for the AccelTree.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class FollowingIterator : public AccelIterator
{
@@ -362,7 +362,7 @@ namespace QPatternist
/**
* @short Implements axis @c preceding for the AccelTree.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class PrecedingIterator : public AccelIterator
{
@@ -387,7 +387,7 @@ namespace QPatternist
/**
* @short Implements axis @c attribute for the AccelTree.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class AttributeIterator : public AccelIterator
{
diff --git a/src/xmlpatterns/acceltree/qacceltree.cpp b/src/xmlpatterns/acceltree/qacceltree.cpp
index 94acbab63..9b20845b5 100644
--- a/src/xmlpatterns/acceltree/qacceltree.cpp
+++ b/src/xmlpatterns/acceltree/qacceltree.cpp
@@ -34,7 +34,7 @@
** 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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceltree_p.h b/src/xmlpatterns/acceltree/qacceltree_p.h
index 38de08cc6..d91fdf4fa 100644
--- a/src/xmlpatterns/acceltree/qacceltree_p.h
+++ b/src/xmlpatterns/acceltree/qacceltree_p.h
@@ -34,7 +34,7 @@
** 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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -76,7 +76,7 @@ namespace QPatternist
* the Accelerator scheme, so do check out the links. We don't implement any form
* of staircase join, although that is only due to time constraints.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @see <a href="http://www.pathfinder-xquery.org/?q=research/xpath-accel">XPath
* Accelerator</a>
* @see <a href="http://www.pathfinder-xquery.org/files/xpath-accel.pdf">Accelerating
@@ -115,7 +115,7 @@ namespace QPatternist
* BasicNodeData is internal to the Accel tree implementation, and is
* only used by those classes.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @todo Can't m_kind be coded somewhere else? If m_name is invalid,
* its bits can be used to distinguish the node types that doesn't have
* names, and for elements, attributes and processing instructions, we need
@@ -128,6 +128,7 @@ namespace QPatternist
class BasicNodeData
{
public:
+ /* No need to initialize the members. See AccelTreeBuilder. */
inline BasicNodeData()
{
}
@@ -216,7 +217,7 @@ namespace QPatternist
Depth m_depth;
/**
- * Technically it is sufficient with 8 bits. However, at least MSVC
+ * Technically it is sufficient with 7 bits. However, at least MSVC
* 2005 miscompiles it such that QXmlNodeModelIndex::Text becomes
* -64 instead of 64 with hilarious crashes as result.
*
diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder.cpp b/src/xmlpatterns/acceltree/qacceltreebuilder.cpp
index 63372acbc..eb2175cdf 100644
--- a/src/xmlpatterns/acceltree/qacceltreebuilder.cpp
+++ b/src/xmlpatterns/acceltree/qacceltreebuilder.cpp
@@ -34,7 +34,7 @@
** 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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
index 6eb3102e1..723cf2dcd 100644
--- a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
+++ b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
@@ -34,7 +34,7 @@
** 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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -80,7 +80,7 @@ namespace QPatternist
* events from an XML document, otherwise it is assumed the events
* are from node constructor expressions.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
template<bool FromDocument>
class AccelTreeBuilder : public NodeBuilder
diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
index 0e598214b..632033703 100644
--- a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
+++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
@@ -34,7 +34,7 @@
** 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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
index a650dfa33..12edea2fa 100644
--- a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
+++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
@@ -34,7 +34,7 @@
** 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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -76,7 +76,7 @@ namespace QPatternist
* to be used in a blocking manner.
*
* @see AccelTreeResourceLoader::load()
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class NetworkLoop : public QEventLoop
{
@@ -109,7 +109,7 @@ namespace QPatternist
* @short Handles requests for documents, and instantiates
* them as AccelTree instances.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class Q_AUTOTEST_EXPORT AccelTreeResourceLoader : public DeviceResourceLoader
{
diff --git a/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp b/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp
index f540a08cc..ea96ba53a 100644
--- a/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp
+++ b/src/xmlpatterns/acceltree/qcompressedwhitespace.cpp
@@ -34,7 +34,7 @@
** 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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
index e3ffc115a..3c702218a 100644
--- a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
+++ b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
@@ -34,7 +34,7 @@
** 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 http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -82,7 +82,7 @@ namespace QPatternist
*
* The compression scheme originates from Saxon, by Michael Kay.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class CompressedWhitespace
{