Update obsolete email addresses.

Reviewed-by: Trust Me

41 files changed, 106 insertions, 106 deletions

diff --git a/src/xmlpatterns/data/qabstractdatetime_p.h b/src/xmlpatterns/data/qabstractdatetime_p.h
index 8377cee..12f3981 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 060caa5..d67f09a 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 469a44a..b326e1f 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 cd16276..6086c7a 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 beabaf7..d2f3041 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 cb89683..68607f9 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 b747423..fa7148d 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 f93573d..6f4d724 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 406da68..649e80a 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 0649fa7..267eef8 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 be6a696..ba5be30 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 da84afe..44abacd 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 596b154..e8d29f6 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 9367308..3b81833 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/qcomparisonfactory_p.h b/src/xmlpatterns/data/qcomparisonfactory_p.h
index 6ba48c3..3a93117 100644
--- a/src/xmlpatterns/data/qcomparisonfactory_p.h
+++ b/src/xmlpatterns/data/qcomparisonfactory_p.h
@@ -71,7 +71,7 @@ namespace QPatternist
      * high-level API.
      *
      * @see ComparisonPlatform
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_schema
      */
     class ComparisonFactory
diff --git a/src/xmlpatterns/data/qdate_p.h b/src/xmlpatterns/data/qdate_p.h
index 7f6e9bd..f8231c9 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 db26a48..8f6bc5a 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 aa4838b..fe928f8 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 fc8bcea..821dbfe 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 0683cc4..3a0d47e 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 752ce9d..cf5bf73 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 4079620..310ae25 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 d794297..16fa5dd 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 21e5e49..ec344a9 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 0b737ba..32cdd57 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 2c5ea10..d73627c 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 cd22d1a..f06419d 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 f829ecd..e27aa94 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 588f040..cd1bdfd 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>
@@ -178,7 +178,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 09e8965..7429863 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 71b95ef..a3e192d 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 0378bf0..f1dc5f0 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 b584ae0..0ed7b9d 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 e63d97d..8b79a62 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 7cc7114..aa5eb55 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 e4ebcf5..5277227 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 0fb24e8..3272bd6 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 a96f13f..483e0e7 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 5ba49a5..67e5306 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/qvaluefactory_p.h b/src/xmlpatterns/data/qvaluefactory_p.h
index c15e188..1141c43 100644
--- a/src/xmlpatterns/data/qvaluefactory_p.h
+++ b/src/xmlpatterns/data/qvaluefactory_p.h
@@ -69,7 +69,7 @@ namespace QPatternist
      * high-level API.
      *
      * @see CastingPlatform
-     * @author Frans Englich <fenglich@trolltech.com>
+     * @author Frans Englich <frans.englich@nokia.com>
      * @ingroup Patternist_schema
      */
     class ValueFactory
diff --git a/src/xmlpatterns/data/qyearmonthduration_p.h b/src/xmlpatterns/data/qyearmonthduration_p.h
index 917c368..e4cc006 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