Update old email address.

Reviewed-by: Trust Me
author: Jason McDonald <jason.mcdonald@nokia.com> 2009-08-11 19:44:38 +1000
committer: Jason McDonald <jason.mcdonald@nokia.com> 2009-08-11 19:44:38 +1000
commit: ef9fec988d3d7ea33836a08128119f99747dc9d5 (patch)
tree: 67c134d1bee2c2338e958c766b23805666674d5a /src
parent: 3058cd5f6ee3fb01e62d625b501e7eeeea70cd84 (diff)
283 files changed, 529 insertions, 529 deletions
diff --git a/src/xmlpatterns/Mainpage.dox b/src/xmlpatterns/Mainpage.dox
index 4b664ae37..cb480085c 100644
--- a/src/xmlpatterns/Mainpage.dox
+++ b/src/xmlpatterns/Mainpage.dox
@@ -92,5 +92,5 @@
  * PatternistSDK, located in the test sources, is documented in the
  * PatternistSDK Doxygen module.
  *
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
  */
diff --git a/src/xmlpatterns/acceltree/qacceliterators_p.h b/src/xmlpatterns/acceltree/qacceliterators_p.h
index 16accdbf9..02d7445b2 100644
--- a/src/xmlpatterns/acceltree/qacceliterators_p.h
+++ b/src/xmlpatterns/acceltree/qacceliterators_p.h
@@ -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_p.h b/src/xmlpatterns/acceltree/qacceltree_p.h
index 3d9c44cc6..38f5a8e64 100644
--- a/src/xmlpatterns/acceltree/qacceltree_p.h
+++ b/src/xmlpatterns/acceltree/qacceltree_p.h
@@ -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
diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
index 9389b7e42..723cf2dcd 100644
--- a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
+++ b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
@@ -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_p.h b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
index efd0a4f71..12edea2fa 100644
--- a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
+++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
@@ -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_p.h b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
index bbc5a66b6..3c702218a 100644
--- a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
+++ b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
@@ -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
     {
diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp b/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp
index 2395369bd..0ed9560b5 100644
--- a/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp
+++ b/src/xmlpatterns/api/qabstractxmlforwarditerator.cpp
@@ -59,7 +59,7 @@
   \endlist
 
    @ingroup Patternist_iterators
-   @author Frans Englich <fenglich@trolltech.com>
+   @author Frans Englich <frans.englich@nokia.com>
  */
 
 /*!
diff --git a/src/xmlpatterns/api/qdeviceresourceloader_p.h b/src/xmlpatterns/api/qdeviceresourceloader_p.h
index fb12328b7..97c97ee35 100644
--- a/src/xmlpatterns/api/qdeviceresourceloader_p.h
+++ b/src/xmlpatterns/api/qdeviceresourceloader_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
     /**
      * @short Base class for resource loaders that manage device variables.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @since 4.5
      */
     class DeviceResourceLoader : public ResourceLoader
diff --git a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
index 055420073..988ed25d2 100644
--- a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
+++ b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
@@ -81,7 +81,7 @@ namespace QPatternist
      *
      * @since 4.5
      * @see AccelTreeResourceLoader::load()
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT NetworkAccessDelegator : public QObject
                                                    , public QSharedData
diff --git a/src/xmlpatterns/api/qresourcedelegator_p.h b/src/xmlpatterns/api/qresourcedelegator_p.h
index 727113b6a..57b79b67f 100644
--- a/src/xmlpatterns/api/qresourcedelegator_p.h
+++ b/src/xmlpatterns/api/qresourcedelegator_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
      * resource loader for the other query remains as is.
      *
      * @since 4.5
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ResourceDelegator : public DeviceResourceLoader
     {
diff --git a/src/xmlpatterns/data/qabstractdatetime_p.h b/src/xmlpatterns/data/qabstractdatetime_p.h
index 8377cee4a..12f39817f 100644
--- a/src/xmlpatterns/data/qabstractdatetime_p.h
+++ b/src/xmlpatterns/data/qabstractdatetime_p.h
@@ -74,7 +74,7 @@ namespace QPatternist
      * the international standard date and time notation, Markus Kuhn</a>
      * @see <a href="http://en.wikipedia.org/wiki/Iso_date">ISO 8601,
      * From Wikipedia, the free encyclopedia</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class AbstractDateTime : public AtomicValue
@@ -105,7 +105,7 @@ namespace QPatternist
          * and describes where certain fields in a QRegExp pattern can be found
          * for a particular W3C XML Schema date/time type.
          *
-         * @author Frans Englich <fenglich@trolltech.com>
+         * @author Frans Englich <frans.englich@nokia.com>
          * @ingroup Patternist_xdm
          */
         class CaptureTable
diff --git a/src/xmlpatterns/data/qabstractduration_p.h b/src/xmlpatterns/data/qabstractduration_p.h
index 060caa5d1..d67f09a00 100644
--- a/src/xmlpatterns/data/qabstractduration_p.h
+++ b/src/xmlpatterns/data/qabstractduration_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
      * 2: Datatypes Second Edition, 3.2.6 duration</a>
      * @see <a href="http://www.w3.org/TR/xpath-datamodel/#dates-and-times">XQuery
      * 1.0 and XPath 2.0 Data Model (XDM), 3.3.2 Dates and Times</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      * @todo Documentation is missing/incomplete
      */
@@ -88,7 +88,7 @@ namespace QPatternist
          * and describes where certain fields in a QRegExp pattern can be found
          * for a particular W3C XML Schema duration type.
          *
-         * @author Frans Englich <fenglich@trolltech.com>
+         * @author Frans Englich <frans.englich@nokia.com>
          * @ingroup Patternist_xdm
          */
         class CaptureTable
diff --git a/src/xmlpatterns/data/qabstractfloatcasters_p.h b/src/xmlpatterns/data/qabstractfloatcasters_p.h
index 469a44a29..b326e1f00 100644
--- a/src/xmlpatterns/data/qabstractfloatcasters_p.h
+++ b/src/xmlpatterns/data/qabstractfloatcasters_p.h
@@ -121,7 +121,7 @@ namespace QPatternist
     * castFrom() uses Numeric::toDouble() for doing the actual casting.
     *
     * @ingroup Patternist_xdm
-    * @author Frans Englich <fenglich@trolltech.com>
+    * @author Frans Englich <frans.englich@nokia.com>
     */
     typedef NumericToAbstractFloatCaster<true> NumericToDoubleCaster;
 
@@ -131,7 +131,7 @@ namespace QPatternist
     * castFrom() uses Numeric::toFloat() for doing the actual casting.
     *
     * @ingroup Patternist_xdm
-    * @author Frans Englich <fenglich@trolltech.com>
+    * @author Frans Englich <frans.englich@nokia.com>
     */
     typedef NumericToAbstractFloatCaster<false> NumericToFloatCaster;
 
@@ -139,7 +139,7 @@ namespace QPatternist
      * @short Casts a string value, @c xs:string or @c xs:untypedAtomic, to @c xs:double.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     typedef StringToAbstractFloatCaster<true> StringToDoubleCaster;
 
@@ -147,7 +147,7 @@ namespace QPatternist
      * @short Casts a string value, @c xs:string or @c xs:untypedAtomic, to @c xs:float.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     typedef StringToAbstractFloatCaster<false> StringToFloatCaster;
 
@@ -155,7 +155,7 @@ namespace QPatternist
     * @short Casts a value of type @c xs:boolean to @c xs:double.
     *
     * @ingroup Patternist_xdm
-    * @author Frans Englich <fenglich@trolltech.com>
+    * @author Frans Englich <frans.englich@nokia.com>
     */
     typedef BooleanToAbstractFloatCaster<true> BooleanToDoubleCaster;
 
@@ -163,7 +163,7 @@ namespace QPatternist
      * @short Casts a value of type @c xs:boolean to @c xs:float.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     typedef BooleanToAbstractFloatCaster<false> BooleanToFloatCaster;
 }
diff --git a/src/xmlpatterns/data/qanyuri_p.h b/src/xmlpatterns/data/qanyuri_p.h
index cd16276ce..6086c7a48 100644
--- a/src/xmlpatterns/data/qanyuri_p.h
+++ b/src/xmlpatterns/data/qanyuri_p.h
@@ -76,7 +76,7 @@ namespace QPatternist
      * fromLexical(), isValid(), and resolveURI().
      *
      * @see QUrl
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class AnyURI : public AtomicString
diff --git a/src/xmlpatterns/data/qatomiccaster_p.h b/src/xmlpatterns/data/qatomiccaster_p.h
index beabaf71d..d2f3041f0 100644
--- a/src/xmlpatterns/data/qatomiccaster_p.h
+++ b/src/xmlpatterns/data/qatomiccaster_p.h
@@ -67,7 +67,7 @@ namespace QPatternist
      * that performs casting between two atomic values of specific types.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AtomicCaster : public AtomicTypeVisitorResult
     {
diff --git a/src/xmlpatterns/data/qatomiccasters_p.h b/src/xmlpatterns/data/qatomiccasters_p.h
index cb896835b..68607f9f7 100644
--- a/src/xmlpatterns/data/qatomiccasters_p.h
+++ b/src/xmlpatterns/data/qatomiccasters_p.h
@@ -80,7 +80,7 @@ namespace QPatternist
      * of any type.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<TypeOfDerivedString DerivedType>
     class ToStringCaster : public AtomicCaster
@@ -102,7 +102,7 @@ namespace QPatternist
      * of any type. The implementation is similar to ToStringCaster.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToUntypedAtomicCaster : public AtomicCaster
     {
@@ -115,7 +115,7 @@ namespace QPatternist
      * @short Casts a string value to @c xs:anyURI.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToAnyURICaster : public AtomicCaster
     {
@@ -128,7 +128,7 @@ namespace QPatternist
      * @short Casts a @c xs:hexBinary atomic value to @c xs:base64Binary.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class HexBinaryToBase64BinaryCaster : public AtomicCaster
     {
@@ -141,7 +141,7 @@ namespace QPatternist
      * @short Casts a @c xs:base64Binary atomic value to @c xs:hexBinary.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Base64BinaryToHexBinaryCaster : public AtomicCaster
     {
@@ -154,7 +154,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:base64Binary.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToBase64BinaryCaster : public AtomicCaster
     {
@@ -167,7 +167,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:hexBinary.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToHexBinaryCaster : public AtomicCaster
     {
@@ -180,7 +180,7 @@ namespace QPatternist
      * @short Casts any @c numeric value to @c xs:boolean.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NumericToBooleanCaster : public AtomicCaster
     {
@@ -193,7 +193,7 @@ namespace QPatternist
      * @short Casts any string value, @c xs:string or @c xs:untypedAtomic, to @c xs:boolean.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToBooleanCaster : public AtomicCaster
     {
@@ -209,7 +209,7 @@ namespace QPatternist
      * castFrom() uses Numeric::toInteger() for doing the actual casting.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template <const bool IsInteger>
     class NumericToDecimalCaster : public AtomicCaster
@@ -252,7 +252,7 @@ namespace QPatternist
      * @short Casts a string value, @c xs:string or @c xs:untypedAtomic, to @c xs:decimal.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToDecimalCaster : public AtomicCaster
     {
@@ -265,7 +265,7 @@ namespace QPatternist
      * @short Casts a string value, @c xs:string or @c xs:untypedAtomic, to @c xs:integer.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToIntegerCaster : public AtomicCaster
     {
@@ -278,7 +278,7 @@ namespace QPatternist
      * @short Casts a value of type @c xs:boolean to @c xs:decimal.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class BooleanToDecimalCaster : public AtomicCaster
     {
@@ -291,7 +291,7 @@ namespace QPatternist
      * @short Casts a value of type @c xs:boolean to @c xs:integer.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class BooleanToIntegerCaster : public AtomicCaster
     {
@@ -310,7 +310,7 @@ namespace QPatternist
      * is this class need on a case-per-case base at evaluation time.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SelfToSelfCaster : public AtomicCaster
     {
@@ -327,7 +327,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:gYear.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToGYearCaster : public AtomicCaster
     {
@@ -340,7 +340,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:gDay.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToGDayCaster : public AtomicCaster
     {
@@ -353,7 +353,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:gMonth.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToGMonthCaster : public AtomicCaster
     {
@@ -366,7 +366,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:gYearMonth.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToGYearMonthCaster : public AtomicCaster
     {
@@ -379,7 +379,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:gYearMonth.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToGMonthDayCaster : public AtomicCaster
     {
@@ -392,7 +392,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:dateTime.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToDateTimeCaster : public AtomicCaster
     {
@@ -405,7 +405,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:time.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToTimeCaster : public AtomicCaster
     {
@@ -418,7 +418,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:date.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToDateCaster : public AtomicCaster
     {
@@ -431,7 +431,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:duration.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToDurationCaster : public AtomicCaster
     {
@@ -444,7 +444,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:dayTimeDuration.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToDayTimeDurationCaster : public AtomicCaster
     {
@@ -457,7 +457,7 @@ namespace QPatternist
      * @short Casts a @c xs:string or @c xs:untypedAtomic atomic value to @c xs:yearMonthDuration.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToYearMonthDurationCaster : public AtomicCaster
     {
@@ -471,7 +471,7 @@ namespace QPatternist
      * @short Casts a @c xs:date or @c xs:dateTime atomic value to @c xs:gYear.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDateTimeToGYearCaster : public AtomicCaster
     {
@@ -484,7 +484,7 @@ namespace QPatternist
      * @short Casts a @c xs:date or @c xs:dateTime atomic value to @c xs:gYearMonth.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDateTimeToGYearMonthCaster : public AtomicCaster
     {
@@ -497,7 +497,7 @@ namespace QPatternist
      * @short Casts a @c xs:date or @c xs:dateTime atomic value to @c xs:gMonth.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDateTimeToGMonthCaster : public AtomicCaster
     {
@@ -510,7 +510,7 @@ namespace QPatternist
      * @short Casts a @c xs:date or @c xs:dateTime atomic value to @c xs:gMonthDay.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDateTimeToGMonthDayCaster : public AtomicCaster
     {
@@ -523,7 +523,7 @@ namespace QPatternist
      * @short Casts a @c xs:date or @c xs:dateTime atomic value to @c xs:gDay.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDateTimeToGDayCaster : public AtomicCaster
     {
@@ -536,7 +536,7 @@ namespace QPatternist
      * @short Casts an AbstractDateTime instance to DateTime.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDateTimeToDateTimeCaster : public AtomicCaster
     {
@@ -549,7 +549,7 @@ namespace QPatternist
      * @short Casts an AbstractDateTime instance to SchemaTime.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDateTimeToDateCaster : public AtomicCaster
     {
@@ -562,7 +562,7 @@ namespace QPatternist
      * @short Casts an AbstractDateTime instance to SchemaTime.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDateTimeToTimeCaster : public AtomicCaster
     {
@@ -575,7 +575,7 @@ namespace QPatternist
      * @short Casts an AbstractDuration instance to Duration.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDurationToDurationCaster : public AtomicCaster
     {
@@ -588,7 +588,7 @@ namespace QPatternist
      * @short Casts an AbstractDuration instance to DayTimeDuration.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDurationToDayTimeDurationCaster : public AtomicCaster
     {
@@ -601,7 +601,7 @@ namespace QPatternist
      * @short Casts an AbstractDuration instance to YearMonthDuration.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDurationToYearMonthDurationCaster : public AtomicCaster
     {
@@ -614,7 +614,7 @@ namespace QPatternist
      * @short Casts an @c xs:string instance to a derived type of @c xs:integer.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<TypeOfDerivedInteger type>
     class StringToDerivedIntegerCaster : public AtomicCaster
@@ -632,7 +632,7 @@ namespace QPatternist
      * @short Casts an @c xs:boolean instance to a derived type of @c xs:integer.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<TypeOfDerivedInteger type>
     class BooleanToDerivedIntegerCaster : public AtomicCaster
@@ -650,7 +650,7 @@ namespace QPatternist
      * @short Casts an @c xs:boolean instance to a derived type of @c xs:integer.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<TypeOfDerivedString type>
     class AnyToDerivedStringCaster : public AtomicCaster
@@ -668,7 +668,7 @@ namespace QPatternist
      * @short Casts any @c numeric instance to a derived type of @c xs:integer.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<TypeOfDerivedInteger type>
     class NumericToDerivedIntegerCaster : public AtomicCaster
diff --git a/src/xmlpatterns/data/qatomiccomparator_p.h b/src/xmlpatterns/data/qatomiccomparator_p.h
index b74742305..fa7148dba 100644
--- a/src/xmlpatterns/data/qatomiccomparator_p.h
+++ b/src/xmlpatterns/data/qatomiccomparator_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
      * This class is also known as the AtomicParrot.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT AtomicComparator : public AtomicTypeVisitorResult
     {
diff --git a/src/xmlpatterns/data/qatomiccomparators_p.h b/src/xmlpatterns/data/qatomiccomparators_p.h
index f93573d16..6f4d72485 100644
--- a/src/xmlpatterns/data/qatomiccomparators_p.h
+++ b/src/xmlpatterns/data/qatomiccomparators_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
      * between @c xs:anyUri, @c xs:string, and @c xs:untypedAtomic.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringComparator : public AtomicComparator
     {
@@ -107,7 +107,7 @@ namespace QPatternist
      * between @c xs:anyUri, @c xs:string, and @c xs:untypedAtomic.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class CaseInsensitiveStringComparator : public AtomicComparator
     {
@@ -129,7 +129,7 @@ namespace QPatternist
     /**
      * @short Compares @c xs:base64Binary and @c xs:hexBinary values.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class BinaryDataComparator : public AtomicComparator
     {
@@ -143,7 +143,7 @@ namespace QPatternist
      *
      * This is done via the object's Boolean::evaluteEBV() function.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class BooleanComparator : public AtomicComparator
     {
@@ -161,7 +161,7 @@ namespace QPatternist
      *
      * @todo Add docs about numeric promotion
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractFloatComparator : public AtomicComparator
     {
@@ -179,7 +179,7 @@ namespace QPatternist
      *
      * @todo Add docs about numeric promotion
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<const AtomicComparator::Operator t_op>
     class AbstractFloatSortComparator : public AbstractFloatComparator
@@ -215,7 +215,7 @@ namespace QPatternist
     /**
      * @short Compares @c xs:decimal values.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DecimalComparator : public AtomicComparator
     {
@@ -231,7 +231,7 @@ namespace QPatternist
     /**
      * @short Compares @c xs:integer values.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class IntegerComparator : public AtomicComparator
     {
@@ -247,7 +247,7 @@ namespace QPatternist
     /**
      * @short Compares @c xs:QName values.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class QNameComparator : public AtomicComparator
     {
@@ -259,7 +259,7 @@ namespace QPatternist
     /**
      * @short Compares sub-classes of AbstractDateTime.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDateTimeComparator : public AtomicComparator
     {
@@ -274,7 +274,7 @@ namespace QPatternist
     /**
      * @short Compares sub-classes of AbstractDuration.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDurationComparator : public AtomicComparator
     {
diff --git a/src/xmlpatterns/data/qatomicmathematician_p.h b/src/xmlpatterns/data/qatomicmathematician_p.h
index 406da6896..649e80a39 100644
--- a/src/xmlpatterns/data/qatomicmathematician_p.h
+++ b/src/xmlpatterns/data/qatomicmathematician_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
      * @short Base class for classes that performs arithmetic operations between atomic values.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT AtomicMathematician : public AtomicTypeVisitorResult
     {
diff --git a/src/xmlpatterns/data/qatomicmathematicians_p.h b/src/xmlpatterns/data/qatomicmathematicians_p.h
index 0649fa7a4..267eef80b 100644
--- a/src/xmlpatterns/data/qatomicmathematicians_p.h
+++ b/src/xmlpatterns/data/qatomicmathematicians_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
     /**
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DecimalMathematician : public AtomicMathematician
                                , public DelegatingSourceLocationReflection
@@ -90,7 +90,7 @@ namespace QPatternist
      * @short Performs arithmetics between Integer values.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class IntegerMathematician : public AtomicMathematician
                                , public DelegatingSourceLocationReflection
@@ -111,7 +111,7 @@ namespace QPatternist
      * and Double values.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DurationNumericMathematician : public AtomicMathematician
                                        , public DelegatingSourceLocationReflection
@@ -132,7 +132,7 @@ namespace QPatternist
      * YearMonthDuration and YearMonthDuration.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DurationDurationDivisor : public AtomicMathematician
     {
@@ -148,7 +148,7 @@ namespace QPatternist
      * YearMonthDuration and YearMonthDuration.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DurationDurationMathematician : public AtomicMathematician
     {
@@ -175,7 +175,7 @@ namespace QPatternist
      * <tt>xs:yearMonthDuration * numeric</tt>.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class OperandSwitcherMathematician : public AtomicMathematician
     {
@@ -205,7 +205,7 @@ namespace QPatternist
      * an AbstractDuration value.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DateTimeDurationMathematician : public AtomicMathematician
                                         , public DelegatingSourceLocationReflection
@@ -230,7 +230,7 @@ namespace QPatternist
      * @short Performs arithmetics between two AbstractDateTime values.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractDateTimeMathematician : public AtomicMathematician
     {
diff --git a/src/xmlpatterns/data/qatomicstring_p.h b/src/xmlpatterns/data/qatomicstring_p.h
index be6a696c2..ba5be301b 100644
--- a/src/xmlpatterns/data/qatomicstring_p.h
+++ b/src/xmlpatterns/data/qatomicstring_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
      * file was called String.h. However, this broke building on OS X, which
      * looks up file names case insensitively, and therefore found string.h.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      * @todo Documentation is missing/incomplete
      */
diff --git a/src/xmlpatterns/data/qbase64binary_p.h b/src/xmlpatterns/data/qbase64binary_p.h
index da84afe8a..44abacdef 100644
--- a/src/xmlpatterns/data/qbase64binary_p.h
+++ b/src/xmlpatterns/data/qbase64binary_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:base64Binary type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class Base64Binary : public AtomicValue
diff --git a/src/xmlpatterns/data/qboolean_p.h b/src/xmlpatterns/data/qboolean_p.h
index 596b15422..e8d29f6e5 100644
--- a/src/xmlpatterns/data/qboolean_p.h
+++ b/src/xmlpatterns/data/qboolean_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:boolean type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class Q_AUTOTEST_EXPORT Boolean : public AtomicValue
diff --git a/src/xmlpatterns/data/qcommonvalues_p.h b/src/xmlpatterns/data/qcommonvalues_p.h
index 9367308d4..3b818335a 100644
--- a/src/xmlpatterns/data/qcommonvalues_p.h
+++ b/src/xmlpatterns/data/qcommonvalues_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
     /**
      * @short A collection of common values.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      * @todo Documentation is missing/incomplete
      */
diff --git a/src/xmlpatterns/data/qdate_p.h b/src/xmlpatterns/data/qdate_p.h
index 7f6e9bd48..f8231c9f2 100644
--- a/src/xmlpatterns/data/qdate_p.h
+++ b/src/xmlpatterns/data/qdate_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:date type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class Date : public AbstractDateTime
diff --git a/src/xmlpatterns/data/qdaytimeduration_p.h b/src/xmlpatterns/data/qdaytimeduration_p.h
index db26a486d..8f6bc5a6e 100644
--- a/src/xmlpatterns/data/qdaytimeduration_p.h
+++ b/src/xmlpatterns/data/qdaytimeduration_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:dayTimeDuration type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class DayTimeDuration : public AbstractDuration
diff --git a/src/xmlpatterns/data/qdecimal_p.h b/src/xmlpatterns/data/qdecimal_p.h
index aa4838b23..fe928f812 100644
--- a/src/xmlpatterns/data/qdecimal_p.h
+++ b/src/xmlpatterns/data/qdecimal_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:decimal type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      * @todo Documentation is missing/incomplete
      */
diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h
index fc8bceaee..821dbfe15 100644
--- a/src/xmlpatterns/data/qderivedinteger_p.h
+++ b/src/xmlpatterns/data/qderivedinteger_p.h
@@ -322,7 +322,7 @@ namespace QPatternist
      * @short Represents instances of derived @c xs:integer types, such as @c
      * xs:byte.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     template<TypeOfDerivedInteger DerivedType>
diff --git a/src/xmlpatterns/data/qderivedstring_p.h b/src/xmlpatterns/data/qderivedstring_p.h
index 0683cc460..3a0d47e7c 100644
--- a/src/xmlpatterns/data/qderivedstring_p.h
+++ b/src/xmlpatterns/data/qderivedstring_p.h
@@ -87,7 +87,7 @@ namespace QPatternist
      *   has been normalized according to the value of the whiteSpace facet of
      *   the simple type definition used in its validation."
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      * @todo Documentation is missing
      */
diff --git a/src/xmlpatterns/data/qduration_p.h b/src/xmlpatterns/data/qduration_p.h
index 752ce9df5..cf5bf730f 100644
--- a/src/xmlpatterns/data/qduration_p.h
+++ b/src/xmlpatterns/data/qduration_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:duration type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class Duration : public AbstractDuration
diff --git a/src/xmlpatterns/data/qgday_p.h b/src/xmlpatterns/data/qgday_p.h
index 407962025..310ae2591 100644
--- a/src/xmlpatterns/data/qgday_p.h
+++ b/src/xmlpatterns/data/qgday_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:gDay type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class GDay : public AbstractDateTime
diff --git a/src/xmlpatterns/data/qgmonth_p.h b/src/xmlpatterns/data/qgmonth_p.h
index d7942973d..16fa5ddc0 100644
--- a/src/xmlpatterns/data/qgmonth_p.h
+++ b/src/xmlpatterns/data/qgmonth_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:gMonth type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class GMonth : public AbstractDateTime
diff --git a/src/xmlpatterns/data/qgmonthday_p.h b/src/xmlpatterns/data/qgmonthday_p.h
index 21e5e4951..ec344a9b4 100644
--- a/src/xmlpatterns/data/qgmonthday_p.h
+++ b/src/xmlpatterns/data/qgmonthday_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:gYearMonth type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class GMonthDay : public AbstractDateTime
diff --git a/src/xmlpatterns/data/qgyear_p.h b/src/xmlpatterns/data/qgyear_p.h
index 0b737bac1..32cdd574d 100644
--- a/src/xmlpatterns/data/qgyear_p.h
+++ b/src/xmlpatterns/data/qgyear_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:gYear type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class GYear : public AbstractDateTime
diff --git a/src/xmlpatterns/data/qgyearmonth_p.h b/src/xmlpatterns/data/qgyearmonth_p.h
index 2c5ea105b..d73627c3c 100644
--- a/src/xmlpatterns/data/qgyearmonth_p.h
+++ b/src/xmlpatterns/data/qgyearmonth_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:gYearMonth type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class GYearMonth : public AbstractDateTime
diff --git a/src/xmlpatterns/data/qhexbinary_p.h b/src/xmlpatterns/data/qhexbinary_p.h
index cd22d1aa4..f06419d3a 100644
--- a/src/xmlpatterns/data/qhexbinary_p.h
+++ b/src/xmlpatterns/data/qhexbinary_p.h
@@ -67,7 +67,7 @@ namespace QPatternist
      * HexBinary inherits from Base64Binary for implementation reasons. The two
      * classes are similar, and inheritance therefore save code.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      * @todo Documentation is missing
      */
diff --git a/src/xmlpatterns/data/qinteger_p.h b/src/xmlpatterns/data/qinteger_p.h
index f829ecd99..e27aa94a9 100644
--- a/src/xmlpatterns/data/qinteger_p.h
+++ b/src/xmlpatterns/data/qinteger_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:integer type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      * @todo Documentation is missing
      */
diff --git a/src/xmlpatterns/data/qitem_p.h b/src/xmlpatterns/data/qitem_p.h
index eb8fcbdcf..6beeea923 100644
--- a/src/xmlpatterns/data/qitem_p.h
+++ b/src/xmlpatterns/data/qitem_p.h
@@ -114,7 +114,7 @@ namespace QPatternist
      * only the fromValue() function exist, and fromLexical() is omitted.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AtomicValue : public QSharedData
                       , public CppCastingHelper<AtomicValue>
@@ -173,7 +173,7 @@ namespace QPatternist
      * makes a very strong distinction between a sequence of items and an atomized sequence.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Item
     {
diff --git a/src/xmlpatterns/data/qnodebuilder_p.h b/src/xmlpatterns/data/qnodebuilder_p.h
index 09e89650a..742986346 100644
--- a/src/xmlpatterns/data/qnodebuilder_p.h
+++ b/src/xmlpatterns/data/qnodebuilder_p.h
@@ -67,7 +67,7 @@ namespace QPatternist
      * in memory that afterwards can be retrieved via builtNode()
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NodeBuilder : public QAbstractXmlReceiver
     {
diff --git a/src/xmlpatterns/data/qqnamevalue_p.h b/src/xmlpatterns/data/qqnamevalue_p.h
index 71b95ef19..a3e192dba 100644
--- a/src/xmlpatterns/data/qqnamevalue_p.h
+++ b/src/xmlpatterns/data/qqnamevalue_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:QName type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      * @see QNameConstructor::expandQName()
      * @see XPathHelper::isQName()
diff --git a/src/xmlpatterns/data/qresourceloader_p.h b/src/xmlpatterns/data/qresourceloader_p.h
index 10848cda5..e5d28d230 100644
--- a/src/xmlpatterns/data/qresourceloader_p.h
+++ b/src/xmlpatterns/data/qresourceloader_p.h
@@ -101,7 +101,7 @@ namespace QPatternist
      * be able to load resources.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT ResourceLoader : public QSharedData
     {
diff --git a/src/xmlpatterns/data/qschemadatetime_p.h b/src/xmlpatterns/data/qschemadatetime_p.h
index b584ae0e6..0ed7b9d19 100644
--- a/src/xmlpatterns/data/qschemadatetime_p.h
+++ b/src/xmlpatterns/data/qschemadatetime_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:dateTime type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class DateTime : public AbstractDateTime
diff --git a/src/xmlpatterns/data/qschemanumeric_p.h b/src/xmlpatterns/data/qschemanumeric_p.h
index e63d97da2..8b79a62db 100644
--- a/src/xmlpatterns/data/qschemanumeric_p.h
+++ b/src/xmlpatterns/data/qschemanumeric_p.h
@@ -83,7 +83,7 @@ namespace QPatternist
      * and XPath 2.0 Functions and Operators, 6 Functions and Operators on Numerics</a>
      * @see <a href="http://www.w3.org/TR/xquery-operators/#func-overloading">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 1.2 Function Overloading</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      * @todo discuss data hierarchy the non existatnt number data type
      */
diff --git a/src/xmlpatterns/data/qschematime_p.h b/src/xmlpatterns/data/qschematime_p.h
index 7cc711426..aa5eb557a 100644
--- a/src/xmlpatterns/data/qschematime_p.h
+++ b/src/xmlpatterns/data/qschematime_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * The header file for this class was orignally called Time.h, but this
      * clashed with a system header on MinGW.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class SchemaTime : public AbstractDateTime
diff --git a/src/xmlpatterns/data/qsequencereceiver_p.h b/src/xmlpatterns/data/qsequencereceiver_p.h
index e4ebcf51a..527722771 100644
--- a/src/xmlpatterns/data/qsequencereceiver_p.h
+++ b/src/xmlpatterns/data/qsequencereceiver_p.h
@@ -67,7 +67,7 @@ namespace QPatternist
      * ContentHandler.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class QAbstractXmlReceiver : public QSharedData
     {
diff --git a/src/xmlpatterns/data/qsorttuple_p.h b/src/xmlpatterns/data/qsorttuple_p.h
index 0fb24e8ba..3272bd690 100644
--- a/src/xmlpatterns/data/qsorttuple_p.h
+++ b/src/xmlpatterns/data/qsorttuple_p.h
@@ -76,7 +76,7 @@ namespace QPatternist
      * source values.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SortTuple : public AtomicValue
     {
diff --git a/src/xmlpatterns/data/quntypedatomic_p.h b/src/xmlpatterns/data/quntypedatomic_p.h
index a96f13f0d..483e0e7cc 100644
--- a/src/xmlpatterns/data/quntypedatomic_p.h
+++ b/src/xmlpatterns/data/quntypedatomic_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:untypedAtomic type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class UntypedAtomic : public AtomicString
diff --git a/src/xmlpatterns/data/qvalidationerror_p.h b/src/xmlpatterns/data/qvalidationerror_p.h
index 5ba49a5e9..67e53066c 100644
--- a/src/xmlpatterns/data/qvalidationerror_p.h
+++ b/src/xmlpatterns/data/qvalidationerror_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
     /**
      * @short Used for signalling casting errors.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class ValidationError : public AtomicValue
diff --git a/src/xmlpatterns/data/qyearmonthduration_p.h b/src/xmlpatterns/data/qyearmonthduration_p.h
index 917c36859..e4cc006b2 100644
--- a/src/xmlpatterns/data/qyearmonthduration_p.h
+++ b/src/xmlpatterns/data/qyearmonthduration_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the value instance of the @c xs:yearMonthDuration type.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_xdm
      */
     class YearMonthDuration : public AbstractDuration
diff --git a/src/xmlpatterns/documentationGroups.dox b/src/xmlpatterns/documentationGroups.dox
index f032c407b..e8f0700e6 100644
--- a/src/xmlpatterns/documentationGroups.dox
+++ b/src/xmlpatterns/documentationGroups.dox
@@ -61,7 +61,7 @@ namespace QPatternist
      * functions, such as @c fn:concat().
      *
      * @defgroup Patternist_functions Function Implementations
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
 
     /**
@@ -85,26 +85,26 @@ namespace QPatternist
      * code.
      *
      * @defgroup Patternist_expressions Expressions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
 
     /**
      * @short Various classes that contains small utility functions.
      *
      * @defgroup Patternist Utility Classes
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
 
     /**
      * @short Classes for the type system in the XQuery & XSL-T language.
      *
      * @defgroup Patternist_types Type system
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
 
     /**
      * @defgroup Patternist_xdm XQuery/XPath Data Model
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
 
     /**
@@ -145,6 +145,6 @@ namespace QPatternist
      * and the MappingCallback.
      *
      * @defgroup Patternist_iterators Iterators
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
 }
diff --git a/src/xmlpatterns/environment/createReportContext.xsl b/src/xmlpatterns/environment/createReportContext.xsl
index 7c3713858..9ff8f5fa1 100644
--- a/src/xmlpatterns/environment/createReportContext.xsl
+++ b/src/xmlpatterns/environment/createReportContext.xsl
@@ -185,7 +185,7 @@ namespace QPatternist
      * (XPath) 2.0, 2.3.2 Identifying and Reporting Errors</a>
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-error">XQuery 1.0 and
      * XPath 2.0 Functions and Operators, 3 The Error Function</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @warning This file is auto-generated from extractErrorCodes.xsl. Any
      * modifications done to this file are lost.
      */
diff --git a/src/xmlpatterns/environment/qcurrentitemcontext_p.h b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
index 60ce1e6c1..6930b523d 100644
--- a/src/xmlpatterns/environment/qcurrentitemcontext_p.h
+++ b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
      * and whose size is retrievable via the function <tt>fn:last()</tt>.
      *
      * @since 4.5
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class CurrentItemContext : public DelegatingDynamicContext
     {
diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
index 836e501d2..59a13129a 100644
--- a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
      * the DynamicContext interface onto another DynamicContext instance,
      * allowing the sub-class to only implement what it needs to.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DelegatingDynamicContext : public DynamicContext
     {
diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
index 419b910c1..302598cca 100644
--- a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
      * @short Delegates all members to a second instance. Used for
      * sub-classing.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT DelegatingStaticContext : public StaticContext
     {
diff --git a/src/xmlpatterns/environment/qdynamiccontext_p.h b/src/xmlpatterns/environment/qdynamiccontext_p.h
index 1c2c10e24..307c3cc9e 100644
--- a/src/xmlpatterns/environment/qdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdynamiccontext_p.h
@@ -83,7 +83,7 @@ namespace QPatternist
      * 1.0: An XML Query Language, 2.1.2 Dynamic Context</a>
      * @see <a href="http://www.w3.org/TR/xquery/#id-dynamic-evaluation">XQuery
      * 1.0: An XML Query Language, 2.2.3.2 Dynamic Evaluation Phase</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DynamicContext : public ReportContext
     {
diff --git a/src/xmlpatterns/environment/qfocus_p.h b/src/xmlpatterns/environment/qfocus_p.h
index a750699ea..3784faa0a 100644
--- a/src/xmlpatterns/environment/qfocus_p.h
+++ b/src/xmlpatterns/environment/qfocus_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
      * via the context item expression, <tt>.</tt>(the dot),
      * and whose size is retrievable via the function <tt>fn:last()</tt>.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Focus : public DelegatingDynamicContext
     {
diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
index fc4fef11c..37f6f4b6a 100644
--- a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
      * a run and is always used. In addition, more contexts, such as
      * a Focus can be created.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GenericDynamicContext : public StackContextBase<DynamicContext>
     {
diff --git a/src/xmlpatterns/environment/qgenericstaticcontext_p.h b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
index e46501aed..2ccfb040c 100644
--- a/src/xmlpatterns/environment/qgenericstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
     /**
      * @short Provides setters and getters for the properties defined in StaticContext.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GenericStaticContext : public StaticContext
     {
diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
index 079b31ffa..318cbffb9 100644
--- a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short A DynamicContext that has a specialized QAbstractXmlReceiver.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ReceiverDynamicContext : public DelegatingDynamicContext
     {
diff --git a/src/xmlpatterns/environment/qreportcontext_p.h b/src/xmlpatterns/environment/qreportcontext_p.h
index 8fb3cdd61..e92df7ac4 100644
--- a/src/xmlpatterns/environment/qreportcontext_p.h
+++ b/src/xmlpatterns/environment/qreportcontext_p.h
@@ -94,7 +94,7 @@ namespace QPatternist
      * (XPath) 2.0, 2.3.2 Identifying and Reporting Errors</a>
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-error">XQuery 1.0 and
      * XPath 2.0 Functions and Operators, 3 The Error Function</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @warning This file is auto-generated from extractErrorCodes.xsl. Any
      * modifications done to this file are lost.
      */
diff --git a/src/xmlpatterns/environment/qstackcontextbase_p.h b/src/xmlpatterns/environment/qstackcontextbase_p.h
index e7296b34b..bd71fbc25 100644
--- a/src/xmlpatterns/environment/qstackcontextbase_p.h
+++ b/src/xmlpatterns/environment/qstackcontextbase_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
      * expressions, range variables, template parameters but notably continues
      * to delegate global caches.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<typename TSuperClass>
     class StackContextBase : public TSuperClass
diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
index b59c3634d..8afcc8aeb 100644
--- a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
+++ b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      * of items.
      *
      * @since 4.5
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StaticBaseURIContext : public DelegatingStaticContext
     {
diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
index 595099327..58bfea841 100644
--- a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
      * compatibility mode.
      *
      * @since 4.5
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT StaticCompatibilityContext : public DelegatingStaticContext
     {
diff --git a/src/xmlpatterns/environment/qstaticcontext_p.h b/src/xmlpatterns/environment/qstaticcontext_p.h
index d07c9a8f0..cbc9c935a 100644
--- a/src/xmlpatterns/environment/qstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcontext_p.h
@@ -83,7 +83,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xpath20/#static_context">XML Path
      * Language (XPath) 2.0, 2.1.1 Static Context</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StaticContext : public ReportContext
     {
diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
index 1de66ee5b..550dc4105 100644
--- a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * another StaticContext.
      *
      * @since 4.5
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT StaticCurrentContext : public DelegatingStaticContext
     {
diff --git a/src/xmlpatterns/environment/qstaticfocuscontext_p.h b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
index 981e073b1..6deb3120f 100644
--- a/src/xmlpatterns/environment/qstaticfocuscontext_p.h
+++ b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
      * @short A StaticContext that carries a specified static type
      * for the context item, but otherwise delegates to another StaticContext.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT StaticFocusContext : public DelegatingStaticContext
     {
diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
index 4873ee479..2024db57f 100644
--- a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
+++ b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
      * @short A StaticContext that carries a specified namespace resolver
      * for the context item, but otherwise delegates to another StaticContext.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT StaticNamespaceContext : public DelegatingStaticContext
     {
diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h
index 3d9b86569..a05ef4b81 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 51034b6a8..dcf9b3fe4 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 42f7252bf..36909b0d5 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 5110866ea..e9fb55cb8 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 a69b02641..1a30b8051 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 63e7dc616..980b2b8f5 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 90d7ff6b1..afff4256d 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 4668b404b..e22417dba 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 192470cf4..63027ec59 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 8c4d2dead..3bb40a737 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 a2ce46738..3298228d4 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 bae28baca..def7fe817 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 3e8799af8..fb548e5b6 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 35a6943dd..a87793fd2 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 98fc645b5..c74150eb5 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 3ce3cf8e5..f7d836a32 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 c88b3d77d..ed322cf30 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 e103c651e..1fcc30a09 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 967cdbc0f..93a0e364d 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 4a836a288..bc813d97a 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 e25b23ef1..0cd3c2ef7 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 0a4a51f63..6a45054a0 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 a7bd718c6..13b0a9f29 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 67dd44d1f..c2db6a6e0 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 c2fc0b4cd..a85ae496e 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 a2721a387..99af1acd4 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 2eea7781b..43c4e9421 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 8d4319e8b..b5a720d27 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 f8895d363..e7676272c 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 48535ae4c..173f2a8a3 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 03c3283c3..d0e7fcb70 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 f78181768..c93766e2d 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 79a37c4ce..57259fc94 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 590ff6c12..e0caded60 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 6398c56ed..8d85c6022 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 86614c89a..c54435d2e 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 77ed15bcd..71b1a04e6 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 b89855239..0af7eb34e 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 84d4b3ef5..dab823aae 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 804823a90..d72b56d72 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 d074e606f..990bece4f 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 921a4d9b2..5c35cec8b 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 08915b352..139f45c7a 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 104c6f8d2..9936181a9 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 771fcd402..7e72bf7a6 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 5371a7e11..a6dd43564 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 a79d49eb5..03382bc1b 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 0db10a8e2..7f2891b8e 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 4d47f8c22..7206461da 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 9eadb58c6..65d1dba7b 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 7597571b9..719773e60 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 bff108f7a..848f0871d 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 6e2978dc5..d4ba2bdb1 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 d9cba1c70..ec2b4b9ff 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 6e8128037..41df9ff98 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 9abe8b12b..e9a795a0b 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 6fdbf69d5..e409a113c 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 99c26c6f5..1ff0dda1c 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 3270da040..26d4b2dfd 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 e1de36d71..ebe25c592 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 030310acc..a519205d5 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 fa591ba50..2e03625e5 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 9840fa6af..641a6d00b 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 9c4228d9e..8cbf70663 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 a7068298f..4f5de8173 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 6c0a896ff..2b393d74e 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 a55ea9775..6787f89a1 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 04f2f11f6..e8d7026c5 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 410ad6d67..adfb8f7fc 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 a82141c90..6704b6848 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 92d50e656..72fd50850 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 bc7864a39..c946139d5 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 bbc1d48e9..909969410 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 9af64c379..45ebf3f3c 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 87d70a317..12254df6a 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 82c03964d..a23e0beb7 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 6c4465daa..116756e3a 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 8f22072b1..e09d4d59e 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 8a1b12e8a..0dd0c8750 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 97bd887be..ba7a5ef2a 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 6e66d896c..28908d610 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 28fe0f52a..217efe87d 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 88899aeae..fa6101a86 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 e4bca6129..841cdadc3 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 a511e5d25..8f1fb5347 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 0c3f530fc..d5cdb5078 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 0db7a1c46..9e5d261f1 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 13bcc0704..bba33199b 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 4a09aa69c..87c67165f 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 29821991d..3f12e28b3 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
diff --git a/src/xmlpatterns/functions/qaccessorfns_p.h b/src/xmlpatterns/functions/qaccessorfns_p.h
index babbac9d0..8851a797a 100644
--- a/src/xmlpatterns/functions/qaccessorfns_p.h
+++ b/src/xmlpatterns/functions/qaccessorfns_p.h
@@ -73,7 +73,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:node-name()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NodeNameFN : public FunctionCall
     {
@@ -85,7 +85,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:nilled()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NilledFN : public FunctionCall
     {
@@ -97,7 +97,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:string()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringFN : public FunctionCall
     {
@@ -110,7 +110,7 @@ namespace QPatternist
     /**
      * @short Implements the function <tt>fn:base-uri()</tt>.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class BaseURIFN : public FunctionCall
     {
@@ -122,7 +122,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:document-uri()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DocumentURIFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qaggregatefns_p.h b/src/xmlpatterns/functions/qaggregatefns_p.h
index 81ab617d5..bcb0dc9f8 100644
--- a/src/xmlpatterns/functions/qaggregatefns_p.h
+++ b/src/xmlpatterns/functions/qaggregatefns_p.h
@@ -78,7 +78,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:count()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class CountFN : public FunctionCall
     {
@@ -103,7 +103,7 @@ namespace QPatternist
      * @short Base class for the implementations of the <tt>fn:avg()</tt> and <tt>fn:sum()</tt> function.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AddingAggregate : public FunctionCall
     {
@@ -118,7 +118,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:avg()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AvgFN : public AddingAggregate
     {
@@ -137,7 +137,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:sum()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SumFN : public AddingAggregate
     {
diff --git a/src/xmlpatterns/functions/qaggregator_p.h b/src/xmlpatterns/functions/qaggregator_p.h
index f3f7373f0..79f2697ea 100644
--- a/src/xmlpatterns/functions/qaggregator_p.h
+++ b/src/xmlpatterns/functions/qaggregator_p.h
@@ -74,7 +74,7 @@ namespace QPatternist
      *
      * @see Piper
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Aggregator : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qassemblestringfns_p.h b/src/xmlpatterns/functions/qassemblestringfns_p.h
index 4e54bfd2d..07ec96984 100644
--- a/src/xmlpatterns/functions/qassemblestringfns_p.h
+++ b/src/xmlpatterns/functions/qassemblestringfns_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:codepoints-to-string()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class CodepointsToStringFN : public FunctionCall
     {
@@ -87,7 +87,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:string-to-codepoints()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringToCodepointsFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qbooleanfns_p.h b/src/xmlpatterns/functions/qbooleanfns_p.h
index 5200360fb..b37781fa2 100644
--- a/src/xmlpatterns/functions/qbooleanfns_p.h
+++ b/src/xmlpatterns/functions/qbooleanfns_p.h
@@ -76,7 +76,7 @@ namespace QPatternist
      * The implementation always rewrites itself to a boolean value at compile time.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class TrueFN : public FunctionCall
     {
@@ -90,7 +90,7 @@ namespace QPatternist
      * The implementation always rewrites itself to a boolean value at compile time.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class FalseFN : public FunctionCall
     {
@@ -102,7 +102,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:not()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NotFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qcomparescaseaware_p.h b/src/xmlpatterns/functions/qcomparescaseaware_p.h
index 5de0c7f2d..38fea8015 100644
--- a/src/xmlpatterns/functions/qcomparescaseaware_p.h
+++ b/src/xmlpatterns/functions/qcomparescaseaware_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      * an opportunity to optimize compares intended to be case insensitive.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ComparesCaseAware : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qcomparestringfns_p.h b/src/xmlpatterns/functions/qcomparestringfns_p.h
index e7290acbc..aea795332 100644
--- a/src/xmlpatterns/functions/qcomparestringfns_p.h
+++ b/src/xmlpatterns/functions/qcomparestringfns_p.h
@@ -74,7 +74,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:codepoint-equal()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class CodepointEqualFN : public ComparesCaseAware
     {
@@ -86,7 +86,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:compare()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class CompareFN : public ComparesCaseAware
     {
diff --git a/src/xmlpatterns/functions/qcomparingaggregator_p.h b/src/xmlpatterns/functions/qcomparingaggregator_p.h
index d7307d83b..2bb59fb37 100644
--- a/src/xmlpatterns/functions/qcomparingaggregator_p.h
+++ b/src/xmlpatterns/functions/qcomparingaggregator_p.h
@@ -82,7 +82,7 @@ namespace QPatternist
      * @see MaxFN
      * @see MinFN
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template <AtomicComparator::Operator oper, AtomicComparator::ComparisonResult result>
     class ComparingAggregator : public Aggregator,
diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
index d0253ae3e..ce505ac51 100644
--- a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
+++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xpath20/#id-constructor-functions">XML Path
      * Language (XPath) 2.0, 3.10.4 Constructor Functions</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_functions
      */
     class ConstructorFunctionsFactory : public AbstractFunctionFactory
diff --git a/src/xmlpatterns/functions/qcontextfns_p.h b/src/xmlpatterns/functions/qcontextfns_p.h
index c1c7c923c..9ca7d4edc 100644
--- a/src/xmlpatterns/functions/qcontextfns_p.h
+++ b/src/xmlpatterns/functions/qcontextfns_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-position">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 16.1 fn:position</a>
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class PositionFN : public FunctionCall
     {
@@ -89,7 +89,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-last">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 16.2 fn:last</a>
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class LastFN : public FunctionCall
     {
@@ -103,7 +103,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-implicit-timezone">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 16.6 fn:implicit-timezone</a>
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ImplicitTimezoneFN : public FunctionCall
     {
@@ -117,7 +117,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-current-dateTime">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 16.3 fn:current-dateTime</a>
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class CurrentDateTimeFN : public FunctionCall
     {
@@ -131,7 +131,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-current-date">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 16.4 fn:current-date</a>
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class CurrentDateFN : public FunctionCall
     {
@@ -145,7 +145,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-current-time">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 16.5 fn:current-date</a>
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class CurrentTimeFN : public FunctionCall
     {
@@ -161,7 +161,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-default-collation">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 16.7 fn:default-collation</a>
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DefaultCollationFN : public FunctionCall
     {
@@ -178,7 +178,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-static-base-uri">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 16.8 fn:static-base-uri</a>
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StaticBaseURIFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qcontextnodechecker_p.h b/src/xmlpatterns/functions/qcontextnodechecker_p.h
index b538a5d41..fa0205716 100644
--- a/src/xmlpatterns/functions/qcontextnodechecker_p.h
+++ b/src/xmlpatterns/functions/qcontextnodechecker_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
      * node.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ContextNodeChecker : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qcurrentfn_p.h b/src/xmlpatterns/functions/qcurrentfn_p.h
index 7053ef022..841aa432f 100644
--- a/src/xmlpatterns/functions/qcurrentfn_p.h
+++ b/src/xmlpatterns/functions/qcurrentfn_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      * @short Implements XSL-T's function <tt>fn:current()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @since 4.5
      */
     class CurrentFN : public FunctionCall
diff --git a/src/xmlpatterns/functions/qdatetimefn_p.h b/src/xmlpatterns/functions/qdatetimefn_p.h
index 1c56d9b41..ddb787c74 100644
--- a/src/xmlpatterns/functions/qdatetimefn_p.h
+++ b/src/xmlpatterns/functions/qdatetimefn_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-dateTime">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 5.2 A Special Constructor Function for xs:dateTime</a>
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DateTimeFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qdatetimefns_p.h b/src/xmlpatterns/functions/qdatetimefns_p.h
index 55b1fa330..d543ddcdc 100644
--- a/src/xmlpatterns/functions/qdatetimefns_p.h
+++ b/src/xmlpatterns/functions/qdatetimefns_p.h
@@ -88,7 +88,7 @@ namespace QPatternist
      * is guaranteed to never be @c null.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<typename TSubClass>
     class ExtractFromDurationFN : public FunctionCall
@@ -105,7 +105,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:years-from-duration()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class YearsFromDurationFN : public ExtractFromDurationFN<YearsFromDurationFN>
     {
@@ -117,7 +117,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:months-from-duration()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class MonthsFromDurationFN : public ExtractFromDurationFN<MonthsFromDurationFN>
     {
@@ -129,7 +129,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:days-from-duration()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DaysFromDurationFN : public ExtractFromDurationFN<DaysFromDurationFN>
     {
@@ -141,7 +141,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:hours-from-duration()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class HoursFromDurationFN : public ExtractFromDurationFN<HoursFromDurationFN>
     {
@@ -153,7 +153,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:minutes-from-duration()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class MinutesFromDurationFN : public ExtractFromDurationFN<MinutesFromDurationFN>
     {
@@ -165,7 +165,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:seconds-from-duration()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SecondsFromDurationFN : public ExtractFromDurationFN<SecondsFromDurationFN>
     {
@@ -187,7 +187,7 @@ namespace QPatternist
      * is guaranteed to never be @c null.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<typename TSubClass>
     class ExtractFromDateTimeFN : public FunctionCall
@@ -205,7 +205,7 @@ namespace QPatternist
      * This function implements <tt>fn:year-from-dateTime()</tt> and <tt>fn:year-from-date()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class YearFromAbstractDateTimeFN : public ExtractFromDateTimeFN<YearFromAbstractDateTimeFN>
     {
@@ -218,7 +218,7 @@ namespace QPatternist
      * This function implements <tt>fn:day-from-dateTime()</tt> and <tt>fn:day-from-date()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DayFromAbstractDateTimeFN : public ExtractFromDateTimeFN<DayFromAbstractDateTimeFN>
     {
@@ -232,7 +232,7 @@ namespace QPatternist
      * <tt>fn:hours-from-time()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class HoursFromAbstractDateTimeFN : public ExtractFromDateTimeFN<HoursFromAbstractDateTimeFN>
     {
@@ -246,7 +246,7 @@ namespace QPatternist
      * <tt>fn:minutes-from-time()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class MinutesFromAbstractDateTimeFN : public ExtractFromDateTimeFN<MinutesFromAbstractDateTimeFN>
     {
@@ -260,7 +260,7 @@ namespace QPatternist
      * <tt>fn:seconds-from-time()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SecondsFromAbstractDateTimeFN : public ExtractFromDateTimeFN<SecondsFromAbstractDateTimeFN>
     {
@@ -274,7 +274,7 @@ namespace QPatternist
      * <tt>fn:timezone-from-time()</tt> and <tt>fn:timezone-from-date()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class TimezoneFromAbstractDateTimeFN : public ExtractFromDateTimeFN<TimezoneFromAbstractDateTimeFN>
     {
@@ -286,7 +286,7 @@ namespace QPatternist
      * @short implements the functions <tt>fn:month-from-dateTime()</tt> and <tt>fn:month-from-date()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class MonthFromAbstractDateTimeFN : public ExtractFromDateTimeFN<MonthFromAbstractDateTimeFN>
     {
diff --git a/src/xmlpatterns/functions/qdeepequalfn_p.h b/src/xmlpatterns/functions/qdeepequalfn_p.h
index 1b36d263e..0a5b73ba8 100644
--- a/src/xmlpatterns/functions/qdeepequalfn_p.h
+++ b/src/xmlpatterns/functions/qdeepequalfn_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:deep-equal()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DeepEqualFN : public FunctionCall,
                         public ComparisonPlatform<DeepEqualFN, false>
diff --git a/src/xmlpatterns/functions/qdocumentfn_p.h b/src/xmlpatterns/functions/qdocumentfn_p.h
index d965e3cb0..43c5c438f 100644
--- a/src/xmlpatterns/functions/qdocumentfn_p.h
+++ b/src/xmlpatterns/functions/qdocumentfn_p.h
@@ -106,7 +106,7 @@ namespace QPatternist
      * part of optimization.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @since 4.5
      */
     class DocumentFN : public FunctionCall
diff --git a/src/xmlpatterns/functions/qelementavailablefn_p.h b/src/xmlpatterns/functions/qelementavailablefn_p.h
index 2510984a2..f8716daad 100644
--- a/src/xmlpatterns/functions/qelementavailablefn_p.h
+++ b/src/xmlpatterns/functions/qelementavailablefn_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      * @ingroup Patternist_functions
      * @see <a href="http://www.w3.org/TR/xslt20/#unparsed-text">XSL
      * Transformations (XSLT) Version 2.0, 16.2 unparsed-text</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @since 4.5
      */
     class ElementAvailableFN : public StaticNamespacesContainer
diff --git a/src/xmlpatterns/functions/qerrorfn_p.h b/src/xmlpatterns/functions/qerrorfn_p.h
index 96d48c311..b806c1dfc 100644
--- a/src/xmlpatterns/functions/qerrorfn_p.h
+++ b/src/xmlpatterns/functions/qerrorfn_p.h
@@ -74,7 +74,7 @@ namespace QPatternist
      * @see CommonSequenceTypes::none
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-error">XQuery 1.0 and
      * XPath 2.0 Functions and Operators, 3 The Error Function</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ErrorFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qfunctionargument_p.h b/src/xmlpatterns/functions/qfunctionargument_p.h
index 476311abd..a5baa0468 100644
--- a/src/xmlpatterns/functions/qfunctionargument_p.h
+++ b/src/xmlpatterns/functions/qfunctionargument_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
      *
      * @ingroup Patternist_functions
      * @see VariableDeclaration
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class FunctionArgument : public QSharedData
     {
diff --git a/src/xmlpatterns/functions/qfunctionavailablefn_p.h b/src/xmlpatterns/functions/qfunctionavailablefn_p.h
index ed6fe6fdd..748c32d42 100644
--- a/src/xmlpatterns/functions/qfunctionavailablefn_p.h
+++ b/src/xmlpatterns/functions/qfunctionavailablefn_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xslt20/#function-function-available">XSL Transformations
      * (XSLT) Version 2.0, 18.1.1 Testing Availability of Functions</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_functions
      */
     class FunctionAvailableFN : public StaticNamespacesContainer
diff --git a/src/xmlpatterns/functions/qfunctioncall_p.h b/src/xmlpatterns/functions/qfunctioncall_p.h
index 764bfded3..159643282 100644
--- a/src/xmlpatterns/functions/qfunctioncall_p.h
+++ b/src/xmlpatterns/functions/qfunctioncall_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
      * However, it doesn't handle user declared functions.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class FunctionCall : public UnlimitedContainer
     {
diff --git a/src/xmlpatterns/functions/qfunctionfactory_p.h b/src/xmlpatterns/functions/qfunctionfactory_p.h
index e704f816e..56f92fad0 100644
--- a/src/xmlpatterns/functions/qfunctionfactory_p.h
+++ b/src/xmlpatterns/functions/qfunctionfactory_p.h
@@ -76,7 +76,7 @@ namespace QPatternist
      * and XPath 2.0 Functions and Operators</a>
      * @see <a href="http://www.w3.org/TR/xpath20/#dt-function-signature">XML Path
      * Language (XPath) 2.0, Definition: Function signatures</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class FunctionFactory : public QSharedData
     {
diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
index 1df21eb95..7cb7c73e7 100644
--- a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
+++ b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
      * @note the order of adding function libraries is significant.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT FunctionFactoryCollection: public FunctionFactory
                                                      , public FunctionFactory::List
diff --git a/src/xmlpatterns/functions/qfunctionsignature_p.h b/src/xmlpatterns/functions/qfunctionsignature_p.h
index 252710a89..5cab72c7b 100644
--- a/src/xmlpatterns/functions/qfunctionsignature_p.h
+++ b/src/xmlpatterns/functions/qfunctionsignature_p.h
@@ -88,7 +88,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-signatures">XQuery 1.0 and
      * XPath 2.0 Functions and Operators, 1.4 Function Signatures and Descriptions</a>
      * @see <a href="http://en.wikipedia.org/wiki/Arity">Wikipedia, the free encyclopedia, Arity</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT FunctionSignature : public CallTargetDescription
     {
diff --git a/src/xmlpatterns/functions/qgenerateidfn_p.h b/src/xmlpatterns/functions/qgenerateidfn_p.h
index f85ddbee5..d6c582a18 100644
--- a/src/xmlpatterns/functions/qgenerateidfn_p.h
+++ b/src/xmlpatterns/functions/qgenerateidfn_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @ingroup Patternist_functions
      * @see <a href="http://www.w3.org/TR/xslt20/#generate-id">XSL
      * Transformations (XSLT) Version 2.0, 16.6.4 generate-id</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @since 4.5
      */
     class GenerateIDFN : public FunctionCall
diff --git a/src/xmlpatterns/functions/qnodefns_p.h b/src/xmlpatterns/functions/qnodefns_p.h
index a607a784d..affd722b9 100644
--- a/src/xmlpatterns/functions/qnodefns_p.h
+++ b/src/xmlpatterns/functions/qnodefns_p.h
@@ -74,7 +74,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:name()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NameFN : public FunctionCall
     {
@@ -86,7 +86,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:local-name()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class LocalNameFN : public FunctionCall
     {
@@ -98,7 +98,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:namespace-uri()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NamespaceURIFN : public FunctionCall
     {
@@ -112,7 +112,7 @@ namespace QPatternist
      * NumberFN uses CastingPlatform for performing the actual casting.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NumberFN : public FunctionCall,
                      public CastingPlatform<NumberFN, false>
@@ -141,7 +141,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:lang()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class LangFN : public FunctionCall
     {
@@ -156,7 +156,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:root()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class RootFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qnumericfns_p.h b/src/xmlpatterns/functions/qnumericfns_p.h
index 5de5b502f..17271c79b 100644
--- a/src/xmlpatterns/functions/qnumericfns_p.h
+++ b/src/xmlpatterns/functions/qnumericfns_p.h
@@ -74,7 +74,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:floor()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class FloorFN : public Aggregator
     {
@@ -86,7 +86,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:abs()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbsFN : public Aggregator
     {
@@ -98,7 +98,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:round()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class RoundFN : public Aggregator
     {
@@ -110,7 +110,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:ceiling()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class CeilingFN : public Aggregator
     {
@@ -124,7 +124,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-round-half-to-even">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 6.4.5 fn:round-half-to-even</a>
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class RoundHalfToEvenFN : public Aggregator
     {
diff --git a/src/xmlpatterns/functions/qpatternmatchingfns_p.h b/src/xmlpatterns/functions/qpatternmatchingfns_p.h
index 3631c6608..506249b16 100644
--- a/src/xmlpatterns/functions/qpatternmatchingfns_p.h
+++ b/src/xmlpatterns/functions/qpatternmatchingfns_p.h
@@ -73,7 +73,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:matches()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class MatchesFN : public PatternPlatform
     {
@@ -86,7 +86,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:replace()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ReplaceFN : public PatternPlatform
     {
@@ -118,7 +118,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:tokenize()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class TokenizeFN : public PatternPlatform
     {
diff --git a/src/xmlpatterns/functions/qpatternplatform.cpp b/src/xmlpatterns/functions/qpatternplatform.cpp
index 6753e881c..87cbec972 100644
--- a/src/xmlpatterns/functions/qpatternplatform.cpp
+++ b/src/xmlpatterns/functions/qpatternplatform.cpp
@@ -59,7 +59,7 @@ namespace QPatternist
      * to make the synthesized assignment operator and copy constructor work.
      *
      * @ingroup Patternist_utils
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class PatternFlag
     {
diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h
index 1d6c0a9e8..89318ea98 100644
--- a/src/xmlpatterns/functions/qpatternplatform_p.h
+++ b/src/xmlpatterns/functions/qpatternplatform_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
      * uses regular expressions.
      *
      * @ingroup Patternist_utils
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class PatternPlatform : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qqnamefns_p.h b/src/xmlpatterns/functions/qqnamefns_p.h
index 5c45b1251..14bc0f211 100644
--- a/src/xmlpatterns/functions/qqnamefns_p.h
+++ b/src/xmlpatterns/functions/qqnamefns_p.h
@@ -74,7 +74,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:QXmlName()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class QNameFN : public FunctionCall
     {
@@ -86,7 +86,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:resolve-QXmlName()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ResolveQNameFN : public FunctionCall
     {
@@ -98,7 +98,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:prefix-from-QXmlName()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class PrefixFromQNameFN : public FunctionCall
     {
@@ -110,7 +110,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:local-name-from-QXmlName()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class LocalNameFromQNameFN : public FunctionCall
     {
@@ -122,7 +122,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:local-name-from-QXmlName()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NamespaceURIFromQNameFN : public FunctionCall
     {
@@ -133,7 +133,7 @@ namespace QPatternist
     /**
      * @short Implements the function <tt>fn:namespace-uri-from-QXmlName()</tt>.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_functions
      */
     class NamespaceURIForPrefixFN : public FunctionCall
@@ -146,7 +146,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:in-scope-prefixes()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class InScopePrefixesFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qresolveurifn_p.h b/src/xmlpatterns/functions/qresolveurifn_p.h
index 39f17dcc0..734721206 100644
--- a/src/xmlpatterns/functions/qresolveurifn_p.h
+++ b/src/xmlpatterns/functions/qresolveurifn_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:resolve-uri()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ResolveURIFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h
index 467718b7e..77aa10246 100644
--- a/src/xmlpatterns/functions/qsequencefns_p.h
+++ b/src/xmlpatterns/functions/qsequencefns_p.h
@@ -79,7 +79,7 @@ namespace QPatternist
      *
      * @see EBVExtractor
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class BooleanFN : public FunctionCall
     {
@@ -99,7 +99,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:index-of()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class IndexOfFN : public FunctionCall,
                       public ComparisonPlatform<IndexOfFN, false>
@@ -126,7 +126,7 @@ namespace QPatternist
      * by instantiating it with either IDExistsFN or IDEmptyFN.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<const Expression::ID Id>
     class Existence : public FunctionCall
@@ -179,7 +179,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:distinct-values()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DistinctValuesFN : public FunctionCall,
                              public ComparisonPlatform<IndexOfFN, false>
@@ -219,7 +219,7 @@ namespace QPatternist
      * @todo docs, explain why evaluateSequence and evaluateSingleton is implemented
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class InsertBeforeFN : public FunctionCall
     {
@@ -243,7 +243,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:remove()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class RemoveFN : public FunctionCall
     {
@@ -270,7 +270,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:reverse()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ReverseFN : public FunctionCall
     {
@@ -298,7 +298,7 @@ statEnv |-  (FN-URI,"reverse")(Type) : prime(Type) * quantifier(Type)
      * @short Implements the function <tt>fn:subsequence()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo Type inference can be made stronger for this function
      */
     class SubsequenceFN : public FunctionCall
diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp
index 64e852acd..d76012815 100644
--- a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp
+++ b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp
@@ -96,7 +96,7 @@ bool qIsForwardIteratorEnd(const QString &unit)
  * - Remove invalid @c NCName
  * - Split IDREFs into individual NCNames
  *
- * @author Frans Englich
+ * @author Frans Englich <frans.englich@nokia.com>
  */
 class StringSplitter : public QAbstractXmlForwardIterator<QString>
 {
diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
index 25b80854e..e8f834a24 100644
--- a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
+++ b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:id()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class IdFN : public ContextNodeChecker
     {
@@ -100,7 +100,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:idref()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class IdrefFN : public ContextNodeChecker
     {
@@ -112,7 +112,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:doc()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DocFN : public StaticBaseUriContainer
     {
@@ -140,7 +140,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:doc-available()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DocAvailableFN : public StaticBaseUriContainer
     {
@@ -152,7 +152,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:collection()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class CollectionFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
index 1bb59bef8..e70ef00d3 100644
--- a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
+++ b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * store the static base URI for use at runtime.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StaticBaseUriContainer : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
index 065007156..ceeb0ffbd 100644
--- a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
+++ b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
@@ -73,7 +73,7 @@ namespace QPatternist
      *
      * This class must be subclassed.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_functions
      */
     class StaticNamespacesContainer : public FunctionCall
diff --git a/src/xmlpatterns/functions/qstringvaluefns_p.h b/src/xmlpatterns/functions/qstringvaluefns_p.h
index 3672d7862..1376fdf6e 100644
--- a/src/xmlpatterns/functions/qstringvaluefns_p.h
+++ b/src/xmlpatterns/functions/qstringvaluefns_p.h
@@ -76,7 +76,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:concat()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ConcatFN : public FunctionCall
     {
@@ -88,7 +88,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:string-join()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringJoinFN : public FunctionCall
     {
@@ -107,7 +107,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:substring()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SubstringFN : public FunctionCall
     {
@@ -119,7 +119,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:string-length()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringLengthFN : public FunctionCall
     {
@@ -131,7 +131,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:normalize-space()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NormalizeSpaceFN : public FunctionCall
     {
@@ -147,7 +147,7 @@ namespace QPatternist
      * reduce string work at runtime.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NormalizeUnicodeFN : public FunctionCall
     {
@@ -168,7 +168,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:upper-case()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class UpperCaseFN : public FunctionCall
     {
@@ -181,7 +181,7 @@ namespace QPatternist
      *
      * @short Implements the function <tt>fn:concat()</tt>.
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class LowerCaseFN : public FunctionCall
     {
@@ -193,7 +193,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:translate()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class TranslateFN : public FunctionCall
     {
@@ -206,7 +206,7 @@ namespace QPatternist
      * function implementations.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class EncodeString : public FunctionCall
     {
@@ -234,7 +234,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:encode-for-uri()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class EncodeForURIFN : public EncodeString
     {
@@ -252,7 +252,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:iri-to-uri()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class IriToURIFN : public EncodeString
     {
@@ -270,7 +270,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:escape-html-uri()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class EscapeHtmlURIFN : public EncodeString
     {
diff --git a/src/xmlpatterns/functions/qsubstringfns_p.h b/src/xmlpatterns/functions/qsubstringfns_p.h
index aa537c7c7..c2d4fac5b 100644
--- a/src/xmlpatterns/functions/qsubstringfns_p.h
+++ b/src/xmlpatterns/functions/qsubstringfns_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:contains()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ContainsFN : public ComparesCaseAware
     {
@@ -84,7 +84,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:starts-with()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StartsWithFN : public ComparesCaseAware
     {
@@ -96,7 +96,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:ends-with()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class EndsWithFN : public ComparesCaseAware
     {
@@ -108,7 +108,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:substring-before()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SubstringBeforeFN : public FunctionCall
     {
@@ -120,7 +120,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:substring-after()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SubstringAfterFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qsystempropertyfn_p.h b/src/xmlpatterns/functions/qsystempropertyfn_p.h
index 5a6c494b1..989f953fe 100644
--- a/src/xmlpatterns/functions/qsystempropertyfn_p.h
+++ b/src/xmlpatterns/functions/qsystempropertyfn_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xslt20/#system-property">XSL Transformations
      * (XSLT) Version 2.0, 16.6.5 system-property</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_functions
      */
     class SystemPropertyFN : public StaticNamespacesContainer
diff --git a/src/xmlpatterns/functions/qtimezonefns_p.h b/src/xmlpatterns/functions/qtimezonefns_p.h
index 4ea3f40ac..dae1eda8c 100644
--- a/src/xmlpatterns/functions/qtimezonefns_p.h
+++ b/src/xmlpatterns/functions/qtimezonefns_p.h
@@ -81,7 +81,7 @@ namespace QPatternist
      * @see <a href="http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern">Curiously
      * Recurring Template Pattern, Wikipedia, the free encyclopedia</a>
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AdjustTimezone : public FunctionCall
     {
@@ -96,7 +96,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:adjust-dateTime-to-timezone()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AdjustDateTimeToTimezoneFN : public AdjustTimezone
     {
@@ -108,7 +108,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:adjust-dateTime-to-timezone()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AdjustDateToTimezoneFN : public AdjustTimezone
     {
@@ -120,7 +120,7 @@ namespace QPatternist
      * @short Implements the function <tt>fn:adjust-time-to-timezone()</tt>.
      *
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AdjustTimeToTimezoneFN : public AdjustTimezone
     {
diff --git a/src/xmlpatterns/functions/qtracefn.cpp b/src/xmlpatterns/functions/qtracefn.cpp
index b9c909807..0e6e91165 100644
--- a/src/xmlpatterns/functions/qtracefn.cpp
+++ b/src/xmlpatterns/functions/qtracefn.cpp
@@ -61,7 +61,7 @@ namespace QPatternist
      * an Expression sub class, can't modify its members, but MappingCallback
      * does not have this limitation since it's created on a per evaluation basis.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class TraceCallback : public QSharedData
     {
diff --git a/src/xmlpatterns/functions/qtracefn_p.h b/src/xmlpatterns/functions/qtracefn_p.h
index efffaa1cb..6e786d3c0 100644
--- a/src/xmlpatterns/functions/qtracefn_p.h
+++ b/src/xmlpatterns/functions/qtracefn_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Implements the function <tt>fn:trace()</tt>.
      * @ingroup Patternist_functions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class TraceFN : public FunctionCall
     {
diff --git a/src/xmlpatterns/functions/qtypeavailablefn_p.h b/src/xmlpatterns/functions/qtypeavailablefn_p.h
index ed7f34043..f5cbfc0f8 100644
--- a/src/xmlpatterns/functions/qtypeavailablefn_p.h
+++ b/src/xmlpatterns/functions/qtypeavailablefn_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xslt20/#function-function-available">XSL Transformations
      * (XSLT) Version 2.0, 18.1.1 Testing Availability of Functions</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_functions
      */
     class TypeAvailableFN : public StaticNamespacesContainer
diff --git a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
index fb084c904..8cb390d38 100644
--- a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
+++ b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xslt20/#function-unparsed-entity-uri">XSL Transformations
      * (XSLT) Version 2.0, 16.6.3 unparsed-entity-public-id</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_functions
      */
     class UnparsedEntityPublicIDFN : public ContextNodeChecker
diff --git a/src/xmlpatterns/functions/qunparsedentityurifn_p.h b/src/xmlpatterns/functions/qunparsedentityurifn_p.h
index 1af3a67ad..e569d6f58 100644
--- a/src/xmlpatterns/functions/qunparsedentityurifn_p.h
+++ b/src/xmlpatterns/functions/qunparsedentityurifn_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xslt20/#function-unparsed-entity-uri">XSL Transformations
      * (XSLT) Version 2.0, 16.6.2 unparsed-entity-uri</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_functions
      */
     class UnparsedEntityURIFN : public ContextNodeChecker
diff --git a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
index 357f7ff44..e77845c9b 100644
--- a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
+++ b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @ingroup Patternist_functions
      * @see <a href="http://www.w3.org/TR/xslt20/#unparsed-text">XSL
      * Transformations (XSLT) Version 2.0, 16.2 unparsed-text</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @since 4.5
      */
     class UnparsedTextAvailableFN : public StaticBaseUriContainer
diff --git a/src/xmlpatterns/functions/qunparsedtextfn_p.h b/src/xmlpatterns/functions/qunparsedtextfn_p.h
index 34dafa57e..ab9cdb2d2 100644
--- a/src/xmlpatterns/functions/qunparsedtextfn_p.h
+++ b/src/xmlpatterns/functions/qunparsedtextfn_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @ingroup Patternist_functions
      * @see <a href="http://www.w3.org/TR/xslt20/#unparsed-text">XSL
      * Transformations (XSLT) Version 2.0, 16.2 unparsed-text</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @since 4.5
      */
     class UnparsedTextFN : public StaticBaseUriContainer
diff --git a/src/xmlpatterns/functions/qxpath10corefunctions_p.h b/src/xmlpatterns/functions/qxpath10corefunctions_p.h
index b1dad6bba..03994b626 100644
--- a/src/xmlpatterns/functions/qxpath10corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxpath10corefunctions_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath.html#corelib">XML Path Language (XPath)
      * Version 1.0, 4 Core Function Library</a>
      * @see XPath20CoreFunctions
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class XPath10CoreFunctions : public AbstractFunctionFactory
     {
diff --git a/src/xmlpatterns/functions/qxpath20corefunctions_p.h b/src/xmlpatterns/functions/qxpath20corefunctions_p.h
index 9dc1a47df..e4f85ea5d 100644
--- a/src/xmlpatterns/functions/qxpath20corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxpath20corefunctions_p.h
@@ -74,7 +74,7 @@ namespace QPatternist
      * and XPath 2.0 Functions and Operators</a>
      * @see <a href="http://www.w3.org/TR/xpath.html#corelib">XML Path Language (XPath)
      * Version 1.0, 4 Core Function Library</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_functions
      */
     class XPath20CoreFunctions : public AbstractFunctionFactory
diff --git a/src/xmlpatterns/functions/qxslt20corefunctions_p.h b/src/xmlpatterns/functions/qxslt20corefunctions_p.h
index b1caccc90..90ce2f050 100644
--- a/src/xmlpatterns/functions/qxslt20corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxslt20corefunctions_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
      * and XPath 2.0 Functions and Operators</a>
      * @see <a href="http://www.w3.org/TR/xpath.html#corelib">XML Path Language (XPath)
      * Version 1.0, 4 Core Function Library</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_functions
      * @since 4.5
      */
diff --git a/src/xmlpatterns/iterators/qcachingiterator_p.h b/src/xmlpatterns/iterators/qcachingiterator_p.h
index bc6c3bb65..deca4dd29 100644
--- a/src/xmlpatterns/iterators/qcachingiterator_p.h
+++ b/src/xmlpatterns/iterators/qcachingiterator_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
      * which case it continues to populate the cache as well as deliver on its
      * own from a source QAbstractXmlForwardIterator.
      *
-     * @author Frans Englich <frans.fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      */
     class CachingIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
index 43ca76325..4d27b426f 100644
--- a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
+++ b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
      *
      * @note The nodes in the source list must be in document order.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      */
     class DeduplicateIterator : public ListIterator<Item>
diff --git a/src/xmlpatterns/iterators/qdistinctiterator_p.h b/src/xmlpatterns/iterators/qdistinctiterator_p.h
index cb7fd4664..acbc14abb 100644
--- a/src/xmlpatterns/iterators/qdistinctiterator_p.h
+++ b/src/xmlpatterns/iterators/qdistinctiterator_p.h
@@ -77,7 +77,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-distinct-values">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 15.1.6 fn:distinct-values</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      */
     class DistinctIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qemptyiterator_p.h b/src/xmlpatterns/iterators/qemptyiterator_p.h
index 408235586..ebc20f607 100644
--- a/src/xmlpatterns/iterators/qemptyiterator_p.h
+++ b/src/xmlpatterns/iterators/qemptyiterator_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
      *
      * EmptyIterator's constructor is protected, instances is retrieved from CommonValues.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      */
     template<typename T> class EmptyIterator : public QAbstractXmlForwardIterator<T>
diff --git a/src/xmlpatterns/iterators/qindexofiterator_p.h b/src/xmlpatterns/iterators/qindexofiterator_p.h
index c84c46a66..ba2a97e70 100644
--- a/src/xmlpatterns/iterators/qindexofiterator_p.h
+++ b/src/xmlpatterns/iterators/qindexofiterator_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-index-of">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 15.1.3 fn:index-of</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      */
     class IndexOfIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qinsertioniterator_p.h b/src/xmlpatterns/iterators/qinsertioniterator_p.h
index 1882de4d4..5da56ba74 100644
--- a/src/xmlpatterns/iterators/qinsertioniterator_p.h
+++ b/src/xmlpatterns/iterators/qinsertioniterator_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-insert-before">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 15.1.7 fn:insert-before</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      */
     class InsertionIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qitemmappingiterator_p.h b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
index dbbb00ecc..c3adda58a 100644
--- a/src/xmlpatterns/iterators/qitemmappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
@@ -85,7 +85,7 @@ namespace QPatternist
      * Declaring the mapToItem() function as inline, can be a good way to improve performance.
      *
      * @see SequenceMappingIterator
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      */
     template<typename TResult, typename TSource, typename TMapper, typename Context = DynamicContext::Ptr>
diff --git a/src/xmlpatterns/iterators/qrangeiterator_p.h b/src/xmlpatterns/iterators/qrangeiterator_p.h
index 56b5c0fd3..729023b2c 100644
--- a/src/xmlpatterns/iterators/qrangeiterator_p.h
+++ b/src/xmlpatterns/iterators/qrangeiterator_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath20/\#doc-xpath-RangeExpr">XML Path Language
      * (XPath) 2.0, 3.3 Sequence Expressions, RangeExpr</a>
      * @see RangeExpression
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      * @todo Documentation is missing
      */
diff --git a/src/xmlpatterns/iterators/qremovaliterator_p.h b/src/xmlpatterns/iterators/qremovaliterator_p.h
index 714ff8806..a4cd9909c 100644
--- a/src/xmlpatterns/iterators/qremovaliterator_p.h
+++ b/src/xmlpatterns/iterators/qremovaliterator_p.h
@@ -77,7 +77,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-remove">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 15.1.8 fn:remove</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      */
     class RemovalIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
index 1b2218da9..801f8ceec 100644
--- a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
@@ -81,7 +81,7 @@ namespace QPatternist
      *                                                      const DynamicContext::Ptr &context) const;
      * @endcode
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @see ItemMappingIterator
      * @ingroup Patternist_iterators
      */
diff --git a/src/xmlpatterns/iterators/qsingletoniterator_p.h b/src/xmlpatterns/iterators/qsingletoniterator_p.h
index 98e5126e8..a7d57562c 100644
--- a/src/xmlpatterns/iterators/qsingletoniterator_p.h
+++ b/src/xmlpatterns/iterators/qsingletoniterator_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
      *
      * Having to represent single items in Iterators is relatively common.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      */
     template<typename T>
diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
index 1262590ac..2cf9797a7 100644
--- a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
+++ b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-subsequence">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 15.1.10 fn:subsequence</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      */
     class SubsequenceIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
index b585d6824..5ca909bd8 100644
--- a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
+++ b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath-functions/#func-string-to-codepoints">XQuery 1.0
      * and XPath 2.0 Functions and Operators, 7.2.2 fn:string-to-codepoints</a>
      * @see StringToCodepointsFN
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_iterators
      */
     class ToCodepointsIterator : public Item::Iterator
diff --git a/src/xmlpatterns/janitors/qargumentconverter_p.h b/src/xmlpatterns/janitors/qargumentconverter_p.h
index 452b3f11d..1c019acba 100644
--- a/src/xmlpatterns/janitors/qargumentconverter_p.h
+++ b/src/xmlpatterns/janitors/qargumentconverter_p.h
@@ -73,7 +73,7 @@ namespace QPatternist
      * ArgumentReference that has the static type @c item(), when atomic value are asked
      * for. At runtime it atomizes/let values through appropriately.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_expressions
      */
     class ArgumentConverter : public UntypedAtomicConverter
diff --git a/src/xmlpatterns/janitors/qatomizer_p.h b/src/xmlpatterns/janitors/qatomizer_p.h
index a588209aa..0aeab04a8 100644
--- a/src/xmlpatterns/janitors/qatomizer_p.h
+++ b/src/xmlpatterns/janitors/qatomizer_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
      * 2.0 Functions and Operators, 2.4 fn:data</a>
      * @see <a href="http://www.w3.org/TR/xpath20/#id-atomization">XML
      * Path Language (XPath) 2.0, 2.4.2 Atomization</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_expressions
      */
     class Atomizer : public SingleContainer
diff --git a/src/xmlpatterns/janitors/qcardinalityverifier_p.h b/src/xmlpatterns/janitors/qcardinalityverifier_p.h
index 1a1fa5e97..0eaa2fd7e 100644
--- a/src/xmlpatterns/janitors/qcardinalityverifier_p.h
+++ b/src/xmlpatterns/janitors/qcardinalityverifier_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xpath-functions/#cardinality-funcs">XQuery 1.0 and
      * XPath 2.0 Functions and Operators, 15.2 Functions That Test the Cardinality of Sequences</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_expressions
      */
     class CardinalityVerifier : public SingleContainer
diff --git a/src/xmlpatterns/janitors/qebvextractor_p.h b/src/xmlpatterns/janitors/qebvextractor_p.h
index ec698e8c4..9f042acf5 100644
--- a/src/xmlpatterns/janitors/qebvextractor_p.h
+++ b/src/xmlpatterns/janitors/qebvextractor_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
      * There is code-duplication going on with BooleanFN.
      *
      * @see BooleanFN
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_expressions
      */
     class EBVExtractor : public SingleContainer
diff --git a/src/xmlpatterns/janitors/qitemverifier_p.h b/src/xmlpatterns/janitors/qitemverifier_p.h
index 2600f9cf6..0460fd8d3 100644
--- a/src/xmlpatterns/janitors/qitemverifier_p.h
+++ b/src/xmlpatterns/janitors/qitemverifier_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      * @short Verifies that the items in a sequence an Expression evaluates
      * is of a certain ItemType.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_expressions
      */
     class ItemVerifier : public SingleContainer
diff --git a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
index f9b31b081..2371da2f8 100644
--- a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
+++ b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
@@ -74,7 +74,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xpath20/#id-function-calls">XML Path
      * Language (XPath) 2.0, 3.1.5 Function Calls, in particular the
      * Function Conversion Rules</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_expressions
      */
     class UntypedAtomicConverter : public SingleContainer,
diff --git a/src/xmlpatterns/parser/TokenLookup.gperf b/src/xmlpatterns/parser/TokenLookup.gperf
index b95d96eed..8ca470a77 100644
--- a/src/xmlpatterns/parser/TokenLookup.gperf
+++ b/src/xmlpatterns/parser/TokenLookup.gperf
@@ -43,7 +43,7 @@
  * @file qtokenlookup.cpp
  * @short This file is generated from TokenLookup.gperf and contains
  * TokenLookup, a class housing a perfect hash function class for XQuery's keywords.
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
  */
 
 /**
diff --git a/src/xmlpatterns/parser/qmaintainingreader_p.h b/src/xmlpatterns/parser/qmaintainingreader_p.h
index 6f5cb4c25..9bdf14b8e 100644
--- a/src/xmlpatterns/parser/qmaintainingreader_p.h
+++ b/src/xmlpatterns/parser/qmaintainingreader_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
      * arguments for functions that takes a local name and a namespace. Be wary
      * of this.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @since 4.5
      */
     template<typename TokenLookupClass,
@@ -103,7 +103,7 @@ namespace QPatternist
      * different interpretations depending on context, the lookup key is hence
      * not equal element name.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @since 4.5
      */
     template<typename TokenLookupClass,
diff --git a/src/xmlpatterns/parser/qparsercontext_p.h b/src/xmlpatterns/parser/qparsercontext_p.h
index 8e636c364..78f700112 100644
--- a/src/xmlpatterns/parser/qparsercontext_p.h
+++ b/src/xmlpatterns/parser/qparsercontext_p.h
@@ -82,7 +82,7 @@ namespace QPatternist
      * is passed to the scanner and parser. It holds all information that is
      * needed to create the expression.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ParserContext : public QSharedData
     {
diff --git a/src/xmlpatterns/parser/qtokenizer_p.h b/src/xmlpatterns/parser/qtokenizer_p.h
index cccd7b165..4cd0760f7 100644
--- a/src/xmlpatterns/parser/qtokenizer_p.h
+++ b/src/xmlpatterns/parser/qtokenizer_p.h
@@ -150,7 +150,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xquery-xpath-parsing/">Building a
      * Tokenizer for XPath or XQuery</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Tokenizer : public TokenSource
     {
diff --git a/src/xmlpatterns/parser/qtokensource_p.h b/src/xmlpatterns/parser/qtokensource_p.h
index ed757942f..1756021e7 100644
--- a/src/xmlpatterns/parser/qtokensource_p.h
+++ b/src/xmlpatterns/parser/qtokensource_p.h
@@ -104,7 +104,7 @@ namespace QPatternist
      *
      * @see <a href="http://www.w3.org/TR/xquery-xpath-parsing/">Building a
      * Tokenizer for XPath or XQuery</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class TokenSource : public QSharedData
     {
diff --git a/src/xmlpatterns/parser/qxquerytokenizer_p.h b/src/xmlpatterns/parser/qxquerytokenizer_p.h
index e6aaef84c..bfa78821d 100644
--- a/src/xmlpatterns/parser/qxquerytokenizer_p.h
+++ b/src/xmlpatterns/parser/qxquerytokenizer_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
      * @short A hand-written tokenizer which tokenizes XQuery 1.0 & XPath 2.0,
      * and delivers tokens to the Bison generated parser.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class XQueryTokenizer : public Tokenizer
     {
diff --git a/src/xmlpatterns/parser/qxslttokenizer_p.h b/src/xmlpatterns/parser/qxslttokenizer_p.h
index e835f2248..2112f52d3 100644
--- a/src/xmlpatterns/parser/qxslttokenizer_p.h
+++ b/src/xmlpatterns/parser/qxslttokenizer_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
      * could append to that, instead of instansiating a SingleTokenContainer
      * all the time.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SingleTokenContainer : public TokenSource
     {
@@ -107,7 +107,7 @@ namespace QPatternist
      * XQuery code, slightly extended to handle the featuress specific to
      * XSL-T.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class XSLTTokenizer : public Tokenizer
                         , private MaintainingReader<XSLTTokenLookup>
diff --git a/src/xmlpatterns/projection/qdocumentprojector_p.h b/src/xmlpatterns/projection/qdocumentprojector_p.h
index 33588786a..2cda312c1 100644
--- a/src/xmlpatterns/projection/qdocumentprojector_p.h
+++ b/src/xmlpatterns/projection/qdocumentprojector_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
     /**
      * @short
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DocumentProjector : public QAbstractXmlReceiver
     {
diff --git a/src/xmlpatterns/type/qabstractnodetest_p.h b/src/xmlpatterns/type/qabstractnodetest_p.h
index f7c8d4b7d..212dc8b7b 100644
--- a/src/xmlpatterns/type/qabstractnodetest_p.h
+++ b/src/xmlpatterns/type/qabstractnodetest_p.h
@@ -64,7 +64,7 @@ namespace QPatternist
      * @short A name test that is of the type <tt>prefix:ncName</tt>.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AbstractNodeTest : public AnyNodeType
     {
diff --git a/src/xmlpatterns/type/qanyitemtype_p.h b/src/xmlpatterns/type/qanyitemtype_p.h
index f919b9e7e..ae4292f5d 100644
--- a/src/xmlpatterns/type/qanyitemtype_p.h
+++ b/src/xmlpatterns/type/qanyitemtype_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      * @short Represents the <tt>item()</tt> item type.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AnyItemType : public ItemType
     {
diff --git a/src/xmlpatterns/type/qanynodetype_p.h b/src/xmlpatterns/type/qanynodetype_p.h
index 11194cbee..16d124301 100644
--- a/src/xmlpatterns/type/qanynodetype_p.h
+++ b/src/xmlpatterns/type/qanynodetype_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      *
      * @ingroup Patternist_types
      * @see BuiltinNodeType
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AnyNodeType : public ItemType
     {
diff --git a/src/xmlpatterns/type/qanysimpletype_p.h b/src/xmlpatterns/type/qanysimpletype_p.h
index be3c9ea44..4f7851d4c 100644
--- a/src/xmlpatterns/type/qanysimpletype_p.h
+++ b/src/xmlpatterns/type/qanysimpletype_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
      * @ingroup Patternist_types
      * @see <a href="http://www.w3.org/TR/xmlschema-2/#dt-anySimpleType">XML Schema Part 2:
      * Datatypes Second Edition, The simple ur-type definition</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AnySimpleType : public AnyType
     {
diff --git a/src/xmlpatterns/type/qanytype_p.h b/src/xmlpatterns/type/qanytype_p.h
index 06b84a9f9..d5edf2d8c 100644
--- a/src/xmlpatterns/type/qanytype_p.h
+++ b/src/xmlpatterns/type/qanytype_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @short Represents the @c xs:anyType item type.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AnyType : public SchemaType
     {
diff --git a/src/xmlpatterns/type/qatomiccasterlocator_p.h b/src/xmlpatterns/type/qatomiccasterlocator_p.h
index 5879e0962..840e84e48 100644
--- a/src/xmlpatterns/type/qatomiccasterlocator_p.h
+++ b/src/xmlpatterns/type/qatomiccasterlocator_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 namespace QPatternist
 {
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AtomicCasterLocator : public AtomicTypeVisitor
     {
diff --git a/src/xmlpatterns/type/qatomiccasterlocators_p.h b/src/xmlpatterns/type/qatomiccasterlocators_p.h
index a19d6a255..186592975 100644
--- a/src/xmlpatterns/type/qatomiccasterlocators_p.h
+++ b/src/xmlpatterns/type/qatomiccasterlocators_p.h
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
 namespace QPatternist
 {
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToStringCasterLocator : public AtomicCasterLocator
     {
@@ -124,7 +124,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToUntypedAtomicCasterLocator : public AtomicCasterLocator
     {
@@ -179,7 +179,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToAnyURICasterLocator : public AtomicCasterLocator
     {
@@ -194,7 +194,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToBooleanCasterLocator : public AtomicCasterLocator
     {
@@ -217,7 +217,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToDoubleCasterLocator : public AtomicCasterLocator
     {
@@ -240,7 +240,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToFloatCasterLocator : public AtomicCasterLocator
     {
@@ -263,7 +263,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToDecimalCasterLocator : public AtomicCasterLocator
     {
@@ -286,7 +286,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToIntegerCasterLocator : public AtomicCasterLocator
     {
@@ -309,7 +309,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToBase64BinaryCasterLocator : public AtomicCasterLocator
     {
@@ -326,7 +326,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToHexBinaryCasterLocator : public AtomicCasterLocator
     {
@@ -343,7 +343,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToQNameCasterLocator : public AtomicCasterLocator
     {
@@ -356,7 +356,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToGYearCasterLocator : public AtomicCasterLocator
     {
@@ -375,7 +375,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToGDayCasterLocator : public AtomicCasterLocator
     {
@@ -394,7 +394,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToGMonthCasterLocator : public AtomicCasterLocator
     {
@@ -413,7 +413,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToGYearMonthCasterLocator : public AtomicCasterLocator
     {
@@ -432,7 +432,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToGMonthDayCasterLocator : public AtomicCasterLocator
     {
@@ -451,7 +451,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToDateTimeCasterLocator : public AtomicCasterLocator
     {
@@ -468,7 +468,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToDateCasterLocator : public AtomicCasterLocator
     {
@@ -485,7 +485,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToSchemaTimeCasterLocator : public AtomicCasterLocator
     {
@@ -502,7 +502,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToDurationCasterLocator : public AtomicCasterLocator
     {
@@ -521,7 +521,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToDayTimeDurationCasterLocator : public AtomicCasterLocator
     {
@@ -540,7 +540,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ToYearMonthDurationCasterLocator : public AtomicCasterLocator
     {
@@ -559,7 +559,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<TypeOfDerivedInteger type>
     class ToDerivedIntegerCasterLocator : public ToIntegerCasterLocator
@@ -702,7 +702,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<TypeOfDerivedString type>
     class ToDerivedStringCasterLocator : public ToStringCasterLocator
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
index a2310a772..fb81b5085 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
+++ b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      * @todo Docs missing
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AtomicComparatorLocator : public ParameterizedAtomicTypeVisitor
     {
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
index d87f9d76a..34cd7c348 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
+++ b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
 {
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DoubleComparatorLocator : public AtomicComparatorLocator
     {
@@ -88,7 +88,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class FloatComparatorLocator : public AtomicComparatorLocator
     {
@@ -108,7 +108,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DecimalComparatorLocator : public AtomicComparatorLocator
     {
@@ -128,7 +128,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class IntegerComparatorLocator : public AtomicComparatorLocator
     {
@@ -148,7 +148,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class BooleanComparatorLocator : public AtomicComparatorLocator
     {
@@ -159,7 +159,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Base64BinaryComparatorLocator : public AtomicComparatorLocator
     {
@@ -170,7 +170,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class HexBinaryComparatorLocator : public AtomicComparatorLocator
     {
@@ -181,7 +181,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class QNameComparatorLocator : public AtomicComparatorLocator
     {
@@ -192,7 +192,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringComparatorLocator : public AtomicComparatorLocator
     {
@@ -210,7 +210,7 @@ namespace QPatternist
 
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GYearComparatorLocator : public AtomicComparatorLocator
     {
@@ -221,7 +221,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GMonthComparatorLocator : public AtomicComparatorLocator
     {
@@ -232,7 +232,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GYearMonthComparatorLocator : public AtomicComparatorLocator
     {
@@ -243,7 +243,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GMonthDayComparatorLocator : public AtomicComparatorLocator
     {
@@ -254,7 +254,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GDayComparatorLocator : public AtomicComparatorLocator
     {
@@ -265,7 +265,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DateTimeComparatorLocator : public AtomicComparatorLocator
     {
@@ -276,7 +276,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SchemaTimeComparatorLocator : public AtomicComparatorLocator
     {
@@ -287,7 +287,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DateComparatorLocator : public AtomicComparatorLocator
     {
@@ -298,7 +298,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DurationComparatorLocator : public AtomicComparatorLocator
     {
@@ -315,7 +315,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DayTimeDurationComparatorLocator : public AtomicComparatorLocator
     {
@@ -332,7 +332,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class YearMonthDurationComparatorLocator : public AtomicComparatorLocator
     {
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
index b2362b335..af9577b09 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
+++ b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @todo Docs missing
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AtomicMathematicianLocator : public ParameterizedAtomicTypeVisitor
     {
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
index 8ca9d3287..5f3b7971b 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
+++ b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
 namespace QPatternist
 {
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo docs
      */
     class DoubleMathematicianLocator : public AtomicMathematicianLocator
@@ -89,7 +89,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo docs
      */
     class FloatMathematicianLocator : public AtomicMathematicianLocator
@@ -110,7 +110,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo docs
      */
     class DecimalMathematicianLocator : public AtomicMathematicianLocator
@@ -131,7 +131,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo docs
      */
     class IntegerMathematicianLocator : public AtomicMathematicianLocator
@@ -152,7 +152,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo docs
      */
     class DateMathematicianLocator : public AtomicMathematicianLocator
@@ -167,7 +167,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo docs
      */
     class SchemaTimeMathematicianLocator : public AtomicMathematicianLocator
@@ -180,7 +180,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo docs
      */
     class DateTimeMathematicianLocator : public AtomicMathematicianLocator
@@ -194,7 +194,7 @@ namespace QPatternist
                                                    const SourceLocationReflection *const r) const;
     };
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo docs
      */
     class DayTimeDurationMathematicianLocator : public AtomicMathematicianLocator
@@ -219,7 +219,7 @@ namespace QPatternist
     };
 
     /**
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo docs
      */
     class YearMonthDurationMathematicianLocator : public AtomicMathematicianLocator
diff --git a/src/xmlpatterns/type/qatomictype_p.h b/src/xmlpatterns/type/qatomictype_p.h
index 3d6eb3701..f964104de 100644
--- a/src/xmlpatterns/type/qatomictype_p.h
+++ b/src/xmlpatterns/type/qatomictype_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
      * base class for classes that implement atomic types, such as @c xs:anyAtomicType.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AtomicType : public ItemType,
                        public AnySimpleType
diff --git a/src/xmlpatterns/type/qatomictypedispatch_p.h b/src/xmlpatterns/type/qatomictypedispatch_p.h
index ebf7319d2..d12b766ab 100644
--- a/src/xmlpatterns/type/qatomictypedispatch_p.h
+++ b/src/xmlpatterns/type/qatomictypedispatch_p.h
@@ -133,7 +133,7 @@ namespace QPatternist
      * @todo Docs missing
      *
      * @ingroup Patternist_types_dispatch
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AtomicTypeVisitorResult : public QSharedData
     {
@@ -148,7 +148,7 @@ namespace QPatternist
      *
      * @see ParameterizedAtomicTypeVisitor
      * @ingroup Patternist_types_dispatch
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AtomicTypeVisitor : public QSharedData
     {
@@ -211,7 +211,7 @@ namespace QPatternist
      *
      * @see AtomicTypeVisitor
      * @ingroup Patternist_types_dispatch
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ParameterizedAtomicTypeVisitor : public QSharedData
     {
diff --git a/src/xmlpatterns/type/qbasictypesfactory_p.h b/src/xmlpatterns/type/qbasictypesfactory_p.h
index 662fe9cfb..362783a8a 100644
--- a/src/xmlpatterns/type/qbasictypesfactory_p.h
+++ b/src/xmlpatterns/type/qbasictypesfactory_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
      * Version 2.0, 3.13 Built-in Types</a>
      * @see <a href="http://www.w3.org/TR/xmlschema-2/#built-in-primitive-datatypes">XML Schema
      * Part 2: Datatypes Second Edition, 3.2 Primitive datatypes</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class BasicTypesFactory : public SchemaTypeFactory
     {
diff --git a/src/xmlpatterns/type/qbuiltinatomictype_p.h b/src/xmlpatterns/type/qbuiltinatomictype_p.h
index 0d5ac24d6..b9e7c11a5 100644
--- a/src/xmlpatterns/type/qbuiltinatomictype_p.h
+++ b/src/xmlpatterns/type/qbuiltinatomictype_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
      * class manually.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class BuiltinAtomicType : public AtomicType
     {
diff --git a/src/xmlpatterns/type/qbuiltinatomictypes_p.h b/src/xmlpatterns/type/qbuiltinatomictypes_p.h
index ecfe5d78a..63af3e7fd 100644
--- a/src/xmlpatterns/type/qbuiltinatomictypes_p.h
+++ b/src/xmlpatterns/type/qbuiltinatomictypes_p.h
@@ -67,7 +67,7 @@ namespace QPatternist
      * @short Implements the type @c xs:anyAtomicType.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AnyAtomicType : public BuiltinAtomicType
     {
@@ -112,7 +112,7 @@ namespace QPatternist
      * @short Implements the type @c xs:untypedAtomic.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class UntypedAtomicType : public BuiltinAtomicType
     {
@@ -136,7 +136,7 @@ namespace QPatternist
      * @short Implements the type @c xs:dateTime.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DateTimeType : public BuiltinAtomicType
     {
@@ -160,7 +160,7 @@ namespace QPatternist
      * @short Implements the type @c xs:date.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DateType : public BuiltinAtomicType
     {
@@ -184,7 +184,7 @@ namespace QPatternist
      * @short Implements the type @c xs:time.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SchemaTimeType : public BuiltinAtomicType
     {
@@ -209,7 +209,7 @@ namespace QPatternist
      * @short Implements the type @c xs:duration.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DurationType : public BuiltinAtomicType
     {
@@ -233,7 +233,7 @@ namespace QPatternist
      * @short Implements the type @c xs:yearMonthDuration.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class YearMonthDurationType : public BuiltinAtomicType
     {
@@ -257,7 +257,7 @@ namespace QPatternist
      * @short Implements the type @c xs:dayTimeDuration.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DayTimeDurationType : public BuiltinAtomicType
     {
@@ -281,7 +281,7 @@ namespace QPatternist
      * @short Implements the type @c xs:double.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DoubleType : public BuiltinAtomicType
     {
@@ -305,7 +305,7 @@ namespace QPatternist
      * @short Implements the type @c xs:float.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class FloatType : public BuiltinAtomicType
     {
@@ -329,7 +329,7 @@ namespace QPatternist
      * @short Implements the type @c xs:decimal.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DecimalType : public BuiltinAtomicType
     {
@@ -360,7 +360,7 @@ namespace QPatternist
      * this way.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class IntegerType : public BuiltinAtomicType
     {
@@ -434,7 +434,7 @@ namespace QPatternist
      * @short Implements the type @c xs:gYearMonth.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GYearMonthType : public BuiltinAtomicType
     {
@@ -458,7 +458,7 @@ namespace QPatternist
      * @short Implements the type @c xs:gYear.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GYearType : public BuiltinAtomicType
     {
@@ -482,7 +482,7 @@ namespace QPatternist
      * @short Implements the type @c xs:gMonthDay.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GMonthDayType : public BuiltinAtomicType
     {
@@ -506,7 +506,7 @@ namespace QPatternist
      * @short Implements the type @c xs:gDay.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GDayType : public BuiltinAtomicType
     {
@@ -530,7 +530,7 @@ namespace QPatternist
      * @short Implements the type @c xs:gMonth.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GMonthType : public BuiltinAtomicType
     {
@@ -554,7 +554,7 @@ namespace QPatternist
      * @short Implements the type @c xs:boolean.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class BooleanType : public BuiltinAtomicType
     {
@@ -578,7 +578,7 @@ namespace QPatternist
      * @short Implements the type @c xs:base64Binary.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Base64BinaryType : public BuiltinAtomicType
     {
@@ -602,7 +602,7 @@ namespace QPatternist
      * @short Implements the type @c xs:hexBinary.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class HexBinaryType : public BuiltinAtomicType
     {
@@ -626,7 +626,7 @@ namespace QPatternist
      * @short Implements the type @c xs:anyURI.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class AnyURIType : public BuiltinAtomicType
     {
@@ -650,7 +650,7 @@ namespace QPatternist
      * @short Implements the type @c xs:QName.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class QNameType : public BuiltinAtomicType
     {
@@ -682,7 +682,7 @@ namespace QPatternist
      * this way.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class StringType : public BuiltinAtomicType
     {
@@ -754,7 +754,7 @@ namespace QPatternist
      * @short Implements the type @c xs:NOTATION.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NOTATIONType : public BuiltinAtomicType
     {
diff --git a/src/xmlpatterns/type/qbuiltinnodetype_p.h b/src/xmlpatterns/type/qbuiltinnodetype_p.h
index ef453e701..119654bee 100644
--- a/src/xmlpatterns/type/qbuiltinnodetype_p.h
+++ b/src/xmlpatterns/type/qbuiltinnodetype_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
      * of <tt>node()</tt>, such as <tt>processing-instruction()</tt>.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template <const QXmlNodeModelIndex::NodeKind kind>
     class BuiltinNodeType : public AnyNodeType
diff --git a/src/xmlpatterns/type/qbuiltintypes_p.h b/src/xmlpatterns/type/qbuiltintypes_p.h
index 9dfd62513..4f7d0788a 100644
--- a/src/xmlpatterns/type/qbuiltintypes_p.h
+++ b/src/xmlpatterns/type/qbuiltintypes_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
      * @short Provides access to singleton instances of ItemType and SchemaType sub-classes.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT BuiltinTypes
     {
diff --git a/src/xmlpatterns/type/qcardinality_p.h b/src/xmlpatterns/type/qcardinality_p.h
index c58d120ea..3ea05c845 100644
--- a/src/xmlpatterns/type/qcardinality_p.h
+++ b/src/xmlpatterns/type/qcardinality_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
      * @see SequenceType
      * @see <a href="http://www.w3.org/TR/xpath20/#prod-xpath-SequenceType">XML Path Language
      * (XPath) 2.0, The EBNF grammar for SequenceType</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Cardinality
     {
diff --git a/src/xmlpatterns/type/qcommonsequencetypes_p.h b/src/xmlpatterns/type/qcommonsequencetypes_p.h
index 8269a3a76..6aa7749da 100644
--- a/src/xmlpatterns/type/qcommonsequencetypes_p.h
+++ b/src/xmlpatterns/type/qcommonsequencetypes_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      * @short Provides access to singleton instances of SequenceType sub-classes.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class Q_AUTOTEST_EXPORT CommonSequenceTypes
     {
diff --git a/src/xmlpatterns/type/qebvtype_p.h b/src/xmlpatterns/type/qebvtype_p.h
index adede7336..42eaadbfb 100644
--- a/src/xmlpatterns/type/qebvtype_p.h
+++ b/src/xmlpatterns/type/qebvtype_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
      * checking for expressions such as IfThenClause and AndExpression.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class EBVType : public ItemType,
                     public SequenceType
diff --git a/src/xmlpatterns/type/qemptysequencetype_p.h b/src/xmlpatterns/type/qemptysequencetype_p.h
index f4f1f888c..6f7e76303 100644
--- a/src/xmlpatterns/type/qemptysequencetype_p.h
+++ b/src/xmlpatterns/type/qemptysequencetype_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @short Represents the <tt>empty-sequence()</tt> type.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class EmptySequenceType : public ItemType,
                               public SequenceType
diff --git a/src/xmlpatterns/type/qgenericsequencetype_p.h b/src/xmlpatterns/type/qgenericsequencetype_p.h
index 9e92aff47..57cb63929 100644
--- a/src/xmlpatterns/type/qgenericsequencetype_p.h
+++ b/src/xmlpatterns/type/qgenericsequencetype_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      * @todo Documentation is missing.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GenericSequenceType : public SequenceType
     {
diff --git a/src/xmlpatterns/type/qitemtype_p.h b/src/xmlpatterns/type/qitemtype_p.h
index 915b221cf..608259fa1 100644
--- a/src/xmlpatterns/type/qitemtype_p.h
+++ b/src/xmlpatterns/type/qitemtype_p.h
@@ -77,7 +77,7 @@ namespace QPatternist
      * similar to how inference rules in the specification are written.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class ItemType : public virtual QSharedData
     {
diff --git a/src/xmlpatterns/type/qlocalnametest_p.h b/src/xmlpatterns/type/qlocalnametest_p.h
index fac25568a..5e94e4d42 100644
--- a/src/xmlpatterns/type/qlocalnametest_p.h
+++ b/src/xmlpatterns/type/qlocalnametest_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @short A name test that is of the type <tt>*:local-name</tt>.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class LocalNameTest : public AbstractNodeTest
     {
diff --git a/src/xmlpatterns/type/qmultiitemtype_p.h b/src/xmlpatterns/type/qmultiitemtype_p.h
index 9474e6072..f719e606a 100644
--- a/src/xmlpatterns/type/qmultiitemtype_p.h
+++ b/src/xmlpatterns/type/qmultiitemtype_p.h
@@ -73,7 +73,7 @@ namespace QPatternist
      * For example, xdtTypeMatches() returns @c true if any of the represented types matches.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class MultiItemType : public ItemType
     {
diff --git a/src/xmlpatterns/type/qnamespacenametest_p.h b/src/xmlpatterns/type/qnamespacenametest_p.h
index 65f44baea..338ae2e28 100644
--- a/src/xmlpatterns/type/qnamespacenametest_p.h
+++ b/src/xmlpatterns/type/qnamespacenametest_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @short A name test that is of the type <tt>prefix:*</tt>.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NamespaceNameTest : public AbstractNodeTest
     {
diff --git a/src/xmlpatterns/type/qnonetype_p.h b/src/xmlpatterns/type/qnonetype_p.h
index e7cc6db04..42d38bf25 100644
--- a/src/xmlpatterns/type/qnonetype_p.h
+++ b/src/xmlpatterns/type/qnonetype_p.h
@@ -70,7 +70,7 @@ namespace QPatternist
      * XPath 2.0 Formal Semantics, 2.4.3 Content models</a>
      * @see <a href="http://www.w3.org/TR/xquery-semantics/#sec_fnerror">XQuery 1.0 and XPath 2.0
      * Formal Semantics, 7.2.9 The fn:error function</a>
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NoneType : public ItemType,
                      public SequenceType
diff --git a/src/xmlpatterns/type/qnumerictype_p.h b/src/xmlpatterns/type/qnumerictype_p.h
index c82112d79..632ce563e 100644
--- a/src/xmlpatterns/type/qnumerictype_p.h
+++ b/src/xmlpatterns/type/qnumerictype_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xquery-semantics/#dt-fs_numeric">XQuery 1.0
      * and XPath 2.0 Formal Semantics, Definition: fs:numeric</a>
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NumericType : public AtomicType
     {
diff --git a/src/xmlpatterns/type/qprimitives_p.h b/src/xmlpatterns/type/qprimitives_p.h
index 8fec3738b..e33c18464 100644
--- a/src/xmlpatterns/type/qprimitives_p.h
+++ b/src/xmlpatterns/type/qprimitives_p.h
@@ -63,7 +63,7 @@
 /**
  * @short Contains Patternist, an XPath 2.0, XQuery 1.0 and XSL-T 2.0 implementation.
  *
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
  */
 QT_BEGIN_HEADER
 
@@ -89,7 +89,7 @@ namespace QPatternist
      * are used throughout the API. This ensures consistency, reduces the amount
      * of conversions, and potentially precision loss in conversions.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
 
     /**
diff --git a/src/xmlpatterns/type/qqnametest_p.h b/src/xmlpatterns/type/qqnametest_p.h
index 2519bbaa6..2fcf2d8e1 100644
--- a/src/xmlpatterns/type/qqnametest_p.h
+++ b/src/xmlpatterns/type/qqnametest_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @short A name test that is of the type <tt>prefix:ncName</tt>.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class QNameTest : public AbstractNodeTest
     {
diff --git a/src/xmlpatterns/type/qschemacomponent_p.h b/src/xmlpatterns/type/qschemacomponent_p.h
index a6517ce9a..27a50bd40 100644
--- a/src/xmlpatterns/type/qschemacomponent_p.h
+++ b/src/xmlpatterns/type/qschemacomponent_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
      * @short Base class for all constructs that can appear in a W3C XML Schema.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SchemaComponent : public virtual QSharedData
     {
diff --git a/src/xmlpatterns/type/qschematype_p.h b/src/xmlpatterns/type/qschematype_p.h
index 744b4df0b..6708ec2e6 100644
--- a/src/xmlpatterns/type/qschematype_p.h
+++ b/src/xmlpatterns/type/qschematype_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
      * This is the base class of all data types in a W3C XML Schema.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SchemaType : public SchemaComponent
     {
diff --git a/src/xmlpatterns/type/qschematypefactory_p.h b/src/xmlpatterns/type/qschematypefactory_p.h
index 679013678..df83e909b 100644
--- a/src/xmlpatterns/type/qschematypefactory_p.h
+++ b/src/xmlpatterns/type/qschematypefactory_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
      * @short A factory creating schema types.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class SchemaTypeFactory : public QSharedData
     {
diff --git a/src/xmlpatterns/type/qsequencetype_p.h b/src/xmlpatterns/type/qsequencetype_p.h
index 2b7f87a2c..8e44d8cb0 100644
--- a/src/xmlpatterns/type/qsequencetype_p.h
+++ b/src/xmlpatterns/type/qsequencetype_p.h
@@ -75,7 +75,7 @@ namespace QPatternist
      * identical to the SequenceType EBNF construct.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @see <a href="http://www.w3.org/TR/xpath20/#id-sequencetype-syntax">XML
      * Path Language (XPath) 2.0, 2.5.3 SequenceType Syntax</a>
      */
diff --git a/src/xmlpatterns/type/qtypechecker_p.h b/src/xmlpatterns/type/qtypechecker_p.h
index 92e8ef655..12367f00f 100644
--- a/src/xmlpatterns/type/qtypechecker_p.h
+++ b/src/xmlpatterns/type/qtypechecker_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * kinds of compile-time type checking tasks.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class TypeChecker
     {
diff --git a/src/xmlpatterns/type/quntyped_p.h b/src/xmlpatterns/type/quntyped_p.h
index cb50042f3..6f2f30f86 100644
--- a/src/xmlpatterns/type/quntyped_p.h
+++ b/src/xmlpatterns/type/quntyped_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @short Represents the complex W3C XML Schema type <tt>xs:untyped</tt>.
      *
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @see <a href="http://www.w3.org/TR/xpath-datamodel/#types-predefined">XQuery 1.0 and XPath 2.0
      * Data Model, 2.6.2 Predefined Types</a>
      */
diff --git a/src/xmlpatterns/type/qxsltnodetest_p.h b/src/xmlpatterns/type/qxsltnodetest_p.h
index a1c5e8707..9cccce223 100644
--- a/src/xmlpatterns/type/qxsltnodetest_p.h
+++ b/src/xmlpatterns/type/qxsltnodetest_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
      * @see <a href="http://www.w3.org/TR/xslt20/#pattern-semantics">XSL
      * Transformations (XSLT) Version 2.0, 5.5.3 The Meaning of a Pattern</a>
      * @ingroup Patternist_types
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @since 4.5
      */
     class XSLTNodeTest : public AnyNodeType
diff --git a/src/xmlpatterns/utils/qcommonnamespaces_p.h b/src/xmlpatterns/utils/qcommonnamespaces_p.h
index 8cf58995a..6de901414 100644
--- a/src/xmlpatterns/utils/qcommonnamespaces_p.h
+++ b/src/xmlpatterns/utils/qcommonnamespaces_p.h
@@ -63,7 +63,7 @@ namespace QPatternist
     /**
      * @short Contains common, standardized XML namespaces.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     namespace CommonNamespaces
     {
diff --git a/src/xmlpatterns/utils/qcppcastinghelper_p.h b/src/xmlpatterns/utils/qcppcastinghelper_p.h
index 70c398efc..4973bb24a 100644
--- a/src/xmlpatterns/utils/qcppcastinghelper_p.h
+++ b/src/xmlpatterns/utils/qcppcastinghelper_p.h
@@ -91,7 +91,7 @@ namespace QPatternist
      * CppCastingHelper is a template class where the TSubClass parameter must be the class
      * inheriting CppCastingHelper. See Item or Expression for demonstration.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     template<typename TSubClass>
     class CppCastingHelper
diff --git a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
index 4f3342f3d..1fc75e8c2 100644
--- a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
      * own.
      *
      * @ingroup Patternist
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class DelegatingNamespaceResolver : public NamespaceResolver
     {
diff --git a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
index 2101420f1..968247b78 100644
--- a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
@@ -66,7 +66,7 @@ namespace QPatternist
      * @short Generic namespace resolver which resolves lookups against entries in a QHash.
      *
      * @ingroup Patternist
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class GenericNamespaceResolver : public NamespaceResolver
     {
diff --git a/src/xmlpatterns/utils/qnamepool_p.h b/src/xmlpatterns/utils/qnamepool_p.h
index 27c886a79..b6d7660ba 100644
--- a/src/xmlpatterns/utils/qnamepool_p.h
+++ b/src/xmlpatterns/utils/qnamepool_p.h
@@ -80,7 +80,7 @@ namespace QPatternist
      * word. All functions of this class can be called concurrently. This is
      * achieved by internal locking.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo Use QSubStrings, we can save very many heap allocations by that.
      * @todo Check limits
      */
diff --git a/src/xmlpatterns/utils/qnamespacebinding_p.h b/src/xmlpatterns/utils/qnamespacebinding_p.h
index cda1a9971..356ff7c66 100644
--- a/src/xmlpatterns/utils/qnamespacebinding_p.h
+++ b/src/xmlpatterns/utils/qnamespacebinding_p.h
@@ -65,7 +65,7 @@ namespace QPatternist
     /**
      * @short Represents a namespace binding: a prefix, and a namespace URI.
      *
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NamespaceBinding
     {
diff --git a/src/xmlpatterns/utils/qnamespaceresolver_p.h b/src/xmlpatterns/utils/qnamespaceresolver_p.h
index edf1f797a..cbc8d1923 100644
--- a/src/xmlpatterns/utils/qnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qnamespaceresolver_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
      * @short Base class for namespace resolvers.
      *
      * @ingroup Patternist
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NamespaceResolver : public QSharedData
     {
diff --git a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
index aa6793232..1dc46fc65 100644
--- a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
@@ -68,7 +68,7 @@ namespace QPatternist
      * bindings for resolving namespaces.
      *
      * @ingroup Patternist
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class NodeNamespaceResolver : public NamespaceResolver
     {
diff --git a/src/xmlpatterns/utils/qoutputvalidator_p.h b/src/xmlpatterns/utils/qoutputvalidator_p.h
index 8d250b414..f2d23bbcf 100644
--- a/src/xmlpatterns/utils/qoutputvalidator_p.h
+++ b/src/xmlpatterns/utils/qoutputvalidator_p.h
@@ -72,7 +72,7 @@ namespace QPatternist
      * nodes.
      *
      * @ingroup Patternist_xdm
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @todo Escape data
      */
     class OutputValidator : public QAbstractXmlReceiver
diff --git a/src/xmlpatterns/utils/qxpathhelper_p.h b/src/xmlpatterns/utils/qxpathhelper_p.h
index b4334d225..a825e9c40 100644
--- a/src/xmlpatterns/utils/qxpathhelper_p.h
+++ b/src/xmlpatterns/utils/qxpathhelper_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
      * goes away, and that functions are in more specific classes.
      *
      * @ingroup Patternist
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      */
     class XPathHelper
     {
author	Jason McDonald <jason.mcdonald@nokia.com>	2009-08-11 19:44:38 +1000
committer	Jason McDonald <jason.mcdonald@nokia.com>	2009-08-11 19:44:38 +1000
commit	ef9fec988d3d7ea33836a08128119f99747dc9d5 (patch)
tree	67c134d1bee2c2338e958c766b23805666674d5a /src
parent	3058cd5f6ee3fb01e62d625b501e7eeeea70cd84 (diff)