summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-12 08:36:02 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-12 08:36:02 (GMT)
commit2d00cfe51ca07a934c4f172d0131156190a9b6e1 (patch)
tree635fed128ecf3271f50547eebf3432d67a22cf46 /src
parent0cd421df59a25c5c3395d5e12c0a5842dc035ed0 (diff)
downloadQt-2d00cfe51ca07a934c4f172d0131156190a9b6e1.zip
Qt-2d00cfe51ca07a934c4f172d0131156190a9b6e1.tar.gz
Qt-2d00cfe51ca07a934c4f172d0131156190a9b6e1.tar.bz2
Replace "Trolltech" with more appropriate terms.
Reviewed-by: Trust Me
Diffstat (limited to 'src')
-rw-r--r--src/plugins/codecs/jp/qeucjpcodec.cpp2
-rw-r--r--src/plugins/codecs/jp/qsjiscodec.cpp2
-rw-r--r--src/xmlpatterns/data/qitem_p.h1
-rw-r--r--src/xmlpatterns/environment/createReportContext.xsl2
-rw-r--r--src/xmlpatterns/functions/qpatternplatform.cpp2
5 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/codecs/jp/qeucjpcodec.cpp b/src/plugins/codecs/jp/qeucjpcodec.cpp
index d7aaf7f..19b259c 100644
--- a/src/plugins/codecs/jp/qeucjpcodec.cpp
+++ b/src/plugins/codecs/jp/qeucjpcodec.cpp
@@ -41,7 +41,7 @@
// Most of the code here was originally written by Serika Kurusugawa
// a.k.a. Junji Takagi, and is included in Qt with the author's permission,
-// and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the Qt team.
/*! \class QEucJpCodec
\reentrant
diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp
index dafb4b3..d818ba7 100644
--- a/src/plugins/codecs/jp/qsjiscodec.cpp
+++ b/src/plugins/codecs/jp/qsjiscodec.cpp
@@ -41,7 +41,7 @@
// Most of the code here was originally written by Serika Kurusugawa
// a.k.a. Junji Takagi, and is included in Qt with the author's permission,
-// and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the Qt team.
/*! \class QSjisCodec
\reentrant
diff --git a/src/xmlpatterns/data/qitem_p.h b/src/xmlpatterns/data/qitem_p.h
index cd1bdfd..9959138 100644
--- a/src/xmlpatterns/data/qitem_p.h
+++ b/src/xmlpatterns/data/qitem_p.h
@@ -70,7 +70,6 @@
/**
* @class QSharedData
* @short Qt's base class for reference counting.
- * @author Trolltech
*/
QT_BEGIN_HEADER
diff --git a/src/xmlpatterns/environment/createReportContext.xsl b/src/xmlpatterns/environment/createReportContext.xsl
index 9498e89..f7be471 100644
--- a/src/xmlpatterns/environment/createReportContext.xsl
+++ b/src/xmlpatterns/environment/createReportContext.xsl
@@ -5,7 +5,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Patternist project on Trolltech Labs.
+** This file is part of the Patternist project on Qt Labs.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
diff --git a/src/xmlpatterns/functions/qpatternplatform.cpp b/src/xmlpatterns/functions/qpatternplatform.cpp
index 9d54ca7..8241a5e 100644
--- a/src/xmlpatterns/functions/qpatternplatform.cpp
+++ b/src/xmlpatterns/functions/qpatternplatform.cpp
@@ -183,7 +183,7 @@ QRegExp PatternPlatform::parsePattern(const QString &patternP,
patternP == QLatin1String("(.)\\2"))
{
context->error(QLatin1String("We don't want to hang infinitely on K2-MatchesFunc-9, "
- "10 and 11. See Trolltech task 148505."),
+ "10 and 11."),
ReportContext::FOER0000, location);
return QRegExp();
}