Update old email address.

Reviewed-by: Trust Me

51 files changed, 130 insertions, 130 deletions

diff --git a/src/xmlpatterns/functions/qaccessorfns_p.h b/src/xmlpatterns/functions/qaccessorfns_p.h
index babbac9..8851a79 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 81ab617..bcb0dc9 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 f3f7373..79f2697 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 4e54bfd..07ec969 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 5200360..b37781f 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 5de0c7f..38fea80 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 e7290ac..aea7953 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 d7307d8..2bb59fb 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 d0253ae..ce505ac 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 c1c7c92..9ca7d4e 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 b538a5d..fa02057 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 7053ef0..841aa43 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 1c56d9b..ddb787c 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 55b1fa3..d543ddc 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 1b36d26..0a5b73ba 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 d965e3c..43c5c43 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 2510984..f8716da 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 96d48c3..b806c1d 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 476311a..a5baa04 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 ed6fe6f..748c32d 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 764bfde..1596432 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 e704f81..56f92fa 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 1df21eb..7cb7c73 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 252710a..5cab72c 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 f85ddbe..d6c582a 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 a607a78..affd722 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 5de5b50..17271c7 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 3631c66..506249b 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 6753e88..87cbec9 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 1d6c0a9..89318ea 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 5c45b12..14bc0f2 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 39f17dc..7347212 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 467718b..77aa102 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 64e852a..d760128 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 25b8085..e8f834a 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 1bb59be..e70ef00 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 0650071..ceeb0ff 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 3672d78..1376fdf 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 aa537c7..c2d4fac 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 5a6c494..989f953 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 4ea3f40..dae1eda8 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 b9c9098..0e6e911 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 efffaa1..6e786d3 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 ed7f340..f5cbfc0 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 fb084c9..8cb390d 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 1af3a67..e569d6f 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 357f7ff..e77845c 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 34dafa5..ab9cdb2 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 b1dad6b..03994b6 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 9dc1a47..e4f85ea 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 b1caccc..90ce2f0 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
      */