summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/codecs/qtsciicodec.cpp2
-rw-r--r--src/corelib/codecs/qtsciicodec_p.h2
-rw-r--r--src/corelib/global/qglobal.h2
-rw-r--r--src/gui/itemviews/qdatawidgetmapper.cpp22
-rw-r--r--src/gui/kernel/qmotifdnd_x11.cpp2
-rw-r--r--src/gui/kernel/qwidget_mac.mm2
-rw-r--r--src/gui/text/qfontengine_p.h2
-rw-r--r--src/network/access/qftp.cpp2
-rw-r--r--src/network/ssl/qsslconfiguration.h2
-rw-r--r--src/network/ssl/qsslconfiguration_p.h2
-rw-r--r--src/plugins/codecs/jp/qeucjpcodec.h2
-rw-r--r--src/plugins/codecs/jp/qjiscodec.h2
-rw-r--r--src/plugins/codecs/jp/qjpunicode.h2
-rw-r--r--src/plugins/codecs/jp/qsjiscodec.h2
-rw-r--r--src/plugins/codecs/kr/qeuckrcodec.cpp2
-rw-r--r--src/plugins/codecs/tw/qbig5codec.h2
-rw-r--r--src/qt3support/network/q3ftp.cpp2
17 files changed, 27 insertions, 27 deletions
diff --git a/src/corelib/codecs/qtsciicodec.cpp b/src/corelib/codecs/qtsciicodec.cpp
index 81addde..65367d5 100644
--- a/src/corelib/codecs/qtsciicodec.cpp
+++ b/src/corelib/codecs/qtsciicodec.cpp
@@ -41,7 +41,7 @@
// Most of the code here was originally written by Hans Petter Bieker,
// and is included in Qt with the author's permission, and the grateful
-// thanks of the Trolltech team.
+// thanks of the Qt team.
#include "qtsciicodec_p.h"
#include "qlist.h"
diff --git a/src/corelib/codecs/qtsciicodec_p.h b/src/corelib/codecs/qtsciicodec_p.h
index 42beb44..190d496 100644
--- a/src/corelib/codecs/qtsciicodec_p.h
+++ b/src/corelib/codecs/qtsciicodec_p.h
@@ -41,7 +41,7 @@
// Most of the code here was originally written by Hans Petter Bieker,
// and is included in Qt with the author's permission, and the grateful
-// thanks of the Trolltech team.
+// thanks of the Qt team.
/*
* Copyright (C) 2000 Hans Petter Bieker. All rights reserved.
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 7081d2f..7076a1e 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1292,7 +1292,7 @@ class QDataStream;
/*
No, this is not an evil backdoor. QT_BUILD_INTERNAL just exports more symbols
- for Trolltech's internal unit tests. If you want slower loading times and more
+ for Qt's internal unit tests. If you want slower loading times and more
symbols that can vanish from version to version, feel free to define QT_BUILD_INTERNAL.
*/
#if defined(QT_BUILD_INTERNAL) && defined(Q_OS_WIN) && defined(QT_MAKEDLL)
diff --git a/src/gui/itemviews/qdatawidgetmapper.cpp b/src/gui/itemviews/qdatawidgetmapper.cpp
index 8b5ba3b..4a8db9e 100644
--- a/src/gui/itemviews/qdatawidgetmapper.cpp
+++ b/src/gui/itemviews/qdatawidgetmapper.cpp
@@ -278,11 +278,11 @@ void QDataWidgetMapperPrivate::_q_modelDestroyed()
Let us assume that we have an item model named \c{model} with the following contents:
\table
- \row \o 1 \o Nokia Corporation and/or its subsidiary(-ies) \o Oslo
- \row \o 2 \o Trolltech Pty \o Brisbane
- \row \o 3 \o Trolltech Inc \o Palo Alto
- \row \o 4 \o Trolltech China \o Beijing
- \row \o 5 \o Trolltech GmbH \o Berlin
+ \row \o 1 \o Qt Norway \o Oslo
+ \row \o 2 \o Qt Australia \o Brisbane
+ \row \o 3 \o Qt USA \o Palo Alto
+ \row \o 4 \o Qt China \o Beijing
+ \row \o 5 \o Qt Germany \o Berlin
\endtable
The following code will map the columns of the model to widgets called \c mySpinBox,
@@ -780,11 +780,11 @@ void QDataWidgetMapper::clearMapping()
Use Qt::Horizontal for tabular data that looks like this:
\table
- \row \o 1 \o Nokia Corporation and/or its subsidiary(-ies) \o Oslo
- \row \o 2 \o Trolltech Pty \o Brisbane
- \row \o 3 \o Trolltech Inc \o Silicon Valley
- \row \o 4 \o Trolltech China \o Beijing
- \row \o 5 \o Trolltech GmbH \o Berlin
+ \row \o 1 \o Qt Norway \o Oslo
+ \row \o 2 \o Qt Australia \o Brisbane
+ \row \o 3 \o Qt USA \o Silicon Valley
+ \row \o 4 \o Qt China \o Beijing
+ \row \o 5 \o Qt Germany \o Berlin
\endtable
If the orientation is set to Qt::Vertical, a widget is mapped to
@@ -796,7 +796,7 @@ void QDataWidgetMapper::clearMapping()
\table
\row \o 1 \o 2 \o 3 \o 4 \o 5
- \row \o Nokia Corporation and/or its subsidiary(-ies) \o Trolltech Pty \o Trolltech Inc \o Trolltech China \o Trolltech GmbH
+ \row \o Qt Norway \o Qt Australia \o Qt USA \o Qt China \o Qt Germany
\row \o Oslo \o Brisbane \o Silicon Valley \o Beijing \i Berlin
\endtable
diff --git a/src/gui/kernel/qmotifdnd_x11.cpp b/src/gui/kernel/qmotifdnd_x11.cpp
index 10c4e48..d180ecc 100644
--- a/src/gui/kernel/qmotifdnd_x11.cpp
+++ b/src/gui/kernel/qmotifdnd_x11.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
/* The following copyright notice pertains to the code as contributed
-to Trolltech, not to Trolltech's modifications. It is replicated
+to Qt, not to Nokia's modifications. It is replicated
in doc/dnd.doc, where the documentation system can see it. */
/* Copyright 1996 Daniel Dardailler.
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 36d6ff6..48a4bc3 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -2245,7 +2245,7 @@ void QWidgetPrivate::createWindow_sys()
OSWindowRef windowRef = qt_mac_create_window(q, topExtra->wclass, wattr, data.crect);
if (windowRef == 0)
- qWarning("QWidget: Internal error: %s:%d: If you reach this error please contact Trolltech and include the\n"
+ qWarning("QWidget: Internal error: %s:%d: If you reach this error please contact Qt Support and include the\n"
" WidgetFlags used in creating the widget.", __FILE__, __LINE__);
#ifndef QT_MAC_USE_COCOA
finishCreateWindow_sys_Carbon(windowRef);
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index a6cea49..8818e4f 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -107,7 +107,7 @@ public:
// Apple Mac OS types
Mac,
- // Trolltech QWS types
+ // QWS types
Freetype,
QPF1,
QPF2,
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index 2697f93..5d5c978 100644
--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@@ -1343,7 +1343,7 @@ int QFtpPrivate::addCommand(QFtpCommand *cmd)
Some commands, e.g. list(), emit additional signals to report
their results.
- Example: If you want to download the INSTALL file from Trolltech's
+ Example: If you want to download the INSTALL file from the Qt
FTP server, you would write this:
\snippet doc/src/snippets/code/src_network_access_qftp.cpp 1
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index 0736c66..a5ed0b5 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -41,7 +41,7 @@
/****************************************************************************
**
-** In addition, as a special exception, Trolltech gives permission to link
+** In addition, as a special exception, Nokia gives permission to link
** the code of its release of Qt with the OpenSSL project's "OpenSSL" library
** (or modified versions of the "OpenSSL" library that use the same license
** as the original version), and distribute the linked executables.
diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
index b2f059b..52e3e95 100644
--- a/src/network/ssl/qsslconfiguration_p.h
+++ b/src/network/ssl/qsslconfiguration_p.h
@@ -41,7 +41,7 @@
/****************************************************************************
**
-** In addition, as a special exception, Trolltech gives permission to link
+** In addition, as a special exception, Nokia gives permission to link
** the code of its release of Qt with the OpenSSL project's "OpenSSL" library
** (or modified versions of the "OpenSSL" library that use the same license
** as the original version), and distribute the linked executables.
diff --git a/src/plugins/codecs/jp/qeucjpcodec.h b/src/plugins/codecs/jp/qeucjpcodec.h
index 11a7066..393d7f1 100644
--- a/src/plugins/codecs/jp/qeucjpcodec.h
+++ b/src/plugins/codecs/jp/qeucjpcodec.h
@@ -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.
/*
* Copyright (C) 1999 Serika Kurusugawa, All rights reserved.
diff --git a/src/plugins/codecs/jp/qjiscodec.h b/src/plugins/codecs/jp/qjiscodec.h
index 4d58647..9b95d58 100644
--- a/src/plugins/codecs/jp/qjiscodec.h
+++ b/src/plugins/codecs/jp/qjiscodec.h
@@ -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.
/*
* Copyright (C) 1999 Serika Kurusugawa, All rights reserved.
diff --git a/src/plugins/codecs/jp/qjpunicode.h b/src/plugins/codecs/jp/qjpunicode.h
index eaa6a04..eaa76e8 100644
--- a/src/plugins/codecs/jp/qjpunicode.h
+++ b/src/plugins/codecs/jp/qjpunicode.h
@@ -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.
/*
* Copyright (C) 1999 Serika Kurusugawa, All rights reserved.
diff --git a/src/plugins/codecs/jp/qsjiscodec.h b/src/plugins/codecs/jp/qsjiscodec.h
index 7c1fddf..5719b93 100644
--- a/src/plugins/codecs/jp/qsjiscodec.h
+++ b/src/plugins/codecs/jp/qsjiscodec.h
@@ -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.
/*
* Copyright (C) 1999 Serika Kurusugawa, All rights reserved.
diff --git a/src/plugins/codecs/kr/qeuckrcodec.cpp b/src/plugins/codecs/kr/qeuckrcodec.cpp
index 959e4fa..48b3d99 100644
--- a/src/plugins/codecs/kr/qeuckrcodec.cpp
+++ b/src/plugins/codecs/kr/qeuckrcodec.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
// Most of the cp949 code was originally written by Joon-Kyu Park, and is included
-// in Qt with the author's permission and the grateful thanks of the Trolltech team.
+// in Qt with the author's permission and the grateful thanks of the Qt team.
/*! \class QEucKrCodec
\reentrant
diff --git a/src/plugins/codecs/tw/qbig5codec.h b/src/plugins/codecs/tw/qbig5codec.h
index 9f0a9cc..d65b445 100644
--- a/src/plugins/codecs/tw/qbig5codec.h
+++ b/src/plugins/codecs/tw/qbig5codec.h
@@ -41,7 +41,7 @@
// Most of the code here was originally written by Ming-Che Chuang and
// is included in Qt with the author's permission, and the grateful
-// thanks of the Trolltech team.
+// thanks of the Qt team.
#ifndef QBIG5CODEC_H
#define QBIG5CODEC_H
diff --git a/src/qt3support/network/q3ftp.cpp b/src/qt3support/network/q3ftp.cpp
index 7dd9740..bc03368 100644
--- a/src/qt3support/network/q3ftp.cpp
+++ b/src/qt3support/network/q3ftp.cpp
@@ -1144,7 +1144,7 @@ static void delete_d( const Q3Ftp* foo )
Some commands, e.g. list(), emit additional signals to report
their results.
- Example: If you want to download the INSTALL file from Trolltech's
+ Example: If you want to download the INSTALL file from the Qt
FTP server, you would write this:
\snippet doc/src/snippets/code/src_qt3support_network_q3ftp.cpp 2
generated by cgit v0.12 at 2024-11-18 02:24:49 (GMT)