diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-11 09:43:41 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-11 09:43:41 (GMT) |
commit | 3058cd5f6ee3fb01e62d625b501e7eeeea70cd84 (patch) | |
tree | 880ceec3efd8979d5ceff6a58a1160f94e884e41 /src/gui | |
parent | a958ab9c98481100870a87ee07b8e0abddbfc804 (diff) | |
download | Qt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.zip Qt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.tar.gz Qt-3058cd5f6ee3fb01e62d625b501e7eeeea70cd84.tar.bz2 |
Eliminate some mentions of Trolltech.
Reviewed-by: Trust Me
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/itemviews/qdatawidgetmapper.cpp | 22 | ||||
-rw-r--r-- | src/gui/kernel/qmotifdnd_x11.cpp | 2 |
2 files changed, 12 insertions, 12 deletions
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..c3e2cfd 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 Nokia, not to Nokia's modifications. It is replicated in doc/dnd.doc, where the documentation system can see it. */ /* Copyright 1996 Daniel Dardailler. |