summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns/iterators
diff options
context:
space:
mode:
Diffstat (limited to 'src/xmlpatterns/iterators')
-rw-r--r--src/xmlpatterns/iterators/qcachingiterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qcachingiterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qdeduplicateiterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qdeduplicateiterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qdistinctiterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qdistinctiterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qemptyiterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qexceptiterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qexceptiterator_p.h2
-rw-r--r--src/xmlpatterns/iterators/qindexofiterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qindexofiterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qinsertioniterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qinsertioniterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qintersectiterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qintersectiterator_p.h2
-rw-r--r--src/xmlpatterns/iterators/qitemmappingiterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qrangeiterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qrangeiterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qremovaliterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qremovaliterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qsequencemappingiterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qsingletoniterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qsubsequenceiterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qsubsequenceiterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qtocodepointsiterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qtocodepointsiterator_p.h4
-rw-r--r--src/xmlpatterns/iterators/qunioniterator.cpp2
-rw-r--r--src/xmlpatterns/iterators/qunioniterator_p.h2
28 files changed, 41 insertions, 41 deletions
diff --git a/src/xmlpatterns/iterators/qcachingiterator.cpp b/src/xmlpatterns/iterators/qcachingiterator.cpp
index b0f556a47..1da101d36 100644
--- a/src/xmlpatterns/iterators/qcachingiterator.cpp
+++ b/src/xmlpatterns/iterators/qcachingiterator.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/iterators/qcachingiterator_p.h b/src/xmlpatterns/iterators/qcachingiterator_p.h
index e848544d2..deca4dd29 100644
--- a/src/xmlpatterns/iterators/qcachingiterator_p.h
+++ b/src/xmlpatterns/iterators/qcachingiterator_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
* which case it continues to populate the cache as well as deliver on its
* own from a source QAbstractXmlForwardIterator.
*
- * @author Frans Englich <frans.fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
*/
class CachingIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator.cpp b/src/xmlpatterns/iterators/qdeduplicateiterator.cpp
index 899b20e6f..c5b1552b9 100644
--- a/src/xmlpatterns/iterators/qdeduplicateiterator.cpp
+++ b/src/xmlpatterns/iterators/qdeduplicateiterator.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/iterators/qdeduplicateiterator_p.h b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
index 2ed4646df..4d27b426f 100644
--- a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
+++ b/src/xmlpatterns/iterators/qdeduplicateiterator_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
*
* @note The nodes in the source list must be in document order.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
*/
class DeduplicateIterator : public ListIterator<Item>
diff --git a/src/xmlpatterns/iterators/qdistinctiterator.cpp b/src/xmlpatterns/iterators/qdistinctiterator.cpp
index 68e92c653..50e9859cb 100644
--- a/src/xmlpatterns/iterators/qdistinctiterator.cpp
+++ b/src/xmlpatterns/iterators/qdistinctiterator.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/iterators/qdistinctiterator_p.h b/src/xmlpatterns/iterators/qdistinctiterator_p.h
index ac10ab1ca..acbc14abb 100644
--- a/src/xmlpatterns/iterators/qdistinctiterator_p.h
+++ b/src/xmlpatterns/iterators/qdistinctiterator_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 <a href="http://www.w3.org/TR/xpath-functions/#func-distinct-values">XQuery 1.0
* and XPath 2.0 Functions and Operators, 15.1.6 fn:distinct-values</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
*/
class DistinctIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qemptyiterator_p.h b/src/xmlpatterns/iterators/qemptyiterator_p.h
index 53af921e7..ebc20f607 100644
--- a/src/xmlpatterns/iterators/qemptyiterator_p.h
+++ b/src/xmlpatterns/iterators/qemptyiterator_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
*
* EmptyIterator's constructor is protected, instances is retrieved from CommonValues.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
*/
template<typename T> class EmptyIterator : public QAbstractXmlForwardIterator<T>
diff --git a/src/xmlpatterns/iterators/qexceptiterator.cpp b/src/xmlpatterns/iterators/qexceptiterator.cpp
index 1347f3647..ec24ac5c6 100644
--- a/src/xmlpatterns/iterators/qexceptiterator.cpp
+++ b/src/xmlpatterns/iterators/qexceptiterator.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/iterators/qexceptiterator_p.h b/src/xmlpatterns/iterators/qexceptiterator_p.h
index af459fa61..d4f5df27b 100644
--- a/src/xmlpatterns/iterators/qexceptiterator_p.h
+++ b/src/xmlpatterns/iterators/qexceptiterator_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/iterators/qindexofiterator.cpp b/src/xmlpatterns/iterators/qindexofiterator.cpp
index 5522e8fec..f579aeecf 100644
--- a/src/xmlpatterns/iterators/qindexofiterator.cpp
+++ b/src/xmlpatterns/iterators/qindexofiterator.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/iterators/qindexofiterator_p.h b/src/xmlpatterns/iterators/qindexofiterator_p.h
index fc0420783..ba2a97e70 100644
--- a/src/xmlpatterns/iterators/qindexofiterator_p.h
+++ b/src/xmlpatterns/iterators/qindexofiterator_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 <a href="http://www.w3.org/TR/xpath-functions/#func-index-of">XQuery 1.0
* and XPath 2.0 Functions and Operators, 15.1.3 fn:index-of</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
*/
class IndexOfIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qinsertioniterator.cpp b/src/xmlpatterns/iterators/qinsertioniterator.cpp
index 5f64026d7..964f02507 100644
--- a/src/xmlpatterns/iterators/qinsertioniterator.cpp
+++ b/src/xmlpatterns/iterators/qinsertioniterator.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/iterators/qinsertioniterator_p.h b/src/xmlpatterns/iterators/qinsertioniterator_p.h
index 63fa2d4f9..5da56ba74 100644
--- a/src/xmlpatterns/iterators/qinsertioniterator_p.h
+++ b/src/xmlpatterns/iterators/qinsertioniterator_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
*
* @see <a href="http://www.w3.org/TR/xpath-functions/#func-insert-before">XQuery 1.0
* and XPath 2.0 Functions and Operators, 15.1.7 fn:insert-before</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
*/
class InsertionIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qintersectiterator.cpp b/src/xmlpatterns/iterators/qintersectiterator.cpp
index 94347bba4..92562f5a8 100644
--- a/src/xmlpatterns/iterators/qintersectiterator.cpp
+++ b/src/xmlpatterns/iterators/qintersectiterator.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/iterators/qintersectiterator_p.h b/src/xmlpatterns/iterators/qintersectiterator_p.h
index 3069cf941..8aaeab4a5 100644
--- a/src/xmlpatterns/iterators/qintersectiterator_p.h
+++ b/src/xmlpatterns/iterators/qintersectiterator_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/iterators/qitemmappingiterator_p.h b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
index 859c745a3..c3adda58a 100644
--- a/src/xmlpatterns/iterators/qitemmappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qitemmappingiterator_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
* Declaring the mapToItem() function as inline, can be a good way to improve performance.
*
* @see SequenceMappingIterator
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
*/
template<typename TResult, typename TSource, typename TMapper, typename Context = DynamicContext::Ptr>
diff --git a/src/xmlpatterns/iterators/qrangeiterator.cpp b/src/xmlpatterns/iterators/qrangeiterator.cpp
index 3c2f64855..076b1ba7c 100644
--- a/src/xmlpatterns/iterators/qrangeiterator.cpp
+++ b/src/xmlpatterns/iterators/qrangeiterator.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/iterators/qrangeiterator_p.h b/src/xmlpatterns/iterators/qrangeiterator_p.h
index 8dc9b3e1f..729023b2c 100644
--- a/src/xmlpatterns/iterators/qrangeiterator_p.h
+++ b/src/xmlpatterns/iterators/qrangeiterator_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/\#doc-xpath-RangeExpr">XML Path Language
* (XPath) 2.0, 3.3 Sequence Expressions, RangeExpr</a>
* @see RangeExpression
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
* @todo Documentation is missing
*/
diff --git a/src/xmlpatterns/iterators/qremovaliterator.cpp b/src/xmlpatterns/iterators/qremovaliterator.cpp
index 1fad4ff16..d2c20e81e 100644
--- a/src/xmlpatterns/iterators/qremovaliterator.cpp
+++ b/src/xmlpatterns/iterators/qremovaliterator.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/iterators/qremovaliterator_p.h b/src/xmlpatterns/iterators/qremovaliterator_p.h
index 2e74cf0ee..a4cd9909c 100644
--- a/src/xmlpatterns/iterators/qremovaliterator_p.h
+++ b/src/xmlpatterns/iterators/qremovaliterator_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 <a href="http://www.w3.org/TR/xpath-functions/#func-remove">XQuery 1.0
* and XPath 2.0 Functions and Operators, 15.1.8 fn:remove</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
*/
class RemovalIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
index 02ff5e5a0..801f8ceec 100644
--- a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qsequencemappingiterator_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$
**
****************************************************************************/
@@ -81,7 +81,7 @@ namespace QPatternist
* const DynamicContext::Ptr &context) const;
* @endcode
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @see ItemMappingIterator
* @ingroup Patternist_iterators
*/
diff --git a/src/xmlpatterns/iterators/qsingletoniterator_p.h b/src/xmlpatterns/iterators/qsingletoniterator_p.h
index a02f28ef9..a7d57562c 100644
--- a/src/xmlpatterns/iterators/qsingletoniterator_p.h
+++ b/src/xmlpatterns/iterators/qsingletoniterator_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
*
* Having to represent single items in Iterators is relatively common.
*
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
*/
template<typename T>
diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator.cpp b/src/xmlpatterns/iterators/qsubsequenceiterator.cpp
index f1ebf1f30..6421d72fa 100644
--- a/src/xmlpatterns/iterators/qsubsequenceiterator.cpp
+++ b/src/xmlpatterns/iterators/qsubsequenceiterator.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/iterators/qsubsequenceiterator_p.h b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
index 635a1a201..2cf9797a7 100644
--- a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
+++ b/src/xmlpatterns/iterators/qsubsequenceiterator_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
*
* @see <a href="http://www.w3.org/TR/xpath-functions/#func-subsequence">XQuery 1.0
* and XPath 2.0 Functions and Operators, 15.1.10 fn:subsequence</a>
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
*/
class SubsequenceIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator.cpp b/src/xmlpatterns/iterators/qtocodepointsiterator.cpp
index a8b39c219..340d66bb6 100644
--- a/src/xmlpatterns/iterators/qtocodepointsiterator.cpp
+++ b/src/xmlpatterns/iterators/qtocodepointsiterator.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/iterators/qtocodepointsiterator_p.h b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
index 56cf132fe..5ca909bd8 100644
--- a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
+++ b/src/xmlpatterns/iterators/qtocodepointsiterator_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/xpath-functions/#func-string-to-codepoints">XQuery 1.0
* and XPath 2.0 Functions and Operators, 7.2.2 fn:string-to-codepoints</a>
* @see StringToCodepointsFN
- * @author Frans Englich <fenglich@trolltech.com>
+ * @author Frans Englich <frans.englich@nokia.com>
* @ingroup Patternist_iterators
*/
class ToCodepointsIterator : public Item::Iterator
diff --git a/src/xmlpatterns/iterators/qunioniterator.cpp b/src/xmlpatterns/iterators/qunioniterator.cpp
index 2e34d97f5..46274628d 100644
--- a/src/xmlpatterns/iterators/qunioniterator.cpp
+++ b/src/xmlpatterns/iterators/qunioniterator.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/iterators/qunioniterator_p.h b/src/xmlpatterns/iterators/qunioniterator_p.h
index f3ae3ca85..18b6d433a 100644
--- a/src/xmlpatterns/iterators/qunioniterator_p.h
+++ b/src/xmlpatterns/iterators/qunioniterator_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$
**
****************************************************************************/