diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-13 07:24:47 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-13 08:27:51 (GMT) |
| commit | 13cbcc0ddca0fdd5be9ede09052d31785c1e4d55 (patch) | |
| tree | b647be5699145ccae1545096aba5c495d96f8eb5 /src/xmlpatterns/expr | |
| parent | 081078137a6fbc85d6be1437f6afc1d60e4f75f9 (diff) | |
| parent | de088b5a7f7b57e568399334667b14bfc9e7b893 (diff) | |
| download | Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.zip Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.gz Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.bz2 | |
Merge commit 'qt/master'
Conflicts:
examples/opengl/samplebuffers/glwidget.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/kernel/qobject.cpp
src/corelib/tools/qsharedpointer.cpp
src/gui/gui.pro
tests/auto/qhttp/tst_qhttp.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
Diffstat (limited to 'src/xmlpatterns/expr')
175 files changed, 275 insertions, 275 deletions
diff --git a/src/xmlpatterns/expr/qandexpression.cpp b/src/xmlpatterns/expr/qandexpression.cpp index 4de51cd..201417f 100644 --- a/src/xmlpatterns/expr/qandexpression.cpp +++ b/src/xmlpatterns/expr/qandexpression.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h index 88d5197..a05ef4b 100644 --- a/src/xmlpatterns/expr/qandexpression_p.h +++ b/src/xmlpatterns/expr/qandexpression_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -68,7 +68,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-logical-expressions">XML Path Language * (XPath) 2.0, 3.6 Logical Expressions</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class AndExpression : public PairContainer diff --git a/src/xmlpatterns/expr/qapplytemplate.cpp b/src/xmlpatterns/expr/qapplytemplate.cpp index cfeda9d..b8e6985 100644 --- a/src/xmlpatterns/expr/qapplytemplate.cpp +++ b/src/xmlpatterns/expr/qapplytemplate.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h index d97788f..dcf9b3f 100644 --- a/src/xmlpatterns/expr/qapplytemplate_p.h +++ b/src/xmlpatterns/expr/qapplytemplate_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -75,7 +75,7 @@ namespace QPatternist * atomic values. * * @since 4.5 - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ApplyTemplate : public TemplateInvoker diff --git a/src/xmlpatterns/expr/qargumentreference.cpp b/src/xmlpatterns/expr/qargumentreference.cpp index c88e912..fe71d58 100644 --- a/src/xmlpatterns/expr/qargumentreference.cpp +++ b/src/xmlpatterns/expr/qargumentreference.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h index ab9a5e8..36909b0 100644 --- a/src/xmlpatterns/expr/qargumentreference_p.h +++ b/src/xmlpatterns/expr/qargumentreference_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * This is in other words a variable reference in side a function * body, that references a function argument. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ArgumentReference : public VariableReference diff --git a/src/xmlpatterns/expr/qarithmeticexpression.cpp b/src/xmlpatterns/expr/qarithmeticexpression.cpp index 7203d40..e9fb55c 100644 --- a/src/xmlpatterns/expr/qarithmeticexpression.cpp +++ b/src/xmlpatterns/expr/qarithmeticexpression.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -89,7 +89,7 @@ Item ArithmeticExpression::evaluateSingleton(const DynamicContext::Ptr &context) * evaluates to an invalid representation for @c xs:double. * * @since 4.5 - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class DelegatingReflectionExpression : public Literal { diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h index be929b3..1a30b80 100644 --- a/src/xmlpatterns/expr/qarithmeticexpression_p.h +++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -72,7 +72,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-arithmetic">XML Path Language * (XPath) 2.0, 3.4 Arithmetic Expressions</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Q_AUTOTEST_EXPORT ArithmeticExpression : public PairContainer diff --git a/src/xmlpatterns/expr/qattributeconstructor.cpp b/src/xmlpatterns/expr/qattributeconstructor.cpp index acdd2d2..85323bd 100644 --- a/src/xmlpatterns/expr/qattributeconstructor.cpp +++ b/src/xmlpatterns/expr/qattributeconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h index 2c8ec89..980b2b8 100644 --- a/src/xmlpatterns/expr/qattributeconstructor_p.h +++ b/src/xmlpatterns/expr/qattributeconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery * 1.0: An XML Query Language, 3.7 Constructors</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class AttributeConstructor : public PairContainer diff --git a/src/xmlpatterns/expr/qattributenamevalidator.cpp b/src/xmlpatterns/expr/qattributenamevalidator.cpp index d6a956e..3d3bae5 100644 --- a/src/xmlpatterns/expr/qattributenamevalidator.cpp +++ b/src/xmlpatterns/expr/qattributenamevalidator.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h index b26e8e6..afff425 100644 --- a/src/xmlpatterns/expr/qattributenamevalidator_p.h +++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -69,7 +69,7 @@ namespace QPatternist * space is an @c NCName. The atomic value can be of any string type, such as @c xs:untypedAtomic * of @c xs:string. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class AttributeNameValidator : public SingleContainer diff --git a/src/xmlpatterns/expr/qaxisstep.cpp b/src/xmlpatterns/expr/qaxisstep.cpp index 8eb2a21..59aaf9f 100644 --- a/src/xmlpatterns/expr/qaxisstep.cpp +++ b/src/xmlpatterns/expr/qaxisstep.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h index 97c7e48..e22417d 100644 --- a/src/xmlpatterns/expr/qaxisstep_p.h +++ b/src/xmlpatterns/expr/qaxisstep_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist * @short A step in a path expression that with an axis and a node test evaluates * to a sequence of nodes from the context item. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Q_AUTOTEST_EXPORT AxisStep : public EmptyContainer diff --git a/src/xmlpatterns/expr/qcachecells_p.h b/src/xmlpatterns/expr/qcachecells_p.h index cc6826f..63027ec 100644 --- a/src/xmlpatterns/expr/qcachecells_p.h +++ b/src/xmlpatterns/expr/qcachecells_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -76,7 +76,7 @@ namespace QPatternist * For instance, it can have a null pointer, the empty sequence, and that * can be the value of its cache. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class ItemCacheCell { @@ -106,7 +106,7 @@ namespace QPatternist * also carried an QAbstractXmlForwardIterator which is the source, such * that it can continue to populate the cache when it runs out. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class ItemSequenceCacheCell { diff --git a/src/xmlpatterns/expr/qcallsite.cpp b/src/xmlpatterns/expr/qcallsite.cpp index 9fcb39f..b3fef1b 100644 --- a/src/xmlpatterns/expr/qcallsite.cpp +++ b/src/xmlpatterns/expr/qcallsite.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcallsite_p.h b/src/xmlpatterns/expr/qcallsite_p.h index 0ff219f..3bb40a7 100644 --- a/src/xmlpatterns/expr/qcallsite_p.h +++ b/src/xmlpatterns/expr/qcallsite_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist * @short Abstract base-class for Expression instances that are callsites * to other components, such as templates or user functions. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions * @since 4.5 */ diff --git a/src/xmlpatterns/expr/qcalltargetdescription.cpp b/src/xmlpatterns/expr/qcalltargetdescription.cpp index db4bb17..844c4f9 100644 --- a/src/xmlpatterns/expr/qcalltargetdescription.cpp +++ b/src/xmlpatterns/expr/qcalltargetdescription.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcalltargetdescription_p.h b/src/xmlpatterns/expr/qcalltargetdescription_p.h index 1c36e4a..3298228 100644 --- a/src/xmlpatterns/expr/qcalltargetdescription_p.h +++ b/src/xmlpatterns/expr/qcalltargetdescription_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -75,7 +75,7 @@ namespace QPatternist * can also be sub-classed which FunctionSignature do. * * @ingroup Patternist_expr - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class Q_AUTOTEST_EXPORT CallTargetDescription : public QSharedData { diff --git a/src/xmlpatterns/expr/qcalltemplate.cpp b/src/xmlpatterns/expr/qcalltemplate.cpp index 4d886b5..877228b 100644 --- a/src/xmlpatterns/expr/qcalltemplate.cpp +++ b/src/xmlpatterns/expr/qcalltemplate.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h index 11ae4fe..def7fe8 100644 --- a/src/xmlpatterns/expr/qcalltemplate_p.h +++ b/src/xmlpatterns/expr/qcalltemplate_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist * @short Implements @c xsl:call-template. * * @since 4.5 - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class CallTemplate : public TemplateInvoker diff --git a/src/xmlpatterns/expr/qcastableas.cpp b/src/xmlpatterns/expr/qcastableas.cpp index 52b2580..596ac4a 100644 --- a/src/xmlpatterns/expr/qcastableas.cpp +++ b/src/xmlpatterns/expr/qcastableas.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h index 14c959a..fb548e5 100644 --- a/src/xmlpatterns/expr/qcastableas_p.h +++ b/src/xmlpatterns/expr/qcastableas_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -67,7 +67,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-castable">XML Path Language * (XPath) 2.0, 3.10.3 Castable</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class CastableAs : public SingleContainer, diff --git a/src/xmlpatterns/expr/qcastas.cpp b/src/xmlpatterns/expr/qcastas.cpp index 9df471c..526e4ec 100644 --- a/src/xmlpatterns/expr/qcastas.cpp +++ b/src/xmlpatterns/expr/qcastas.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h index e5d6f43..a87793f 100644 --- a/src/xmlpatterns/expr/qcastas_p.h +++ b/src/xmlpatterns/expr/qcastas_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -73,7 +73,7 @@ namespace QPatternist * and XPath 2.0 Functions and Operators, 7 Casting</a> * @see <a href="http://www.w3.org/TR/xpath20/#id-cast">XML Path Language * (XPath) 2.0, 3.10.2 Cast</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class CastAs : public SingleContainer, diff --git a/src/xmlpatterns/expr/qcastingplatform.cpp b/src/xmlpatterns/expr/qcastingplatform.cpp index 933d188..c505844 100644 --- a/src/xmlpatterns/expr/qcastingplatform.cpp +++ b/src/xmlpatterns/expr/qcastingplatform.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcastingplatform_p.h b/src/xmlpatterns/expr/qcastingplatform_p.h index 91f4a8c..634b4d4 100644 --- a/src/xmlpatterns/expr/qcastingplatform_p.h +++ b/src/xmlpatterns/expr/qcastingplatform_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -103,7 +103,7 @@ namespace QPatternist * what type it shall cast to. * * @see ValueFactory - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ template<typename TSubClass, const bool issueError> diff --git a/src/xmlpatterns/expr/qcollationchecker.cpp b/src/xmlpatterns/expr/qcollationchecker.cpp index a50b93e..b1cad2a 100644 --- a/src/xmlpatterns/expr/qcollationchecker.cpp +++ b/src/xmlpatterns/expr/qcollationchecker.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h index 8b6f5fb..f7d836a 100644 --- a/src/xmlpatterns/expr/qcollationchecker_p.h +++ b/src/xmlpatterns/expr/qcollationchecker_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -68,7 +68,7 @@ namespace QPatternist * will const-fold as usual, but otherwise will simply pipe through the value of its argument, * if it's a supported collation. Otherwise it raise an error, with code ReportContext::FOCH0002. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class CollationChecker : public SingleContainer diff --git a/src/xmlpatterns/expr/qcombinenodes.cpp b/src/xmlpatterns/expr/qcombinenodes.cpp index 9f6ccbc..acd8cd6 100644 --- a/src/xmlpatterns/expr/qcombinenodes.cpp +++ b/src/xmlpatterns/expr/qcombinenodes.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h index 15f30b3..ed322cf 100644 --- a/src/xmlpatterns/expr/qcombinenodes_p.h +++ b/src/xmlpatterns/expr/qcombinenodes_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xquery/#combining_seq">XQuery 1.0: An XML Query * Language, 3.3.3 Combining QXmlNodeModelIndex Sequences</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Q_AUTOTEST_EXPORT CombineNodes : public PairContainer diff --git a/src/xmlpatterns/expr/qcommentconstructor.cpp b/src/xmlpatterns/expr/qcommentconstructor.cpp index a6759dc..c3418e1 100644 --- a/src/xmlpatterns/expr/qcommentconstructor.cpp +++ b/src/xmlpatterns/expr/qcommentconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h index db849c4..1fcc30a 100644 --- a/src/xmlpatterns/expr/qcommentconstructor_p.h +++ b/src/xmlpatterns/expr/qcommentconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery * 1.0: An XML Query Language, 3.7 Constructors</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class CommentConstructor : public SingleContainer diff --git a/src/xmlpatterns/expr/qcomparisonplatform.cpp b/src/xmlpatterns/expr/qcomparisonplatform.cpp index 97826e9..5e4eb97 100644 --- a/src/xmlpatterns/expr/qcomparisonplatform.cpp +++ b/src/xmlpatterns/expr/qcomparisonplatform.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcomparisonplatform_p.h b/src/xmlpatterns/expr/qcomparisonplatform_p.h index bcfc855..29fb12e 100644 --- a/src/xmlpatterns/expr/qcomparisonplatform_p.h +++ b/src/xmlpatterns/expr/qcomparisonplatform_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp b/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp index 63fb84c..2857cab 100644 --- a/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp +++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h index 26b22b5..93a0e36 100644 --- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -64,7 +64,7 @@ namespace QPatternist * @short Constructs a namespace on an element, and naturally only appears * as a child of ElementConstructor. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions * @since 4.5 */ diff --git a/src/xmlpatterns/expr/qcontextitem.cpp b/src/xmlpatterns/expr/qcontextitem.cpp index a902a59..e084df7 100644 --- a/src/xmlpatterns/expr/qcontextitem.cpp +++ b/src/xmlpatterns/expr/qcontextitem.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h index 3431cb8..bc813d9 100644 --- a/src/xmlpatterns/expr/qcontextitem_p.h +++ b/src/xmlpatterns/expr/qcontextitem_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-context-item-expression">XML Path Language * (XPath) 2.0, 3.1.4 Context Item Expression</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ContextItem : public EmptyContainer diff --git a/src/xmlpatterns/expr/qcopyof.cpp b/src/xmlpatterns/expr/qcopyof.cpp index aff5888..57307a3 100644 --- a/src/xmlpatterns/expr/qcopyof.cpp +++ b/src/xmlpatterns/expr/qcopyof.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h index 97f589e..0cd3c2e 100644 --- a/src/xmlpatterns/expr/qcopyof_p.h +++ b/src/xmlpatterns/expr/qcopyof_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -69,7 +69,7 @@ namespace QPatternist * that's not possible because we're always a child of ElementConstructor, * currently. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class CopyOf : public SingleContainer diff --git a/src/xmlpatterns/expr/qcurrentitemstore.cpp b/src/xmlpatterns/expr/qcurrentitemstore.cpp index 42d0811..4716502 100644 --- a/src/xmlpatterns/expr/qcurrentitemstore.cpp +++ b/src/xmlpatterns/expr/qcurrentitemstore.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h index 9f1d9ff..6a45054 100644 --- a/src/xmlpatterns/expr/qcurrentitemstore_p.h +++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -64,7 +64,7 @@ namespace QPatternist * @short Creates a DynamicContext which provides the focus item for the * function @c fn:current(). * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions * @since 4.5 */ diff --git a/src/xmlpatterns/expr/qdocumentconstructor.cpp b/src/xmlpatterns/expr/qdocumentconstructor.cpp index 70d17fc..49232f3 100644 --- a/src/xmlpatterns/expr/qdocumentconstructor.cpp +++ b/src/xmlpatterns/expr/qdocumentconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h index 575be85..13b0a9f 100644 --- a/src/xmlpatterns/expr/qdocumentconstructor_p.h +++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -68,7 +68,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery * 1.0: An XML Query Language, 3.7 Constructors</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class DocumentConstructor : public SingleContainer diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp b/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp index c09f779..3345064 100644 --- a/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp +++ b/src/xmlpatterns/expr/qdocumentcontentvalidator.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h index 30f87c9..c2db6a6 100644 --- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h +++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -67,7 +67,7 @@ namespace QPatternist * before sending them on to a second QAbstractXmlReceiver. * * @ingroup Patternist_xdm - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @todo Escape data */ class DocumentContentValidator : public QAbstractXmlReceiver diff --git a/src/xmlpatterns/expr/qdynamiccontextstore.cpp b/src/xmlpatterns/expr/qdynamiccontextstore.cpp index f9a6181..ebe634d 100644 --- a/src/xmlpatterns/expr/qdynamiccontextstore.cpp +++ b/src/xmlpatterns/expr/qdynamiccontextstore.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h index 9e358fd..a85ae49 100644 --- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h +++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -64,7 +64,7 @@ namespace QPatternist * @short Evaluates its operand with an assigned DynamicContext, not * the one passed to one of the evaluation functions. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class DynamicContextStore : public SingleContainer diff --git a/src/xmlpatterns/expr/qelementconstructor.cpp b/src/xmlpatterns/expr/qelementconstructor.cpp index de60113..d5f5e1b 100644 --- a/src/xmlpatterns/expr/qelementconstructor.cpp +++ b/src/xmlpatterns/expr/qelementconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h index c16e0b8..99af1ac 100644 --- a/src/xmlpatterns/expr/qelementconstructor_p.h +++ b/src/xmlpatterns/expr/qelementconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -68,7 +68,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery * 1.0: An XML Query Language, 3.7 Constructors</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ElementConstructor : public PairContainer diff --git a/src/xmlpatterns/expr/qemptycontainer.cpp b/src/xmlpatterns/expr/qemptycontainer.cpp index 800ffb8..2f269d4 100644 --- a/src/xmlpatterns/expr/qemptycontainer.cpp +++ b/src/xmlpatterns/expr/qemptycontainer.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h index 0fa9307..43c4e94 100644 --- a/src/xmlpatterns/expr/qemptycontainer_p.h +++ b/src/xmlpatterns/expr/qemptycontainer_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -63,7 +63,7 @@ namespace QPatternist /** * @short Base class for expressions that has no operands. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Q_AUTOTEST_EXPORT EmptyContainer : public Expression diff --git a/src/xmlpatterns/expr/qemptysequence.cpp b/src/xmlpatterns/expr/qemptysequence.cpp index 7782361..50798e5 100644 --- a/src/xmlpatterns/expr/qemptysequence.cpp +++ b/src/xmlpatterns/expr/qemptysequence.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h index 103735a..b5a720d 100644 --- a/src/xmlpatterns/expr/qemptysequence_p.h +++ b/src/xmlpatterns/expr/qemptysequence_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -63,7 +63,7 @@ namespace QPatternist /** * @short Implements the value instance of empty sequence: <tt>()</tt>. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_xdm */ class EmptySequence : public EmptyContainer diff --git a/src/xmlpatterns/expr/qevaluationcache.cpp b/src/xmlpatterns/expr/qevaluationcache.cpp index 32a0e94..07592e1 100644 --- a/src/xmlpatterns/expr/qevaluationcache.cpp +++ b/src/xmlpatterns/expr/qevaluationcache.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h index 8804e1d..e767627 100644 --- a/src/xmlpatterns/expr/qevaluationcache_p.h +++ b/src/xmlpatterns/expr/qevaluationcache_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -89,7 +89,7 @@ namespace QPatternist * variable is only referenced once. In those cases EvaluationCache removes * itself as an optimization; implemented in compress(). * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ template<bool IsForGlobal> diff --git a/src/xmlpatterns/expr/qexpression.cpp b/src/xmlpatterns/expr/qexpression.cpp index 054b3f1..97e3c14 100644 --- a/src/xmlpatterns/expr/qexpression.cpp +++ b/src/xmlpatterns/expr/qexpression.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h index 265e039..edd3382 100644 --- a/src/xmlpatterns/expr/qexpression_p.h +++ b/src/xmlpatterns/expr/qexpression_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -159,7 +159,7 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xquery-xpath-parsing/">Building a Tokenizer * for XPath or XQuery</a> * @see ExpressionFactory - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Q_AUTOTEST_EXPORT Expression : public QSharedData diff --git a/src/xmlpatterns/expr/qexpressiondispatch_p.h b/src/xmlpatterns/expr/qexpressiondispatch_p.h index 034287d..d0e7fcb 100644 --- a/src/xmlpatterns/expr/qexpressiondispatch_p.h +++ b/src/xmlpatterns/expr/qexpressiondispatch_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -143,7 +143,7 @@ namespace QPatternist /** * @ingroup Patternist_expr_dispatch - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class ExpressionVisitorResult : public QSharedData { @@ -155,7 +155,7 @@ namespace QPatternist /** * @ingroup Patternist_expr_dispatch - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class ExpressionVisitor : public QSharedData { diff --git a/src/xmlpatterns/expr/qexpressionfactory.cpp b/src/xmlpatterns/expr/qexpressionfactory.cpp index 0ddf3b1..e5b0055 100644 --- a/src/xmlpatterns/expr/qexpressionfactory.cpp +++ b/src/xmlpatterns/expr/qexpressionfactory.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qexpressionfactory_p.h b/src/xmlpatterns/expr/qexpressionfactory_p.h index f6b6c5f..c93766e 100644 --- a/src/xmlpatterns/expr/qexpressionfactory_p.h +++ b/src/xmlpatterns/expr/qexpressionfactory_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -72,7 +72,7 @@ namespace QPatternist * @short The central entry point for compiling expressions. * * @ingroup Patternist_expressions - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class Q_AUTOTEST_EXPORT ExpressionFactory : public QSharedData { diff --git a/src/xmlpatterns/expr/qexpressionsequence.cpp b/src/xmlpatterns/expr/qexpressionsequence.cpp index dfdaa13..26c8ec6 100644 --- a/src/xmlpatterns/expr/qexpressionsequence.cpp +++ b/src/xmlpatterns/expr/qexpressionsequence.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h index 2c896d5..57259fc 100644 --- a/src/xmlpatterns/expr/qexpressionsequence_p.h +++ b/src/xmlpatterns/expr/qexpressionsequence_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -69,7 +69,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#construct_seq">XML Path Language * (XPath) 2.0, 3.3.1 Constructing Sequences</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ExpressionSequence : public UnlimitedContainer diff --git a/src/xmlpatterns/expr/qexpressionvariablereference.cpp b/src/xmlpatterns/expr/qexpressionvariablereference.cpp index f1ac8fe..1fe092b 100644 --- a/src/xmlpatterns/expr/qexpressionvariablereference.cpp +++ b/src/xmlpatterns/expr/qexpressionvariablereference.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h index 01713ee..e0caded 100644 --- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h +++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -70,7 +70,7 @@ namespace QPatternist * This AST node is only used up until the typeCheck() stage. Therefore it * has no functions for evaluation, such as evaluateSequence(). * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ExpressionVariableReference : public VariableReference diff --git a/src/xmlpatterns/expr/qexternalvariableloader.cpp b/src/xmlpatterns/expr/qexternalvariableloader.cpp index 878740a..4361c40 100644 --- a/src/xmlpatterns/expr/qexternalvariableloader.cpp +++ b/src/xmlpatterns/expr/qexternalvariableloader.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qexternalvariableloader_p.h b/src/xmlpatterns/expr/qexternalvariableloader_p.h index 02ee567..8d85c60 100644 --- a/src/xmlpatterns/expr/qexternalvariableloader_p.h +++ b/src/xmlpatterns/expr/qexternalvariableloader_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -85,7 +85,7 @@ namespace QPatternist * announceExternalVariable() is called. * * @ingroup Patternist_xdm - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class Q_AUTOTEST_EXPORT ExternalVariableLoader : public QSharedData { diff --git a/src/xmlpatterns/expr/qexternalvariablereference.cpp b/src/xmlpatterns/expr/qexternalvariablereference.cpp index 73c0a39..92dc1da 100644 --- a/src/xmlpatterns/expr/qexternalvariablereference.cpp +++ b/src/xmlpatterns/expr/qexternalvariablereference.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h index a97d65c..c54435d 100644 --- a/src/xmlpatterns/expr/qexternalvariablereference_p.h +++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -68,7 +68,7 @@ namespace QPatternist * uses DynamicContext::externalVariableLoader() for retrieving its value, while * a VariableReference sub-class uses slots in the DynamicContext. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ExternalVariableReference : public EmptyContainer diff --git a/src/xmlpatterns/expr/qfirstitempredicate.cpp b/src/xmlpatterns/expr/qfirstitempredicate.cpp index e15bbd2..3c4c41d 100644 --- a/src/xmlpatterns/expr/qfirstitempredicate.cpp +++ b/src/xmlpatterns/expr/qfirstitempredicate.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h index d196e1c..71b1a04 100644 --- a/src/xmlpatterns/expr/qfirstitempredicate_p.h +++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * FirstItemPredicate corresponds exactly to the predicate * in the expression <tt>input[1]</tt>. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class FirstItemPredicate : public SingleContainer diff --git a/src/xmlpatterns/expr/qforclause.cpp b/src/xmlpatterns/expr/qforclause.cpp index 6effa8a..4dcdcd2 100644 --- a/src/xmlpatterns/expr/qforclause.cpp +++ b/src/xmlpatterns/expr/qforclause.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h index 09d288c..0af7eb3 100644 --- a/src/xmlpatterns/expr/qforclause_p.h +++ b/src/xmlpatterns/expr/qforclause_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-for-expressions">XML Path Language * (XPath) 2.0, 3.7 For Expressions</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ForClause : public PairContainer diff --git a/src/xmlpatterns/expr/qgeneralcomparison.cpp b/src/xmlpatterns/expr/qgeneralcomparison.cpp index e21493b..4638575 100644 --- a/src/xmlpatterns/expr/qgeneralcomparison.cpp +++ b/src/xmlpatterns/expr/qgeneralcomparison.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h index 8a91b6c..dab823a 100644 --- a/src/xmlpatterns/expr/qgeneralcomparison_p.h +++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -71,7 +71,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-general-comparisons">XML Path Language * (XPath) 2.0, 3.5.2 General Comparisons</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class GeneralComparison : public PairContainer, diff --git a/src/xmlpatterns/expr/qgenericpredicate.cpp b/src/xmlpatterns/expr/qgenericpredicate.cpp index ccb4640..42a3c7b 100644 --- a/src/xmlpatterns/expr/qgenericpredicate.cpp +++ b/src/xmlpatterns/expr/qgenericpredicate.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h index 0bd4b71..d72b56d 100644 --- a/src/xmlpatterns/expr/qgenericpredicate_p.h +++ b/src/xmlpatterns/expr/qgenericpredicate_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * * @see FirstItemPredicate * @see TruthPredicate - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class GenericPredicate : public PairContainer diff --git a/src/xmlpatterns/expr/qifthenclause.cpp b/src/xmlpatterns/expr/qifthenclause.cpp index 725f02a..40fff8f 100644 --- a/src/xmlpatterns/expr/qifthenclause.cpp +++ b/src/xmlpatterns/expr/qifthenclause.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h index 66ce686..990bece 100644 --- a/src/xmlpatterns/expr/qifthenclause_p.h +++ b/src/xmlpatterns/expr/qifthenclause_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-conditionals">XML Path Language (XPath) 2.0, * 3.8 Conditional Expressions</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class IfThenClause : public TripleContainer diff --git a/src/xmlpatterns/expr/qinstanceof.cpp b/src/xmlpatterns/expr/qinstanceof.cpp index 318abb8..b1ced63 100644 --- a/src/xmlpatterns/expr/qinstanceof.cpp +++ b/src/xmlpatterns/expr/qinstanceof.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h index 5d20cb6..5c35cec 100644 --- a/src/xmlpatterns/expr/qinstanceof_p.h +++ b/src/xmlpatterns/expr/qinstanceof_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-instance-of">XML Path Language (XPath) 2.0, * 3.10.1 Instance Of</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Q_AUTOTEST_EXPORT InstanceOf : public SingleContainer diff --git a/src/xmlpatterns/expr/qletclause.cpp b/src/xmlpatterns/expr/qletclause.cpp index 917d9e6..2209dc1 100644 --- a/src/xmlpatterns/expr/qletclause.cpp +++ b/src/xmlpatterns/expr/qletclause.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h index 281a741..139f45c 100644 --- a/src/xmlpatterns/expr/qletclause_p.h +++ b/src/xmlpatterns/expr/qletclause_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -72,7 +72,7 @@ namespace QPatternist * <tt>return</tt> expression, and the ExpressionVariableReference will * handle the evaluation of the variable. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class LetClause : public PairContainer diff --git a/src/xmlpatterns/expr/qliteral.cpp b/src/xmlpatterns/expr/qliteral.cpp index 5e0fb53..3802363 100644 --- a/src/xmlpatterns/expr/qliteral.cpp +++ b/src/xmlpatterns/expr/qliteral.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h index 40cc032..9936181 100644 --- a/src/xmlpatterns/expr/qliteral_p.h +++ b/src/xmlpatterns/expr/qliteral_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -68,7 +68,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xquery/#id-literals">XQuery 1.0: An XML Query Language, * 3.1.1 Literals</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Literal : public EmptyContainer diff --git a/src/xmlpatterns/expr/qliteralsequence.cpp b/src/xmlpatterns/expr/qliteralsequence.cpp index 4887662..54cfbf5 100644 --- a/src/xmlpatterns/expr/qliteralsequence.cpp +++ b/src/xmlpatterns/expr/qliteralsequence.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h index 20329b3..7e72bf7 100644 --- a/src/xmlpatterns/expr/qliteralsequence_p.h +++ b/src/xmlpatterns/expr/qliteralsequence_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -69,7 +69,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xquery/#id-literals">XQuery 1.0: An XML Query Language, * 3.1.1 Literals</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class LiteralSequence : public EmptyContainer diff --git a/src/xmlpatterns/expr/qnamespaceconstructor.cpp b/src/xmlpatterns/expr/qnamespaceconstructor.cpp index 02354c2..2729005 100644 --- a/src/xmlpatterns/expr/qnamespaceconstructor.cpp +++ b/src/xmlpatterns/expr/qnamespaceconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h index 604d275..a6dd435 100644 --- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -64,7 +64,7 @@ namespace QPatternist * @short Constructs a namespace on an element, and naturally only appears * as a child of ElementConstructor. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class NamespaceConstructor : public EmptyContainer diff --git a/src/xmlpatterns/expr/qncnameconstructor.cpp b/src/xmlpatterns/expr/qncnameconstructor.cpp index c819d9a..deb8dbc 100644 --- a/src/xmlpatterns/expr/qncnameconstructor.cpp +++ b/src/xmlpatterns/expr/qncnameconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h index c3396c7..03382bc 100644 --- a/src/xmlpatterns/expr/qncnameconstructor_p.h +++ b/src/xmlpatterns/expr/qncnameconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -70,7 +70,7 @@ namespace QPatternist * space is an @c NCName. The atomic value can be of any string type, such as @c xs:untypedAtomic * of @c xs:string. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class NCNameConstructor : public SingleContainer diff --git a/src/xmlpatterns/expr/qnodecomparison.cpp b/src/xmlpatterns/expr/qnodecomparison.cpp index d68de17..2ffab1f 100644 --- a/src/xmlpatterns/expr/qnodecomparison.cpp +++ b/src/xmlpatterns/expr/qnodecomparison.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h index 8d020e6..7f2891b 100644 --- a/src/xmlpatterns/expr/qnodecomparison_p.h +++ b/src/xmlpatterns/expr/qnodecomparison_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-node-comparisons">XML Path Language * (XPath) 2.0, 3.5.3 QXmlNodeModelIndex Comparisons</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Q_AUTOTEST_EXPORT NodeComparison : public PairContainer diff --git a/src/xmlpatterns/expr/qnodesort.cpp b/src/xmlpatterns/expr/qnodesort.cpp index bf122c9..f84918d 100644 --- a/src/xmlpatterns/expr/qnodesort.cpp +++ b/src/xmlpatterns/expr/qnodesort.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h index 7f33075..7206461 100644 --- a/src/xmlpatterns/expr/qnodesort_p.h +++ b/src/xmlpatterns/expr/qnodesort_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -64,7 +64,7 @@ namespace QPatternist * @short De-duplicates and sorts in document order the content that its * operand returns. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class NodeSortExpression : public SingleContainer diff --git a/src/xmlpatterns/expr/qoperandsiterator_p.h b/src/xmlpatterns/expr/qoperandsiterator_p.h index 17a9d98..65d1dba 100644 --- a/src/xmlpatterns/expr/qoperandsiterator_p.h +++ b/src/xmlpatterns/expr/qoperandsiterator_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -72,7 +72,7 @@ namespace QPatternist * The order is delivered in a defined way, from left to right and depth * first. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class OperandsIterator { diff --git a/src/xmlpatterns/expr/qoptimizationpasses.cpp b/src/xmlpatterns/expr/qoptimizationpasses.cpp index cdeaef7..09f3d27 100644 --- a/src/xmlpatterns/expr/qoptimizationpasses.cpp +++ b/src/xmlpatterns/expr/qoptimizationpasses.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qoptimizationpasses_p.h b/src/xmlpatterns/expr/qoptimizationpasses_p.h index 7d2d3b1..719773e 100644 --- a/src/xmlpatterns/expr/qoptimizationpasses_p.h +++ b/src/xmlpatterns/expr/qoptimizationpasses_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist /** * @short Contains a set of common OptimizerPass instances. * - * @author Frans englich <fenglich@trolltech.com> + * @author Frans englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ namespace OptimizationPasses @@ -119,7 +119,7 @@ namespace QPatternist * This class is not supposed to be instantiated, but to be used via its init() * function. In fact, this class cannot be instantiated. * - * @author Frans englich <fenglich@trolltech.com> + * @author Frans englich <frans.englich@nokia.com> */ class Coordinator { diff --git a/src/xmlpatterns/expr/qoptimizerblocks.cpp b/src/xmlpatterns/expr/qoptimizerblocks.cpp index d83124d..4b7a7a4 100644 --- a/src/xmlpatterns/expr/qoptimizerblocks.cpp +++ b/src/xmlpatterns/expr/qoptimizerblocks.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h index d33c573..848f087 100644 --- a/src/xmlpatterns/expr/qoptimizerblocks_p.h +++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist /** * @short Identifies Expression instances by their Expression::id(). * - * @author Frans englich <fenglich@trolltech.com> + * @author Frans englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ByIDIdentifier : public ExpressionIdentifier @@ -91,7 +91,7 @@ namespace QPatternist * item type <tt>xs:string</tt>, but returns @c false for a static type involving * <tt>xs:date</tt>. * - * @author Frans englich <fenglich@trolltech.com> + * @author Frans englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class BySequenceTypeIdentifier : public ExpressionIdentifier @@ -114,7 +114,7 @@ namespace QPatternist * @short Determines whether an Expression is a value or general comparison or both, * with a certain operator. * - * @author Frans englich <fenglich@trolltech.com> + * @author Frans englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ComparisonIdentifier : public ExpressionIdentifier @@ -153,7 +153,7 @@ namespace QPatternist * For example IntegerIdentifier(4) would match the former but * not the latter operand in this expression: "4 + 5". * - * @author Frans englich <fenglich@trolltech.com> + * @author Frans englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class IntegerIdentifier : public ExpressionIdentifier @@ -172,7 +172,7 @@ namespace QPatternist * For example BooleanIdentifier(true) would match the former but * not the latter operand in this expression: "true() + false()". * - * @author Frans englich <fenglich@trolltech.com> + * @author Frans englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class BooleanIdentifier : public ExpressionIdentifier @@ -191,7 +191,7 @@ namespace QPatternist * For example, if ByIDCreator() is passed Expression::IDCountFN, create() * will return CountFN instances. * - * @author Frans englich <fenglich@trolltech.com> + * @author Frans englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ByIDCreator : public ExpressionCreator diff --git a/src/xmlpatterns/expr/qoptimizerframework.cpp b/src/xmlpatterns/expr/qoptimizerframework.cpp index e1922fb..38c5ccc 100644 --- a/src/xmlpatterns/expr/qoptimizerframework.cpp +++ b/src/xmlpatterns/expr/qoptimizerframework.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qoptimizerframework_p.h b/src/xmlpatterns/expr/qoptimizerframework_p.h index 3970ea5..d4ba2bd 100644 --- a/src/xmlpatterns/expr/qoptimizerframework_p.h +++ b/src/xmlpatterns/expr/qoptimizerframework_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -73,7 +73,7 @@ namespace QPatternist * This class and sub-classes are never used on their own, * but in cooperation with OptimizationPass. * - * @author Frans englich <fenglich@trolltech.com> + * @author Frans englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ExpressionCreator : public QSharedData @@ -120,7 +120,7 @@ namespace QPatternist * This class and sub-classes are never used on their own, * but in cooperation with OptimizationPass. * - * @author Frans englich <fenglich@trolltech.com> + * @author Frans englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ExpressionIdentifier : public QSharedData @@ -176,7 +176,7 @@ namespace QPatternist * and resultCreator interacts with one another is described in more detail * in the member documentation as well as the classes they are instances of. * - * @author Frans englich <fenglich@trolltech.com> + * @author Frans englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class OptimizationPass : public QSharedData diff --git a/src/xmlpatterns/expr/qorderby.cpp b/src/xmlpatterns/expr/qorderby.cpp index da7ec82..e596db2 100644 --- a/src/xmlpatterns/expr/qorderby.cpp +++ b/src/xmlpatterns/expr/qorderby.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h index c19d56d..ec2b4b9 100644 --- a/src/xmlpatterns/expr/qorderby_p.h +++ b/src/xmlpatterns/expr/qorderby_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -70,7 +70,7 @@ namespace QPatternist * The child of the ForClause is a ReturnOrderBy expression, which collects * the sort keys and values. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class OrderBy : public SingleContainer diff --git a/src/xmlpatterns/expr/qorexpression.cpp b/src/xmlpatterns/expr/qorexpression.cpp index 3bae26d..cb894fe 100644 --- a/src/xmlpatterns/expr/qorexpression.cpp +++ b/src/xmlpatterns/expr/qorexpression.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h index 9a8f902..41df9ff 100644 --- a/src/xmlpatterns/expr/qorexpression_p.h +++ b/src/xmlpatterns/expr/qorexpression_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-logical-expressions">XML Path Language * (XPath) 2.0, 3.6 Logical Expressions</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class OrExpression : public AndExpression diff --git a/src/xmlpatterns/expr/qpaircontainer.cpp b/src/xmlpatterns/expr/qpaircontainer.cpp index 2fd2b63..41102bb 100644 --- a/src/xmlpatterns/expr/qpaircontainer.cpp +++ b/src/xmlpatterns/expr/qpaircontainer.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h index e415253..e9a795a 100644 --- a/src/xmlpatterns/expr/qpaircontainer_p.h +++ b/src/xmlpatterns/expr/qpaircontainer_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -64,7 +64,7 @@ namespace QPatternist /** * @short Base class for expressions that has exactly two operands. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class PairContainer : public Expression diff --git a/src/xmlpatterns/expr/qparentnodeaxis.cpp b/src/xmlpatterns/expr/qparentnodeaxis.cpp index d3b21f6..26144a0 100644 --- a/src/xmlpatterns/expr/qparentnodeaxis.cpp +++ b/src/xmlpatterns/expr/qparentnodeaxis.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h index 3e9200a..e409a11 100644 --- a/src/xmlpatterns/expr/qparentnodeaxis_p.h +++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -69,7 +69,7 @@ namespace QPatternist * line the API it is now gone and hence the node performs exactly the same * as AxisStep. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ParentNodeAxis : public EmptyContainer diff --git a/src/xmlpatterns/expr/qpath.cpp b/src/xmlpatterns/expr/qpath.cpp index e908f36..305666b 100644 --- a/src/xmlpatterns/expr/qpath.cpp +++ b/src/xmlpatterns/expr/qpath.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h index 911fc72..1ff0dda 100644 --- a/src/xmlpatterns/expr/qpath_p.h +++ b/src/xmlpatterns/expr/qpath_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xquery/#id-path-expressions">XQuery 1.0: An * XML Query Language, 3.2 Path Expressions</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Path : public PairContainer diff --git a/src/xmlpatterns/expr/qpositionalvariablereference.cpp b/src/xmlpatterns/expr/qpositionalvariablereference.cpp index d977760..82345bd 100644 --- a/src/xmlpatterns/expr/qpositionalvariablereference.cpp +++ b/src/xmlpatterns/expr/qpositionalvariablereference.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h index e0a1509..26d4b2d 100644 --- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h +++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -64,7 +64,7 @@ namespace QPatternist * @short A reference to an @c at variable, declared with the * <tt>for</tt>-part in XQuery's FLWOR expression. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class PositionalVariableReference : public VariableReference diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp b/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp index 0ff6847..ea350d6 100644 --- a/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp +++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h index bbfa4b1..ebe25c5 100644 --- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h +++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery * 1.0: An XML Query Language, 3.7 Constructors</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ProcessingInstructionConstructor : public PairContainer diff --git a/src/xmlpatterns/expr/qqnameconstructor.cpp b/src/xmlpatterns/expr/qqnameconstructor.cpp index f874476..be9a7b7 100644 --- a/src/xmlpatterns/expr/qqnameconstructor.cpp +++ b/src/xmlpatterns/expr/qqnameconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h index f93942f3..a519205 100644 --- a/src/xmlpatterns/expr/qqnameconstructor_p.h +++ b/src/xmlpatterns/expr/qqnameconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -69,7 +69,7 @@ namespace QPatternist * * @see QQNameValue * @see QXmlUtils - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class QNameConstructor : public SingleContainer diff --git a/src/xmlpatterns/expr/qquantifiedexpression.cpp b/src/xmlpatterns/expr/qquantifiedexpression.cpp index 2482bfe..670fa70 100644 --- a/src/xmlpatterns/expr/qquantifiedexpression.cpp +++ b/src/xmlpatterns/expr/qquantifiedexpression.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h index 49f435c..2e03625 100644 --- a/src/xmlpatterns/expr/qquantifiedexpression_p.h +++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-quantified-expressions">XML Path Language * (XPath) 2.0, 3.9 Quantified Expressions</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Q_AUTOTEST_EXPORT QuantifiedExpression : public PairContainer diff --git a/src/xmlpatterns/expr/qrangeexpression.cpp b/src/xmlpatterns/expr/qrangeexpression.cpp index 8613985..2230c59 100644 --- a/src/xmlpatterns/expr/qrangeexpression.cpp +++ b/src/xmlpatterns/expr/qrangeexpression.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h index 302f387..641a6d0 100644 --- a/src/xmlpatterns/expr/qrangeexpression_p.h +++ b/src/xmlpatterns/expr/qrangeexpression_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -69,7 +69,7 @@ namespace QPatternist * @see <a href="http://www.w3.org/TR/xpath20/#construct_seq">XML Path Language * (XPath) 2.0, 3.3.1 Constructing Sequences</a> * @see RangeIterator - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class RangeExpression : public PairContainer diff --git a/src/xmlpatterns/expr/qrangevariablereference.cpp b/src/xmlpatterns/expr/qrangevariablereference.cpp index e8f4270..1f1aa29 100644 --- a/src/xmlpatterns/expr/qrangevariablereference.cpp +++ b/src/xmlpatterns/expr/qrangevariablereference.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h index e970ba2..8cbf706 100644 --- a/src/xmlpatterns/expr/qrangevariablereference_p.h +++ b/src/xmlpatterns/expr/qrangevariablereference_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -68,7 +68,7 @@ namespace QPatternist * expression provides the binding and iteration. A @c for expression is * a good example. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class RangeVariableReference : public VariableReference diff --git a/src/xmlpatterns/expr/qreturnorderby.cpp b/src/xmlpatterns/expr/qreturnorderby.cpp index ce9c202..1d4a91f 100644 --- a/src/xmlpatterns/expr/qreturnorderby.cpp +++ b/src/xmlpatterns/expr/qreturnorderby.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h index 38033a5..4f5de81 100644 --- a/src/xmlpatterns/expr/qreturnorderby_p.h +++ b/src/xmlpatterns/expr/qreturnorderby_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -67,7 +67,7 @@ namespace QPatternist * ReturnOrderBy evaluates the sort keys and values, and hands it over to * OrderBy, which is an AST ancestor, using SortTuples. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ReturnOrderBy : public UnlimitedContainer diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor.cpp b/src/xmlpatterns/expr/qsimplecontentconstructor.cpp index 8255b9d..c435f52 100644 --- a/src/xmlpatterns/expr/qsimplecontentconstructor.cpp +++ b/src/xmlpatterns/expr/qsimplecontentconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h index b0a64a0..2b393d7 100644 --- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -70,7 +70,7 @@ namespace QPatternist * @see XSLTSimpleContentConstructor * @see <a href="http://www.w3.org/TR/xquery/#id-attributes">XQuery 1.0: * An XML Query Language, 3.7.1.1 Attributes</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class SimpleContentConstructor : public SingleContainer diff --git a/src/xmlpatterns/expr/qsinglecontainer.cpp b/src/xmlpatterns/expr/qsinglecontainer.cpp index e4f2109..fa23887 100644 --- a/src/xmlpatterns/expr/qsinglecontainer.cpp +++ b/src/xmlpatterns/expr/qsinglecontainer.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h index 988094e..6787f89 100644 --- a/src/xmlpatterns/expr/qsinglecontainer_p.h +++ b/src/xmlpatterns/expr/qsinglecontainer_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -63,7 +63,7 @@ namespace QPatternist /** * @short Base class for expressions that has exactly one operand. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class SingleContainer : public Expression diff --git a/src/xmlpatterns/expr/qsourcelocationreflection.cpp b/src/xmlpatterns/expr/qsourcelocationreflection.cpp index 3954f3f..a4dd30c 100644 --- a/src/xmlpatterns/expr/qsourcelocationreflection.cpp +++ b/src/xmlpatterns/expr/qsourcelocationreflection.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h index 0e98c04..e8d7026 100644 --- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h +++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -76,7 +76,7 @@ namespace QPatternist * If sourceLocation() returns a non-null object, it will be used instead * of looking up via actualReflection(). * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Q_AUTOTEST_EXPORT SourceLocationReflection diff --git a/src/xmlpatterns/expr/qstaticbaseuristore.cpp b/src/xmlpatterns/expr/qstaticbaseuristore.cpp index 5169068..6051c61 100644 --- a/src/xmlpatterns/expr/qstaticbaseuristore.cpp +++ b/src/xmlpatterns/expr/qstaticbaseuristore.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h index 34a1610..adfb8f7 100644 --- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h +++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist * used when @c xml:base attributes appears. * * @see StaticBaseURIContext - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions * @since 4.5 */ diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp b/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp index b75c5b7..2d9b88c 100644 --- a/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp +++ b/src/xmlpatterns/expr/qstaticcompatibilitystore.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h index c8f92c6..6704b68 100644 --- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h +++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist * Used for XSL-T 2.0's backwards compatibility mode. * * @see StaticCompatibilityContext - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions * @since 4.5 */ diff --git a/src/xmlpatterns/expr/qtemplate.cpp b/src/xmlpatterns/expr/qtemplate.cpp index da2e999..c25dc40 100644 --- a/src/xmlpatterns/expr/qtemplate.cpp +++ b/src/xmlpatterns/expr/qtemplate.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h index ad2d827..72fd508 100644 --- a/src/xmlpatterns/expr/qtemplate_p.h +++ b/src/xmlpatterns/expr/qtemplate_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -77,7 +77,7 @@ namespace QPatternist * @see TemplateMode * @see TemplatePattern * @see UserFunction - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions * @since 4.5 */ diff --git a/src/xmlpatterns/expr/qtemplateinvoker.cpp b/src/xmlpatterns/expr/qtemplateinvoker.cpp index d518474..9af0f32 100644 --- a/src/xmlpatterns/expr/qtemplateinvoker.cpp +++ b/src/xmlpatterns/expr/qtemplateinvoker.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h index f308759..c946139 100644 --- a/src/xmlpatterns/expr/qtemplateinvoker_p.h +++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -72,7 +72,7 @@ namespace QPatternist * * TemplateInvoker is intended to be sub-classed. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions * @since 4.5 */ diff --git a/src/xmlpatterns/expr/qtemplatemode.cpp b/src/xmlpatterns/expr/qtemplatemode.cpp index 118c5b7..41d8f4b 100644 --- a/src/xmlpatterns/expr/qtemplatemode.cpp +++ b/src/xmlpatterns/expr/qtemplatemode.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qtemplatemode_p.h b/src/xmlpatterns/expr/qtemplatemode_p.h index e270df1..9099694 100644 --- a/src/xmlpatterns/expr/qtemplatemode_p.h +++ b/src/xmlpatterns/expr/qtemplatemode_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -67,7 +67,7 @@ namespace QPatternist * * @see Template * @see TemplatePattern - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions * @since 4.5 */ diff --git a/src/xmlpatterns/expr/qtemplateparameterreference.cpp b/src/xmlpatterns/expr/qtemplateparameterreference.cpp index 64f58fb..4c6af65 100644 --- a/src/xmlpatterns/expr/qtemplateparameterreference.cpp +++ b/src/xmlpatterns/expr/qtemplateparameterreference.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h index 71110f4..45ebf3f 100644 --- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h +++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -63,7 +63,7 @@ namespace QPatternist /** * @short A reference to a template parameter declared with @c xsl:param. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions * @since 4.5 */ diff --git a/src/xmlpatterns/expr/qtemplatepattern_p.h b/src/xmlpatterns/expr/qtemplatepattern_p.h index db0b504..12254df 100644 --- a/src/xmlpatterns/expr/qtemplatepattern_p.h +++ b/src/xmlpatterns/expr/qtemplatepattern_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -69,7 +69,7 @@ namespace QPatternist * * @see TemplateMode * @see Template - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions * @since 4.5 */ diff --git a/src/xmlpatterns/expr/qtextnodeconstructor.cpp b/src/xmlpatterns/expr/qtextnodeconstructor.cpp index ed5484e..5eb324e 100644 --- a/src/xmlpatterns/expr/qtextnodeconstructor.cpp +++ b/src/xmlpatterns/expr/qtextnodeconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h index 9ba78d5..a23e0be 100644 --- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h +++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xquery/#id-constructors">XQuery * 1.0: An XML Query Language, 3.7 Constructors</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class TextNodeConstructor : public SingleContainer diff --git a/src/xmlpatterns/expr/qtreatas.cpp b/src/xmlpatterns/expr/qtreatas.cpp index f5b5ddc..10e26ec 100644 --- a/src/xmlpatterns/expr/qtreatas.cpp +++ b/src/xmlpatterns/expr/qtreatas.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h index 2bfa1dd..116756e 100644 --- a/src/xmlpatterns/expr/qtreatas_p.h +++ b/src/xmlpatterns/expr/qtreatas_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -76,7 +76,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-treat">XML Path Language * (XPath) 2.0, 3.10.5 Treat</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class TreatAs : public SingleContainer diff --git a/src/xmlpatterns/expr/qtriplecontainer.cpp b/src/xmlpatterns/expr/qtriplecontainer.cpp index 0671d99..4689d74 100644 --- a/src/xmlpatterns/expr/qtriplecontainer.cpp +++ b/src/xmlpatterns/expr/qtriplecontainer.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h index fcc8e3c..e09d4d5 100644 --- a/src/xmlpatterns/expr/qtriplecontainer_p.h +++ b/src/xmlpatterns/expr/qtriplecontainer_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -63,7 +63,7 @@ namespace QPatternist /** * @short Base class for expressions that has exactly three operands. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class TripleContainer : public Expression diff --git a/src/xmlpatterns/expr/qtruthpredicate.cpp b/src/xmlpatterns/expr/qtruthpredicate.cpp index d396ed8..1c506cb 100644 --- a/src/xmlpatterns/expr/qtruthpredicate.cpp +++ b/src/xmlpatterns/expr/qtruthpredicate.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h index 031c98a..0dd0c87 100644 --- a/src/xmlpatterns/expr/qtruthpredicate_p.h +++ b/src/xmlpatterns/expr/qtruthpredicate_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -64,7 +64,7 @@ namespace QPatternist * @short A predicate which is optimized for filter expressions that * are of type @c xs:boolean. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class TruthPredicate : public GenericPredicate diff --git a/src/xmlpatterns/expr/qunaryexpression.cpp b/src/xmlpatterns/expr/qunaryexpression.cpp index 362f2d9..cc34649 100644 --- a/src/xmlpatterns/expr/qunaryexpression.cpp +++ b/src/xmlpatterns/expr/qunaryexpression.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h index 2cac2ed..ba7a5ef 100644 --- a/src/xmlpatterns/expr/qunaryexpression_p.h +++ b/src/xmlpatterns/expr/qunaryexpression_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -90,7 +90,7 @@ namespace QPatternist * 2.0 Functions and Operators, 6.2.7 op:numeric-unary-plus</a> * @see <a href="http://www.w3.org/TR/xpath-functions/#func-numeric-unary-minus">XQuery 1.0 and XPath * 2.0 Functions and Operators, 6.2.8 op:numeric-unary-minus</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class UnaryExpression : public ArithmeticExpression diff --git a/src/xmlpatterns/expr/qunlimitedcontainer.cpp b/src/xmlpatterns/expr/qunlimitedcontainer.cpp index e483096..08110f5 100644 --- a/src/xmlpatterns/expr/qunlimitedcontainer.cpp +++ b/src/xmlpatterns/expr/qunlimitedcontainer.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h index afb0200..28908d6 100644 --- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h +++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist /** * @short Base class for expressions that has any amount of operands. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class UnlimitedContainer : public Expression diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference.cpp b/src/xmlpatterns/expr/qunresolvedvariablereference.cpp index d6c3836..be7764a 100644 --- a/src/xmlpatterns/expr/qunresolvedvariablereference.cpp +++ b/src/xmlpatterns/expr/qunresolvedvariablereference.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h index bc569bb..217efe8 100644 --- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h +++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -66,7 +66,7 @@ namespace QPatternist * * This can not appear in XQuery, but can in XSL-T. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions * @since 4.5 */ diff --git a/src/xmlpatterns/expr/quserfunction.cpp b/src/xmlpatterns/expr/quserfunction.cpp index 5761173..285c387 100644 --- a/src/xmlpatterns/expr/quserfunction.cpp +++ b/src/xmlpatterns/expr/quserfunction.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/quserfunction_p.h b/src/xmlpatterns/expr/quserfunction_p.h index e74de03..fa6101a 100644 --- a/src/xmlpatterns/expr/quserfunction_p.h +++ b/src/xmlpatterns/expr/quserfunction_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -71,7 +71,7 @@ namespace QPatternist * * @see UserFunctionCall * @see ArgumentReference - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class UserFunction : public QSharedData diff --git a/src/xmlpatterns/expr/quserfunctioncallsite.cpp b/src/xmlpatterns/expr/quserfunctioncallsite.cpp index fc7d7ac..e600348 100644 --- a/src/xmlpatterns/expr/quserfunctioncallsite.cpp +++ b/src/xmlpatterns/expr/quserfunctioncallsite.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h index bd2b6a0..841cdad 100644 --- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h +++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -72,7 +72,7 @@ namespace QPatternist * * @see UserFunction * @see ArgumentReference - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class UserFunctionCallsite : public CallSite diff --git a/src/xmlpatterns/expr/qvalidate.cpp b/src/xmlpatterns/expr/qvalidate.cpp index 85e3268..a2f26a4 100644 --- a/src/xmlpatterns/expr/qvalidate.cpp +++ b/src/xmlpatterns/expr/qvalidate.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qvalidate_p.h b/src/xmlpatterns/expr/qvalidate_p.h index 055c13b..8f1fb53 100644 --- a/src/xmlpatterns/expr/qvalidate_p.h +++ b/src/xmlpatterns/expr/qvalidate_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -69,7 +69,7 @@ namespace QPatternist * Query Language, 3.13 Validate Expressions</a> * @see <a href="http://www.w3.org/TR/xquery/#id-schema-validation-feature">XQuery 1.0: An * XML Query Language, 5.2.2 Schema Validation Feature</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class Validate diff --git a/src/xmlpatterns/expr/qvaluecomparison.cpp b/src/xmlpatterns/expr/qvaluecomparison.cpp index bb5dc34..727e755 100644 --- a/src/xmlpatterns/expr/qvaluecomparison.cpp +++ b/src/xmlpatterns/expr/qvaluecomparison.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h index 200463e..d5cdb50 100644 --- a/src/xmlpatterns/expr/qvaluecomparison_p.h +++ b/src/xmlpatterns/expr/qvaluecomparison_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -71,7 +71,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xpath20/#id-value-comparisons">XML Path Language * (XPath) 2.0, 3.5.1 Value Comparisons</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class ValueComparison : public PairContainer, diff --git a/src/xmlpatterns/expr/qvariabledeclaration.cpp b/src/xmlpatterns/expr/qvariabledeclaration.cpp index 86c26bb..f3337b3 100644 --- a/src/xmlpatterns/expr/qvariabledeclaration.cpp +++ b/src/xmlpatterns/expr/qvariabledeclaration.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qvariabledeclaration_p.h b/src/xmlpatterns/expr/qvariabledeclaration_p.h index 08ff0a1..9e5d261 100644 --- a/src/xmlpatterns/expr/qvariabledeclaration_p.h +++ b/src/xmlpatterns/expr/qvariabledeclaration_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -71,7 +71,7 @@ namespace QPatternist * the compilation stage. * * @see FunctionArgument - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class VariableDeclaration : public QSharedData diff --git a/src/xmlpatterns/expr/qvariablereference.cpp b/src/xmlpatterns/expr/qvariablereference.cpp index 8ffba29..12d3f5d 100644 --- a/src/xmlpatterns/expr/qvariablereference.cpp +++ b/src/xmlpatterns/expr/qvariablereference.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h index 7b4bfbe..bba3319 100644 --- a/src/xmlpatterns/expr/qvariablereference_p.h +++ b/src/xmlpatterns/expr/qvariablereference_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist /** * @short Baseclass for classes being references to variables. * - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class VariableReference : public EmptyContainer diff --git a/src/xmlpatterns/expr/qwithparam_p.h b/src/xmlpatterns/expr/qwithparam_p.h index 38ee5f9..87c6716 100644 --- a/src/xmlpatterns/expr/qwithparam_p.h +++ b/src/xmlpatterns/expr/qwithparam_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -70,7 +70,7 @@ namespace QPatternist * * @since 4.5 * @ingroup Patternist_expressions - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class WithParam : public FunctionArgument { diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp b/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp index d8b830b..5cfeb97 100644 --- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp +++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h index 595afa6..3f12e28 100644 --- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h +++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -65,7 +65,7 @@ namespace QPatternist * * @see <a href="http://www.w3.org/TR/xslt20/#constructing-simple-content">XSL * Transformations (XSLT) Version 2.0, 5.7.2 Constructing Simple Content</a> - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ class XSLTSimpleContentConstructor : public SimpleContentConstructor |