summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns/expr
diff options
context:
space:
mode:
Diffstat (limited to 'src/xmlpatterns/expr')
-rw-r--r--src/xmlpatterns/expr/qandexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qapplytemplate_p.h2
-rw-r--r--src/xmlpatterns/expr/qargumentreference_p.h2
-rw-r--r--src/xmlpatterns/expr/qarithmeticexpression.cpp2
-rw-r--r--src/xmlpatterns/expr/qarithmeticexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qattributeconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qattributenamevalidator_p.h2
-rw-r--r--src/xmlpatterns/expr/qaxisstep_p.h2
-rw-r--r--src/xmlpatterns/expr/qcachecells_p.h4
-rw-r--r--src/xmlpatterns/expr/qcallsite_p.h2
-rw-r--r--src/xmlpatterns/expr/qcalltargetdescription_p.h2
-rw-r--r--src/xmlpatterns/expr/qcalltemplate_p.h2
-rw-r--r--src/xmlpatterns/expr/qcastableas_p.h2
-rw-r--r--src/xmlpatterns/expr/qcastas_p.h2
-rw-r--r--src/xmlpatterns/expr/qcastingplatform_p.h2
-rw-r--r--src/xmlpatterns/expr/qcollationchecker_p.h2
-rw-r--r--src/xmlpatterns/expr/qcombinenodes_p.h2
-rw-r--r--src/xmlpatterns/expr/qcommentconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qcontextitem_p.h2
-rw-r--r--src/xmlpatterns/expr/qcopyof_p.h2
-rw-r--r--src/xmlpatterns/expr/qcurrentitemstore_p.h2
-rw-r--r--src/xmlpatterns/expr/qdocumentconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qdocumentcontentvalidator_p.h2
-rw-r--r--src/xmlpatterns/expr/qdynamiccontextstore_p.h2
-rw-r--r--src/xmlpatterns/expr/qelementconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qemptycontainer_p.h2
-rw-r--r--src/xmlpatterns/expr/qemptysequence_p.h2
-rw-r--r--src/xmlpatterns/expr/qevaluationcache_p.h2
-rw-r--r--src/xmlpatterns/expr/qexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qexpressiondispatch_p.h4
-rw-r--r--src/xmlpatterns/expr/qexpressionfactory_p.h2
-rw-r--r--src/xmlpatterns/expr/qexpressionsequence_p.h2
-rw-r--r--src/xmlpatterns/expr/qexpressionvariablereference_p.h2
-rw-r--r--src/xmlpatterns/expr/qexternalvariableloader_p.h2
-rw-r--r--src/xmlpatterns/expr/qexternalvariablereference_p.h2
-rw-r--r--src/xmlpatterns/expr/qfirstitempredicate_p.h2
-rw-r--r--src/xmlpatterns/expr/qforclause_p.h2
-rw-r--r--src/xmlpatterns/expr/qgeneralcomparison_p.h2
-rw-r--r--src/xmlpatterns/expr/qgenericpredicate_p.h2
-rw-r--r--src/xmlpatterns/expr/qifthenclause_p.h2
-rw-r--r--src/xmlpatterns/expr/qinstanceof_p.h2
-rw-r--r--src/xmlpatterns/expr/qletclause_p.h2
-rw-r--r--src/xmlpatterns/expr/qliteral_p.h2
-rw-r--r--src/xmlpatterns/expr/qliteralsequence_p.h2
-rw-r--r--src/xmlpatterns/expr/qnamespaceconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qncnameconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qnodecomparison_p.h2
-rw-r--r--src/xmlpatterns/expr/qnodesort_p.h2
-rw-r--r--src/xmlpatterns/expr/qoperandsiterator_p.h2
-rw-r--r--src/xmlpatterns/expr/qoptimizationpasses_p.h4
-rw-r--r--src/xmlpatterns/expr/qoptimizerblocks_p.h12
-rw-r--r--src/xmlpatterns/expr/qoptimizerframework_p.h6
-rw-r--r--src/xmlpatterns/expr/qorderby_p.h2
-rw-r--r--src/xmlpatterns/expr/qorexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qpaircontainer_p.h2
-rw-r--r--src/xmlpatterns/expr/qparentnodeaxis_p.h2
-rw-r--r--src/xmlpatterns/expr/qpath_p.h2
-rw-r--r--src/xmlpatterns/expr/qpositionalvariablereference_p.h2
-rw-r--r--src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qqnameconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qquantifiedexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qrangeexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qrangevariablereference_p.h2
-rw-r--r--src/xmlpatterns/expr/qreturnorderby_p.h2
-rw-r--r--src/xmlpatterns/expr/qsimplecontentconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qsinglecontainer_p.h2
-rw-r--r--src/xmlpatterns/expr/qsourcelocationreflection_p.h2
-rw-r--r--src/xmlpatterns/expr/qstaticbaseuristore_p.h2
-rw-r--r--src/xmlpatterns/expr/qstaticcompatibilitystore_p.h2
-rw-r--r--src/xmlpatterns/expr/qtemplate_p.h2
-rw-r--r--src/xmlpatterns/expr/qtemplateinvoker_p.h2
-rw-r--r--src/xmlpatterns/expr/qtemplatemode_p.h2
-rw-r--r--src/xmlpatterns/expr/qtemplateparameterreference_p.h2
-rw-r--r--src/xmlpatterns/expr/qtemplatepattern_p.h2
-rw-r--r--src/xmlpatterns/expr/qtextnodeconstructor_p.h2
-rw-r--r--src/xmlpatterns/expr/qtreatas_p.h2
-rw-r--r--src/xmlpatterns/expr/qtriplecontainer_p.h2
-rw-r--r--src/xmlpatterns/expr/qtruthpredicate_p.h2
-rw-r--r--src/xmlpatterns/expr/qunaryexpression_p.h2
-rw-r--r--src/xmlpatterns/expr/qunlimitedcontainer_p.h2
-rw-r--r--src/xmlpatterns/expr/qunresolvedvariablereference_p.h2
-rw-r--r--src/xmlpatterns/expr/quserfunction_p.h2
-rw-r--r--src/xmlpatterns/expr/quserfunctioncallsite_p.h2
-rw-r--r--src/xmlpatterns/expr/qvalidate_p.h2
-rw-r--r--src/xmlpatterns/expr/qvaluecomparison_p.h2
-rw-r--r--src/xmlpatterns/expr/qvariabledeclaration_p.h2
-rw-r--r--src/xmlpatterns/expr/qvariablereference_p.h2
-rw-r--r--src/xmlpatterns/expr/qwithparam_p.h2
-rw-r--r--src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h2
90 files changed, 100 insertions, 100 deletions
diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h
index 3d9b86569a..a05ef4b810 100644
--- a/src/xmlpatterns/expr/qandexpression_p.h
+++ b/src/xmlpatterns/expr/qandexpression_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-logical-expressions">XML Path Language
* (XPath) 2.0, 3.6 Logical Expressions</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class AndExpression : public PairContainer
diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h
index 51034b6a8a..dcf9b3fe45 100644
--- a/src/xmlpatterns/expr/qapplytemplate_p.h
+++ b/src/xmlpatterns/expr/qapplytemplate_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
* atomic values.
*
* @since 4.5
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ApplyTemplate : public TemplateInvoker
diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h
index 42f7252bfc..36909b0d5f 100644
--- a/src/xmlpatterns/expr/qargumentreference_p.h
+++ b/src/xmlpatterns/expr/qargumentreference_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
* This is in other words a variable reference in side a function
* body, that references a function argument.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ArgumentReference : public VariableReference
diff --git a/src/xmlpatterns/expr/qarithmeticexpression.cpp b/src/xmlpatterns/expr/qarithmeticexpression.cpp
index 5110866ea7..e9fb55cb80 100644
--- a/src/xmlpatterns/expr/qarithmeticexpression.cpp
+++ b/src/xmlpatterns/expr/qarithmeticexpression.cpp
@@ -89,7 +89,7 @@ Item ArithmeticExpression::evaluateSingleton(const DynamicContext::Ptr &context)
* evaluates to an invalid representation for @c xs:double.
*
* @since 4.5
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class DelegatingReflectionExpression : public Literal
{
diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h
index a69b026416..1a30b80515 100644
--- a/src/xmlpatterns/expr/qarithmeticexpression_p.h
+++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-arithmetic">XML Path Language
* (XPath) 2.0, 3.4 Arithmetic Expressions</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Q_AUTOTEST_EXPORT ArithmeticExpression : public PairContainer
diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h
index 63e7dc616c..980b2b8f5d 100644
--- a/src/xmlpatterns/expr/qattributeconstructor_p.h
+++ b/src/xmlpatterns/expr/qattributeconstructor_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery
* 1.0: An XML Query Language, 3.7 Constructors</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class AttributeConstructor : public PairContainer
diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h
index 90d7ff6b15..afff4256dd 100644
--- a/src/xmlpatterns/expr/qattributenamevalidator_p.h
+++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
* space is an @c NCName. The atomic value can be of any string type, such as @c xs:untypedAtomic
* of @c xs:string.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class AttributeNameValidator : public SingleContainer
diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h
index 4668b404b6..e22417dba5 100644
--- a/src/xmlpatterns/expr/qaxisstep_p.h
+++ b/src/xmlpatterns/expr/qaxisstep_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
* @short A step in a path expression that with an axis and a node test evaluates
* to a sequence of nodes from the context item.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Q_AUTOTEST_EXPORT AxisStep : public EmptyContainer
diff --git a/src/xmlpatterns/expr/qcachecells_p.h b/src/xmlpatterns/expr/qcachecells_p.h
index 192470cf45..63027ec594 100644
--- a/src/xmlpatterns/expr/qcachecells_p.h
+++ b/src/xmlpatterns/expr/qcachecells_p.h
@@ -76,7 +76,7 @@ namespace QPatternist
* For instance, it can have a null pointer, the empty sequence, and that
* can be the value of its cache.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class ItemCacheCell
{
@@ -106,7 +106,7 @@ namespace QPatternist
* also carried an QAbstractXmlForwardIterator which is the source, such
* that it can continue to populate the cache when it runs out.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class ItemSequenceCacheCell
{
diff --git a/src/xmlpatterns/expr/qcallsite_p.h b/src/xmlpatterns/expr/qcallsite_p.h
index 8c4d2dead3..3bb40a7379 100644
--- a/src/xmlpatterns/expr/qcallsite_p.h
+++ b/src/xmlpatterns/expr/qcallsite_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
* @short Abstract base-class for Expression instances that are callsites
* to other components, such as templates or user functions.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
* @since 4.5
*/
diff --git a/src/xmlpatterns/expr/qcalltargetdescription_p.h b/src/xmlpatterns/expr/qcalltargetdescription_p.h
index a2ce46738c..3298228d4f 100644
--- a/src/xmlpatterns/expr/qcalltargetdescription_p.h
+++ b/src/xmlpatterns/expr/qcalltargetdescription_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
* can also be sub-classed which FunctionSignature do.
*
* @ingroup Patternist_expr
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class Q_AUTOTEST_EXPORT CallTargetDescription : public QSharedData
{
diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h
index bae28baca4..def7fe8170 100644
--- a/src/xmlpatterns/expr/qcalltemplate_p.h
+++ b/src/xmlpatterns/expr/qcalltemplate_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
* @short Implements @c xsl:call-template.
*
* @since 4.5
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class CallTemplate : public TemplateInvoker
diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h
index 3e8799af84..fb548e5b6a 100644
--- a/src/xmlpatterns/expr/qcastableas_p.h
+++ b/src/xmlpatterns/expr/qcastableas_p.h
@@ -67,7 +67,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-castable">XML Path Language
* (XPath) 2.0, 3.10.3 Castable</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class CastableAs : public SingleContainer,
diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h
index 35a6943dde..a87793fd24 100644
--- a/src/xmlpatterns/expr/qcastas_p.h
+++ b/src/xmlpatterns/expr/qcastas_p.h
@@ -73,7 +73,7 @@ namespace QPatternist
* and XPath 2.0 Functions and Operators, 7 Casting</a>
* @see <a href="http://www.w3.org/TR/xpath20/#id-cast">XML Path Language
* (XPath) 2.0, 3.10.2 Cast</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class CastAs : public SingleContainer,
diff --git a/src/xmlpatterns/expr/qcastingplatform_p.h b/src/xmlpatterns/expr/qcastingplatform_p.h
index 98fc645b55..c74150eb56 100644
--- a/src/xmlpatterns/expr/qcastingplatform_p.h
+++ b/src/xmlpatterns/expr/qcastingplatform_p.h
@@ -101,7 +101,7 @@ namespace QPatternist
* function targetType() must be implemented such that CastingPlatform knows
* what type it shall cast to.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
template<typename TSubClass, const bool issueError>
diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h
index 3ce3cf8e51..f7d836a32b 100644
--- a/src/xmlpatterns/expr/qcollationchecker_p.h
+++ b/src/xmlpatterns/expr/qcollationchecker_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
* will const-fold as usual, but otherwise will simply pipe through the value of its argument,
* if it's a supported collation. Otherwise it raise an error, with code ReportContext::FOCH0002.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class CollationChecker : public SingleContainer
diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h
index c88b3d77d8..ed322cf302 100644
--- a/src/xmlpatterns/expr/qcombinenodes_p.h
+++ b/src/xmlpatterns/expr/qcombinenodes_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xquery/#combining_seq">XQuery 1.0: An XML Query
* Language, 3.3.3 Combining QXmlNodeModelIndex Sequences</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Q_AUTOTEST_EXPORT CombineNodes : public PairContainer
diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h
index e103c651ef..1fcc30a09b 100644
--- a/src/xmlpatterns/expr/qcommentconstructor_p.h
+++ b/src/xmlpatterns/expr/qcommentconstructor_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery
* 1.0: An XML Query Language, 3.7 Constructors</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class CommentConstructor : public SingleContainer
diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
index 967cdbc0ff..93a0e364df 100644
--- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
* @short Constructs a namespace on an element, and naturally only appears
* as a child of ElementConstructor.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
* @since 4.5
*/
diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h
index 4a836a2885..bc813d97ac 100644
--- a/src/xmlpatterns/expr/qcontextitem_p.h
+++ b/src/xmlpatterns/expr/qcontextitem_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-context-item-expression">XML Path Language
* (XPath) 2.0, 3.1.4 Context Item Expression</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ContextItem : public EmptyContainer
diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h
index e25b23ef1c..0cd3c2ef77 100644
--- a/src/xmlpatterns/expr/qcopyof_p.h
+++ b/src/xmlpatterns/expr/qcopyof_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
* that's not possible because we're always a child of ElementConstructor,
* currently.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class CopyOf : public SingleContainer
diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h
index 0a4a51f63b..6a45054a08 100644
--- a/src/xmlpatterns/expr/qcurrentitemstore_p.h
+++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
* @short Creates a DynamicContext which provides the focus item for the
* function @c fn:current().
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
* @since 4.5
*/
diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h
index a7bd718c60..13b0a9f298 100644
--- a/src/xmlpatterns/expr/qdocumentconstructor_p.h
+++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery
* 1.0: An XML Query Language, 3.7 Constructors</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class DocumentConstructor : public SingleContainer
diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
index 67dd44d1f4..c2db6a6e02 100644
--- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
+++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
@@ -67,7 +67,7 @@ namespace QPatternist
* before sending them on to a second QAbstractXmlReceiver.
*
* @ingroup Patternist_xdm
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @todo Escape data
*/
class DocumentContentValidator : public QAbstractXmlReceiver
diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
index c2fc0b4cd5..a85ae496ea 100644
--- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h
+++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
* @short Evaluates its operand with an assigned DynamicContext, not
* the one passed to one of the evaluation functions.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class DynamicContextStore : public SingleContainer
diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h
index a2721a387d..99af1acd48 100644
--- a/src/xmlpatterns/expr/qelementconstructor_p.h
+++ b/src/xmlpatterns/expr/qelementconstructor_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery
* 1.0: An XML Query Language, 3.7 Constructors</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ElementConstructor : public PairContainer
diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h
index 2eea7781ba..43c4e94211 100644
--- a/src/xmlpatterns/expr/qemptycontainer_p.h
+++ b/src/xmlpatterns/expr/qemptycontainer_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
/**
* @short Base class for expressions that has no operands.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Q_AUTOTEST_EXPORT EmptyContainer : public Expression
diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h
index 8d4319e8bb..b5a720d27b 100644
--- a/src/xmlpatterns/expr/qemptysequence_p.h
+++ b/src/xmlpatterns/expr/qemptysequence_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
/**
* @short Implements the value instance of empty sequence: <tt>()</tt>.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_xdm
*/
class EmptySequence : public EmptyContainer
diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h
index f8895d3638..e7676272c6 100644
--- a/src/xmlpatterns/expr/qevaluationcache_p.h
+++ b/src/xmlpatterns/expr/qevaluationcache_p.h
@@ -89,7 +89,7 @@ namespace QPatternist
* variable is only referenced once. In those cases EvaluationCache removes
* itself as an optimization; implemented in compress().
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
template<bool IsForGlobal>
diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h
index 48535ae4c1..173f2a8a3d 100644
--- a/src/xmlpatterns/expr/qexpression_p.h
+++ b/src/xmlpatterns/expr/qexpression_p.h
@@ -159,7 +159,7 @@ namespace QPatternist
* @see <a href="http://www.w3.org/TR/xquery-xpath-parsing/">Building a Tokenizer
* for XPath or XQuery</a>
* @see ExpressionFactory
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Q_AUTOTEST_EXPORT Expression : public QSharedData
diff --git a/src/xmlpatterns/expr/qexpressiondispatch_p.h b/src/xmlpatterns/expr/qexpressiondispatch_p.h
index 03c3283c3f..d0e7fcb705 100644
--- a/src/xmlpatterns/expr/qexpressiondispatch_p.h
+++ b/src/xmlpatterns/expr/qexpressiondispatch_p.h
@@ -143,7 +143,7 @@ namespace QPatternist
/**
* @ingroup Patternist_expr_dispatch
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class ExpressionVisitorResult : public QSharedData
{
@@ -155,7 +155,7 @@ namespace QPatternist
/**
* @ingroup Patternist_expr_dispatch
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class ExpressionVisitor : public QSharedData
{
diff --git a/src/xmlpatterns/expr/qexpressionfactory_p.h b/src/xmlpatterns/expr/qexpressionfactory_p.h
index f78181768f..c93766e2d9 100644
--- a/src/xmlpatterns/expr/qexpressionfactory_p.h
+++ b/src/xmlpatterns/expr/qexpressionfactory_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
* @short The central entry point for compiling expressions.
*
* @ingroup Patternist_expressions
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class Q_AUTOTEST_EXPORT ExpressionFactory : public QSharedData
{
diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h
index 79a37c4ce4..57259fc94e 100644
--- a/src/xmlpatterns/expr/qexpressionsequence_p.h
+++ b/src/xmlpatterns/expr/qexpressionsequence_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#construct_seq">XML Path Language
* (XPath) 2.0, 3.3.1 Constructing Sequences</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ExpressionSequence : public UnlimitedContainer
diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
index 590ff6c121..e0caded609 100644
--- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
* This AST node is only used up until the typeCheck() stage. Therefore it
* has no functions for evaluation, such as evaluateSequence().
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ExpressionVariableReference : public VariableReference
diff --git a/src/xmlpatterns/expr/qexternalvariableloader_p.h b/src/xmlpatterns/expr/qexternalvariableloader_p.h
index 6398c56ed9..8d85c60221 100644
--- a/src/xmlpatterns/expr/qexternalvariableloader_p.h
+++ b/src/xmlpatterns/expr/qexternalvariableloader_p.h
@@ -85,7 +85,7 @@ namespace QPatternist
* announceExternalVariable() is called.
*
* @ingroup Patternist_xdm
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class Q_AUTOTEST_EXPORT ExternalVariableLoader : public QSharedData
{
diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h
index 86614c89ab..c54435d2e4 100644
--- a/src/xmlpatterns/expr/qexternalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
* uses DynamicContext::externalVariableLoader() for retrieving its value, while
* a VariableReference sub-class uses slots in the DynamicContext.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ExternalVariableReference : public EmptyContainer
diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h
index 77ed15bcd2..71b1a04e62 100644
--- a/src/xmlpatterns/expr/qfirstitempredicate_p.h
+++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
* FirstItemPredicate corresponds exactly to the predicate
* in the expression <tt>input[1]</tt>.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class FirstItemPredicate : public SingleContainer
diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h
index b898552395..0af7eb34e2 100644
--- a/src/xmlpatterns/expr/qforclause_p.h
+++ b/src/xmlpatterns/expr/qforclause_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-for-expressions">XML Path Language
* (XPath) 2.0, 3.7 For Expressions</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ForClause : public PairContainer
diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h
index 84d4b3ef53..dab823aaec 100644
--- a/src/xmlpatterns/expr/qgeneralcomparison_p.h
+++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-general-comparisons">XML Path Language
* (XPath) 2.0, 3.5.2 General Comparisons</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class GeneralComparison : public PairContainer,
diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h
index 804823a90f..d72b56d723 100644
--- a/src/xmlpatterns/expr/qgenericpredicate_p.h
+++ b/src/xmlpatterns/expr/qgenericpredicate_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
*
* @see FirstItemPredicate
* @see TruthPredicate
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class GenericPredicate : public PairContainer
diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h
index d074e606f0..990bece4f0 100644
--- a/src/xmlpatterns/expr/qifthenclause_p.h
+++ b/src/xmlpatterns/expr/qifthenclause_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-conditionals">XML Path Language (XPath) 2.0,
* 3.8 Conditional Expressions</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class IfThenClause : public TripleContainer
diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h
index 921a4d9b23..5c35cec8b6 100644
--- a/src/xmlpatterns/expr/qinstanceof_p.h
+++ b/src/xmlpatterns/expr/qinstanceof_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-instance-of">XML Path Language (XPath) 2.0,
* 3.10.1 Instance Of</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Q_AUTOTEST_EXPORT InstanceOf : public SingleContainer
diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h
index 08915b352e..139f45c7ad 100644
--- a/src/xmlpatterns/expr/qletclause_p.h
+++ b/src/xmlpatterns/expr/qletclause_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
* <tt>return</tt> expression, and the ExpressionVariableReference will
* handle the evaluation of the variable.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class LetClause : public PairContainer
diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h
index 104c6f8d2f..9936181a9c 100644
--- a/src/xmlpatterns/expr/qliteral_p.h
+++ b/src/xmlpatterns/expr/qliteral_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xquery/#id-literals">XQuery 1.0: An XML Query Language,
* 3.1.1 Literals</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Literal : public EmptyContainer
diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h
index 771fcd4024..7e72bf7a67 100644
--- a/src/xmlpatterns/expr/qliteralsequence_p.h
+++ b/src/xmlpatterns/expr/qliteralsequence_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xquery/#id-literals">XQuery 1.0: An XML Query Language,
* 3.1.1 Literals</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class LiteralSequence : public EmptyContainer
diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
index 5371a7e114..a6dd435646 100644
--- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
* @short Constructs a namespace on an element, and naturally only appears
* as a child of ElementConstructor.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class NamespaceConstructor : public EmptyContainer
diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h
index a79d49eb53..03382bc1b4 100644
--- a/src/xmlpatterns/expr/qncnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qncnameconstructor_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
* space is an @c NCName. The atomic value can be of any string type, such as @c xs:untypedAtomic
* of @c xs:string.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class NCNameConstructor : public SingleContainer
diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h
index 0db10a8e2f..7f2891b8e2 100644
--- a/src/xmlpatterns/expr/qnodecomparison_p.h
+++ b/src/xmlpatterns/expr/qnodecomparison_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-node-comparisons">XML Path Language
* (XPath) 2.0, 3.5.3 QXmlNodeModelIndex Comparisons</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Q_AUTOTEST_EXPORT NodeComparison : public PairContainer
diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h
index 4d47f8c22b..7206461dae 100644
--- a/src/xmlpatterns/expr/qnodesort_p.h
+++ b/src/xmlpatterns/expr/qnodesort_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
* @short De-duplicates and sorts in document order the content that its
* operand returns.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class NodeSortExpression : public SingleContainer
diff --git a/src/xmlpatterns/expr/qoperandsiterator_p.h b/src/xmlpatterns/expr/qoperandsiterator_p.h
index 9eadb58c6f..65d1dba7bd 100644
--- a/src/xmlpatterns/expr/qoperandsiterator_p.h
+++ b/src/xmlpatterns/expr/qoperandsiterator_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
* The order is delivered in a defined way, from left to right and depth
* first.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class OperandsIterator
{
diff --git a/src/xmlpatterns/expr/qoptimizationpasses_p.h b/src/xmlpatterns/expr/qoptimizationpasses_p.h
index 7597571b9f..719773e60a 100644
--- a/src/xmlpatterns/expr/qoptimizationpasses_p.h
+++ b/src/xmlpatterns/expr/qoptimizationpasses_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
/**
* @short Contains a set of common OptimizerPass instances.
*
- * @author Frans englich <fenglich@trolltech.com>
+ * @author Frans englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
namespace OptimizationPasses
@@ -119,7 +119,7 @@ namespace QPatternist
* This class is not supposed to be instantiated, but to be used via its init()
* function. In fact, this class cannot be instantiated.
*
- * @author Frans englich <fenglich@trolltech.com>
+ * @author Frans englich <frans.englich@nokia.com>
*/
class Coordinator
{
diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h
index bff108f7a0..848f0871da 100644
--- a/src/xmlpatterns/expr/qoptimizerblocks_p.h
+++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
/**
* @short Identifies Expression instances by their Expression::id().
*
- * @author Frans englich <fenglich@trolltech.com>
+ * @author Frans englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ByIDIdentifier : public ExpressionIdentifier
@@ -91,7 +91,7 @@ namespace QPatternist
* item type <tt>xs:string</tt>, but returns @c false for a static type involving
* <tt>xs:date</tt>.
*
- * @author Frans englich <fenglich@trolltech.com>
+ * @author Frans englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class BySequenceTypeIdentifier : public ExpressionIdentifier
@@ -114,7 +114,7 @@ namespace QPatternist
* @short Determines whether an Expression is a value or general comparison or both,
* with a certain operator.
*
- * @author Frans englich <fenglich@trolltech.com>
+ * @author Frans englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ComparisonIdentifier : public ExpressionIdentifier
@@ -153,7 +153,7 @@ namespace QPatternist
* For example IntegerIdentifier(4) would match the former but
* not the latter operand in this expression: "4 + 5".
*
- * @author Frans englich <fenglich@trolltech.com>
+ * @author Frans englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class IntegerIdentifier : public ExpressionIdentifier
@@ -172,7 +172,7 @@ namespace QPatternist
* For example BooleanIdentifier(true) would match the former but
* not the latter operand in this expression: "true() + false()".
*
- * @author Frans englich <fenglich@trolltech.com>
+ * @author Frans englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class BooleanIdentifier : public ExpressionIdentifier
@@ -191,7 +191,7 @@ namespace QPatternist
* For example, if ByIDCreator() is passed Expression::IDCountFN, create()
* will return CountFN instances.
*
- * @author Frans englich <fenglich@trolltech.com>
+ * @author Frans englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ByIDCreator : public ExpressionCreator
diff --git a/src/xmlpatterns/expr/qoptimizerframework_p.h b/src/xmlpatterns/expr/qoptimizerframework_p.h
index 6e2978dc5e..d4ba2bdb17 100644
--- a/src/xmlpatterns/expr/qoptimizerframework_p.h
+++ b/src/xmlpatterns/expr/qoptimizerframework_p.h
@@ -73,7 +73,7 @@ namespace QPatternist
* This class and sub-classes are never used on their own,
* but in cooperation with OptimizationPass.
*
- * @author Frans englich <fenglich@trolltech.com>
+ * @author Frans englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ExpressionCreator : public QSharedData
@@ -120,7 +120,7 @@ namespace QPatternist
* This class and sub-classes are never used on their own,
* but in cooperation with OptimizationPass.
*
- * @author Frans englich <fenglich@trolltech.com>
+ * @author Frans englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ExpressionIdentifier : public QSharedData
@@ -176,7 +176,7 @@ namespace QPatternist
* and resultCreator interacts with one another is described in more detail
* in the member documentation as well as the classes they are instances of.
*
- * @author Frans englich <fenglich@trolltech.com>
+ * @author Frans englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class OptimizationPass : public QSharedData
diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h
index d9cba1c705..ec2b4b9ff5 100644
--- a/src/xmlpatterns/expr/qorderby_p.h
+++ b/src/xmlpatterns/expr/qorderby_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
* The child of the ForClause is a ReturnOrderBy expression, which collects
* the sort keys and values.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class OrderBy : public SingleContainer
diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h
index 6e8128037f..41df9ff986 100644
--- a/src/xmlpatterns/expr/qorexpression_p.h
+++ b/src/xmlpatterns/expr/qorexpression_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-logical-expressions">XML Path Language
* (XPath) 2.0, 3.6 Logical Expressions</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class OrExpression : public AndExpression
diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h
index 9abe8b12be..e9a795a0b4 100644
--- a/src/xmlpatterns/expr/qpaircontainer_p.h
+++ b/src/xmlpatterns/expr/qpaircontainer_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
/**
* @short Base class for expressions that has exactly two operands.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class PairContainer : public Expression
diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h
index 6fdbf69d55..e409a113c1 100644
--- a/src/xmlpatterns/expr/qparentnodeaxis_p.h
+++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
* line the API it is now gone and hence the node performs exactly the same
* as AxisStep.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ParentNodeAxis : public EmptyContainer
diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h
index 99c26c6f52..1ff0dda1ca 100644
--- a/src/xmlpatterns/expr/qpath_p.h
+++ b/src/xmlpatterns/expr/qpath_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xquery/#id-path-expressions">XQuery 1.0: An
* XML Query Language, 3.2 Path Expressions</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Path : public PairContainer
diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
index 3270da040f..26d4b2dfdd 100644
--- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
* @short A reference to an @c at variable, declared with the
* <tt>for</tt>-part in XQuery's FLWOR expression.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class PositionalVariableReference : public VariableReference
diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
index e1de36d717..ebe25c5925 100644
--- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
+++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery
* 1.0: An XML Query Language, 3.7 Constructors</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ProcessingInstructionConstructor : public PairContainer
diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h
index 030310acc0..a519205d5e 100644
--- a/src/xmlpatterns/expr/qqnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qqnameconstructor_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
*
* @see QQNameValue
* @see QXmlUtils
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class QNameConstructor : public SingleContainer
diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h
index fa591ba505..2e03625e58 100644
--- a/src/xmlpatterns/expr/qquantifiedexpression_p.h
+++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-quantified-expressions">XML Path Language
* (XPath) 2.0, 3.9 Quantified Expressions</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Q_AUTOTEST_EXPORT QuantifiedExpression : public PairContainer
diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h
index 9840fa6af6..641a6d00bf 100644
--- a/src/xmlpatterns/expr/qrangeexpression_p.h
+++ b/src/xmlpatterns/expr/qrangeexpression_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
* @see <a href="http://www.w3.org/TR/xpath20/#construct_seq">XML Path Language
* (XPath) 2.0, 3.3.1 Constructing Sequences</a>
* @see RangeIterator
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class RangeExpression : public PairContainer
diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h
index 9c4228d9e2..8cbf706635 100644
--- a/src/xmlpatterns/expr/qrangevariablereference_p.h
+++ b/src/xmlpatterns/expr/qrangevariablereference_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
* expression provides the binding and iteration. A @c for expression is
* a good example.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class RangeVariableReference : public VariableReference
diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h
index a7068298f8..4f5de81735 100644
--- a/src/xmlpatterns/expr/qreturnorderby_p.h
+++ b/src/xmlpatterns/expr/qreturnorderby_p.h
@@ -67,7 +67,7 @@ namespace QPatternist
* ReturnOrderBy evaluates the sort keys and values, and hands it over to
* OrderBy, which is an AST ancestor, using SortTuples.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ReturnOrderBy : public UnlimitedContainer
diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
index 6c0a896ff5..2b393d74ee 100644
--- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
* @see XSLTSimpleContentConstructor
* @see <a href="http://www.w3.org/TR/xquery/#id-attributes">XQuery 1.0:
* An XML Query Language, 3.7.1.1 Attributes</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class SimpleContentConstructor : public SingleContainer
diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h
index a55ea9775d..6787f89a19 100644
--- a/src/xmlpatterns/expr/qsinglecontainer_p.h
+++ b/src/xmlpatterns/expr/qsinglecontainer_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
/**
* @short Base class for expressions that has exactly one operand.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class SingleContainer : public Expression
diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h
index 04f2f11f69..e8d7026c55 100644
--- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h
+++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h
@@ -76,7 +76,7 @@ namespace QPatternist
* If sourceLocation() returns a non-null object, it will be used instead
* of looking up via actualReflection().
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Q_AUTOTEST_EXPORT SourceLocationReflection
diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
index 410ad6d67e..adfb8f7fc6 100644
--- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h
+++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
* used when @c xml:base attributes appears.
*
* @see StaticBaseURIContext
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
* @since 4.5
*/
diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
index a82141c906..6704b68481 100644
--- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
+++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
* Used for XSL-T 2.0's backwards compatibility mode.
*
* @see StaticCompatibilityContext
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
* @since 4.5
*/
diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h
index 92d50e6568..72fd508509 100644
--- a/src/xmlpatterns/expr/qtemplate_p.h
+++ b/src/xmlpatterns/expr/qtemplate_p.h
@@ -77,7 +77,7 @@ namespace QPatternist
* @see TemplateMode
* @see TemplatePattern
* @see UserFunction
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
* @since 4.5
*/
diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h
index bc7864a390..c946139d51 100644
--- a/src/xmlpatterns/expr/qtemplateinvoker_p.h
+++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
*
* TemplateInvoker is intended to be sub-classed.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
* @since 4.5
*/
diff --git a/src/xmlpatterns/expr/qtemplatemode_p.h b/src/xmlpatterns/expr/qtemplatemode_p.h
index bbc1d48e96..909969410a 100644
--- a/src/xmlpatterns/expr/qtemplatemode_p.h
+++ b/src/xmlpatterns/expr/qtemplatemode_p.h
@@ -67,7 +67,7 @@ namespace QPatternist
*
* @see Template
* @see TemplatePattern
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
* @since 4.5
*/
diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
index 9af64c3791..45ebf3f3c8 100644
--- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h
+++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
/**
* @short A reference to a template parameter declared with @c xsl:param.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
* @since 4.5
*/
diff --git a/src/xmlpatterns/expr/qtemplatepattern_p.h b/src/xmlpatterns/expr/qtemplatepattern_p.h
index 87d70a317c..12254df6aa 100644
--- a/src/xmlpatterns/expr/qtemplatepattern_p.h
+++ b/src/xmlpatterns/expr/qtemplatepattern_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
*
* @see TemplateMode
* @see Template
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
* @since 4.5
*/
diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
index 82c03964d9..a23e0beb7d 100644
--- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h
+++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery
* 1.0: An XML Query Language, 3.7 Constructors</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class TextNodeConstructor : public SingleContainer
diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h
index 6c4465daa5..116756e3ae 100644
--- a/src/xmlpatterns/expr/qtreatas_p.h
+++ b/src/xmlpatterns/expr/qtreatas_p.h
@@ -76,7 +76,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-treat">XML Path Language
* (XPath) 2.0, 3.10.5 Treat</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class TreatAs : public SingleContainer
diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h
index 8f22072b1a..e09d4d59ef 100644
--- a/src/xmlpatterns/expr/qtriplecontainer_p.h
+++ b/src/xmlpatterns/expr/qtriplecontainer_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
/**
* @short Base class for expressions that has exactly three operands.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class TripleContainer : public Expression
diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h
index 8a1b12e8a0..0dd0c87508 100644
--- a/src/xmlpatterns/expr/qtruthpredicate_p.h
+++ b/src/xmlpatterns/expr/qtruthpredicate_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
* @short A predicate which is optimized for filter expressions that
* are of type @c xs:boolean.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class TruthPredicate : public GenericPredicate
diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h
index 97bd887bef..ba7a5ef2af 100644
--- a/src/xmlpatterns/expr/qunaryexpression_p.h
+++ b/src/xmlpatterns/expr/qunaryexpression_p.h
@@ -90,7 +90,7 @@ namespace QPatternist
* 2.0 Functions and Operators, 6.2.7 op:numeric-unary-plus</a>
* @see <a href="http://www.w3.org/TR/xpath-functions/#func-numeric-unary-minus">XQuery 1.0 and XPath
* 2.0 Functions and Operators, 6.2.8 op:numeric-unary-minus</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class UnaryExpression : public ArithmeticExpression
diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
index 6e66d896c0..28908d610a 100644
--- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h
+++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
/**
* @short Base class for expressions that has any amount of operands.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class UnlimitedContainer : public Expression
diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
index 28fe0f52a3..217efe87d2 100644
--- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
+++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
*
* This can not appear in XQuery, but can in XSL-T.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
* @since 4.5
*/
diff --git a/src/xmlpatterns/expr/quserfunction_p.h b/src/xmlpatterns/expr/quserfunction_p.h
index 88899aeae0..fa6101a863 100644
--- a/src/xmlpatterns/expr/quserfunction_p.h
+++ b/src/xmlpatterns/expr/quserfunction_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
*
* @see UserFunctionCall
* @see ArgumentReference
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class UserFunction : public QSharedData
diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
index e4bca61291..841cdadc36 100644
--- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h
+++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
*
* @see UserFunction
* @see ArgumentReference
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class UserFunctionCallsite : public CallSite
diff --git a/src/xmlpatterns/expr/qvalidate_p.h b/src/xmlpatterns/expr/qvalidate_p.h
index a511e5d254..8f1fb53470 100644
--- a/src/xmlpatterns/expr/qvalidate_p.h
+++ b/src/xmlpatterns/expr/qvalidate_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
* Query Language, 3.13 Validate Expressions</a>
* @see <a href="http://www.w3.org/TR/xquery/#id-schema-validation-feature">XQuery 1.0: An
* XML Query Language, 5.2.2 Schema Validation Feature</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class Validate
diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h
index 0c3f530fc3..d5cdb5078b 100644
--- a/src/xmlpatterns/expr/qvaluecomparison_p.h
+++ b/src/xmlpatterns/expr/qvaluecomparison_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xpath20/#id-value-comparisons">XML Path Language
* (XPath) 2.0, 3.5.1 Value Comparisons</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class ValueComparison : public PairContainer,
diff --git a/src/xmlpatterns/expr/qvariabledeclaration_p.h b/src/xmlpatterns/expr/qvariabledeclaration_p.h
index 0db7a1c464..9e5d261f17 100644
--- a/src/xmlpatterns/expr/qvariabledeclaration_p.h
+++ b/src/xmlpatterns/expr/qvariabledeclaration_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
* the compilation stage.
*
* @see FunctionArgument
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class VariableDeclaration : public QSharedData
diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h
index 13bcc07049..bba33199be 100644
--- a/src/xmlpatterns/expr/qvariablereference_p.h
+++ b/src/xmlpatterns/expr/qvariablereference_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
/**
* @short Baseclass for classes being references to variables.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class VariableReference : public EmptyContainer
diff --git a/src/xmlpatterns/expr/qwithparam_p.h b/src/xmlpatterns/expr/qwithparam_p.h
index 4a09aa69c0..87c67165fb 100644
--- a/src/xmlpatterns/expr/qwithparam_p.h
+++ b/src/xmlpatterns/expr/qwithparam_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
*
* @since 4.5
* @ingroup Patternist_expressions
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
*/
class WithParam : public FunctionArgument
{
diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
index 29821991de..3f12e28b33 100644
--- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
*
* @see <a href="http://www.w3.org/TR/xslt20/#constructing-simple-content">XSL
* Transformations (XSLT) Version 2.0, 5.7.2 Constructing Simple Content</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_expressions
*/
class XSLTSimpleContentConstructor : public SimpleContentConstructor