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/functions/qsequencefns_p.h | |
| 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/functions/qsequencefns_p.h')
| -rw-r--r-- | src/xmlpatterns/functions/qsequencefns_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h index 73c1adc..18d2806 100644 --- a/src/xmlpatterns/functions/qsequencefns_p.h +++ b/src/xmlpatterns/functions/qsequencefns_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$ ** ****************************************************************************/ @@ -79,7 +79,7 @@ namespace QPatternist * * @see EBVExtractor * @ingroup Patternist_functions - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class BooleanFN : public FunctionCall { @@ -99,7 +99,7 @@ namespace QPatternist * @short Implements the function <tt>fn:index-of()</tt>. * * @ingroup Patternist_functions - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class IndexOfFN : public FunctionCall, public ComparisonPlatform<IndexOfFN, false> @@ -126,7 +126,7 @@ namespace QPatternist * by instantiating it with either IDExistsFN or IDEmptyFN. * * @ingroup Patternist_functions - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ template<const Expression::ID Id> class Existence : public FunctionCall @@ -194,7 +194,7 @@ namespace QPatternist * @short Implements the function <tt>fn:distinct-values()</tt>. * * @ingroup Patternist_functions - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class DistinctValuesFN : public FunctionCall, public ComparisonPlatform<IndexOfFN, false> @@ -234,7 +234,7 @@ namespace QPatternist * @todo docs, explain why evaluateSequence and evaluateSingleton is implemented * * @ingroup Patternist_functions - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class InsertBeforeFN : public FunctionCall { @@ -258,7 +258,7 @@ namespace QPatternist * @short Implements the function <tt>fn:remove()</tt>. * * @ingroup Patternist_functions - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class RemoveFN : public FunctionCall { @@ -285,7 +285,7 @@ namespace QPatternist * @short Implements the function <tt>fn:reverse()</tt>. * * @ingroup Patternist_functions - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> */ class ReverseFN : public FunctionCall { @@ -313,7 +313,7 @@ statEnv |- (FN-URI,"reverse")(Type) : prime(Type) * quantifier(Type) * @short Implements the function <tt>fn:subsequence()</tt>. * * @ingroup Patternist_functions - * @author Frans Englich <fenglich@trolltech.com> + * @author Frans Englich <frans.englich@nokia.com> * @todo Type inference can be made stronger for this function */ class SubsequenceFN : public FunctionCall |