1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc: Fixing typo

Browse Source 
(cherry picked from commit 0a9652c93170ab9520869e9e231eba1834b47abc)

Conflicts:

	tests/auto/mediaobject/tst_mediaobject.cpp
	tests/auto/q3accel/tst_q3accel.cpp
	tests/auto/q3checklistitem/tst_q3checklistitem.cpp
	tests/auto/q3dns/tst_q3dns.cpp
	tests/auto/q3popupmenu/tst_q3popupmenu.cpp
	tools/linguist/tests/tst_lupdate.cpp

Change-Id: I118829afb27ab082f9656139102f74f9ab5f7ac4
Reviewed-on: http://codereview.qt.nokia.com/1035
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: David Boddie
This commit is contained in:
Sergio Ahumada 2011-07-04 10:37:56 +02:00 committed by Qt by Nokia
parent 8f222e2ad8
commit 1da4753bd9
25 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qobject.cpp
View File

@ -2735,7 +2735,7 @@ bool QObject::disconnect(const QObject *sender, const char *signal,
\a receiver. Returns true if the connection is successfully broken;
otherwise returns false.
This function provides the same posibilities like
This function provides the same possibilities like
disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *method)
but uses QMetaMethod to represent the signal and the method to be disconnected.
@ -2753,7 +2753,7 @@ bool QObject::disconnect(const QObject *sender, const char *signal,
QMetaMethod() may be used as wildcard in the meaning "any signal" or "any slot in receiving object".
In the same way 0 can be used for \a receiver in the meaning "any receiving object". In this case
method shoud also be QMetaMethod(). \a sender parameter should be never 0.
method should also be QMetaMethod(). \a sender parameter should be never 0.
\sa disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *method)
*/

2
src/gui/painting/qpainter.cpp
View File

@ -2728,7 +2728,7 @@ QRectF QPainter::clipBoundingRect() const
}
// Accumulate the bounding box in device space. This is not 100%
// precise, but it fits within the guarantee and it is resonably
// precise, but it fits within the guarantee and it is reasonably
// fast.
QRectF bounds;
for (int i=0; i<d->state->clipInfo.size(); ++i) {

2
tests/auto/qapplication/tst_qapplication.cpp
View File

@ -1515,7 +1515,7 @@ void tst_QApplication::testDeleteLaterProcessEvents()
}
/*
Test for crash whith QApplication::setDesktopSettingsAware(false).
Test for crash with QApplication::setDesktopSettingsAware(false).
*/
void tst_QApplication::desktopSettingsAware()
{

2
tests/auto/qbytearray/tst_qbytearray.cpp
View File

@ -644,7 +644,7 @@ void tst_QByteArray::qstrncpy()
QCOMPARE(QByteArray(::qstrncpy(dst.data(), src.data(), src.size())),
QByteArray("Tumdelidu"));
// normal copy with length is longer than neccessary
// normal copy with length is longer than necessary
src = QByteArray( "Tumdelidum\0foo" );
dst.resize(128*1024);
QCOMPARE(QByteArray(::qstrncpy(dst.data(), src.data(), dst.size())),

6
tests/auto/qclipboard/tst_qclipboard.cpp
View File

@ -140,8 +140,8 @@ void tst_QClipboard::modes()
}
/*
Test that the apropriate signals are emitted when the cliboard
contents is changed by calling the qt funcitons.
Test that the appropriate signals are emitted when the cliboard
contents is changed by calling the qt functions.
*/
void tst_QClipboard::testSignals()
{
@ -170,7 +170,7 @@ void tst_QClipboard::testSignals()
changedSpy.clear();
// Test the selction mode signal.
// Test the selection mode signal.
if (clipboard->supportsSelection()) {
clipboard->setText(text, QClipboard::Selection);
QCOMPARE(selectionChangedSpy.count(), 1);

2
tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
View File

@ -360,7 +360,7 @@ void tst_QCommandLinkButton::toggled()
testWidget->toggle();
QVERIFY( toggle_count == 0 );
// do it again, just to be shure
// do it again, just to be sure
resetCounters();
testWidget->toggle();
QVERIFY( toggle_count == 0 );

2
tests/auto/qeventloop/tst_qeventloop.cpp
View File

@ -287,7 +287,7 @@ void tst_QEventLoop::onlySymbianActiveScheduler() {
// In here we try to use timers and sockets exclusively using the Symbian
// active scheduler and no processEvents().
// This test should therefore be run first, so that we can verify that
// the first occurrence of processEvents does not do any initalization that
// the first occurrence of processEvents does not do any initialization that
// we depend on.
// Open up a pipe so we can test socket notifiers.

2
tests/auto/qftp/tst_qftp.cpp
View File

@ -1416,7 +1416,7 @@ void tst_QFtp::abort()
QVERIFY( bytesDone != bytesTotal );
}
} else {
// this could be tested by verifying that no more progress signals are emited
// this could be tested by verifying that no more progress signals are emitted
QVERIFY(bytesDone <= bytesTotal);
}
} else {

2
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
View File

@ -3054,7 +3054,7 @@ void tst_QGraphicsView::task210599_unsetDragWhileDragging()
QApplication::sendEvent(view.viewport(), &move);
}
// Check that no draggin has occured...
// Check that no draggin has occurred...
QCOMPARE(basePos, view.mapFromScene(0, 0));
}

4
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
View File

@ -2456,7 +2456,7 @@ void tst_QGraphicsWidget::popupMouseGrabber()
QCOMPARE(widgetUngrabEventSpy.count(), 1);
QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)0);
// Showing it grabs the mosue again
// Showing it grabs the mouse again
widget->show();
QCOMPARE(widgetGrabEventSpy.count(), 2);
QCOMPARE(scene.mouseGrabberItem(), (QGraphicsItem *)widget);
@ -3175,7 +3175,7 @@ void tst_QGraphicsWidget::initialShow2()
// Don't let paint events triggered by the windowing system
// influence our test case. We're only interested in knowing
// whether a QGraphicsWidget generates an additional repaint
// on the inital show. Hence create a dummy scenario to find out
// on the initial show. Hence create a dummy scenario to find out
// how many repaints we should expect.
QGraphicsScene dummyScene(0, 0, 200, 200);
dummyScene.addItem(new QGraphicsRectItem(0, 0, 100, 100));

2
tests/auto/qhostinfo/tst_qhostinfo.cpp
View File

@ -250,7 +250,7 @@ void tst_QHostInfo::initTestCase()
void tst_QHostInfo::init()
{
// delete the cache so inidividual testcase results are independant from each other
// delete the cache so inidividual testcase results are independent from each other
qt_qhostinfo_clear_cache();
QFETCH_GLOBAL(bool, cache);

30
tests/auto/qitemmodel/tst_qitemmodel.cpp
View File

@ -67,7 +67,7 @@ Q_DECLARE_METATYPE(QModelIndex)
See modelstotest.cpp for instructions on how to have your model tested with these tests.
Each test such as rowCount have a _data() function which populate the QTest data with
the tests specified by modelstotest.cpp and any extra data needed for that perticular test.
the tests specified by modelstotest.cpp and any extra data needed for that particular test.
setupWithNoTestData() fills the QTest data with just the tests and is used by most tests.
@ -192,7 +192,7 @@ void tst_QItemModel::nonDestructiveBasicTest_data()
}
/*!
nonDestructiveBasicTest trys to call a number of the basic functions (not all)
nonDestructiveBasicTest tries to call a number of the basic functions (not all)
to make sure the model doesn't segfault, testing the functions that makes sense.
*/
void tst_QItemModel::nonDestructiveBasicTest()
@ -516,7 +516,7 @@ void tst_QItemModel::parent()
QCOMPARE(currentModel->parent(childIndex), topIndex);
}
// Common error test #3, the second colum has the same children
// Common error test #3, the second column has the same children
// as the first column in a row.
QModelIndex topIndex1 = currentModel->index(0, 1, QModelIndex());
if (currentModel->rowCount(topIndex1) > 0) {
@ -817,7 +817,7 @@ void tst_QItemModel::remove_data()
makeTestRow(":valid start, invalid count", MIDDLE, 9999, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
makeTestRow(":valid start, invalid count", END, 9999, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
// Recursive remove's might assert, havn't decided yet...
// Recursive remove's might assert, haven't decided yet...
//makeTestRow(":one at the start recursivly", START, DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, FAIL);
//makeTestRow(":one at the middle recursivly", MIDDLE, DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, SUCCESS);
//makeTestRow(":one at the end recursivly", END, DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, SUCCESS);
@ -849,7 +849,7 @@ void tst_QItemModel::remove()
QFETCH(bool, shouldSucceed);
// Populate the test area so we can remove something. See: cleanup()
// parentOfRemoved is stored so that the slots can make sure parentOfRemoved is the index that is emited.
// parentOfRemoved is stored so that the slots can make sure parentOfRemoved is the index that is emitted.
parentOfRemoved = testModels->populateTestArea(currentModel);
if (count == -1)
@ -866,7 +866,7 @@ void tst_QItemModel::remove()
//qDebug() << "remove start:" << start << "count:" << count << "rowCount:" << currentModel->rowCount(parentOfRemoved);
// When a row or column is removed there should be two signals.
// Watch to make sure they are emited and get the row/column count when they do get emited by connecting them to a slot
// Watch to make sure they are emitted and get the row/column count when they do get emitted by connecting them to a slot
qRegisterMetaType<QModelIndex>("QModelIndex");
QSignalSpy columnsAboutToBeRemovedSpy(currentModel, SIGNAL(columnsAboutToBeRemoved( const QModelIndex &, int , int )));
QSignalSpy rowsAboutToBeRemovedSpy(currentModel, SIGNAL(rowsAboutToBeRemoved( const QModelIndex &, int , int )));
@ -914,7 +914,7 @@ void tst_QItemModel::remove()
QVERIFY(parentOfRemoved == parent);
}
// Only the row signals should have been emited
// Only the row signals should have been emitted
if (modelResetSpy.count() >= 1 || modelLayoutChangedSpy.count() >=1 ){
QCOMPARE(columnsAboutToBeRemovedSpy.count(), 0);
QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
@ -928,7 +928,7 @@ void tst_QItemModel::remove()
QCOMPARE(rowsRemovedSpy.count(), numberOfRowsRemovedSignals);
}
// The row count should only change *after* rowsAboutToBeRemoved has been emited
// The row count should only change *after* rowsAboutToBeRemoved has been emitted
//qDebug() << beforeRemoveRowCount << afterAboutToRemoveRowCount << afterRemoveRowCount << currentModel->rowCount(parentOfRemoved);
if (shouldSucceed) {
if (modelResetSpy.count() == 0 && modelLayoutChangedSpy.count() == 0){
@ -978,7 +978,7 @@ void tst_QItemModel::remove()
QCOMPARE(rowsRemovedSpy.count(), numberOfRowsRemovedSignals);
}
// The column count should only change *after* rowsAboutToBeRemoved has been emited
// The column count should only change *after* rowsAboutToBeRemoved has been emitted
if (shouldSucceed) {
if (modelResetSpy.count() == 0 && modelLayoutChangedSpy.count() == 0){
QCOMPARE(afterAboutToRemoveColumnCount, beforeRemoveColumnCount);
@ -1160,7 +1160,7 @@ void tst_QItemModel::insert_data()
makeTestRow(":valid start, invalid count", MIDDLE, -2, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
makeTestRow(":valid start, invalid count", END, -2, NOSIGNALS, NOSIGNALS, NOSIGNALS, NOSIGNALS, !RECURSIVE, 0, 0, FAIL);
// Recursive insert's might assert, havn't decided yet...
// Recursive insert's might assert, haven't decided yet...
//makeTestRow(":one at the start recursivly", START, DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, FAIL);
//makeTestRow(":one at the middle recursivly", MIDDLE, DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, SUCCESS);
//makeTestRow(":one at the end recursivly", END, DEFAULTCOUNT, 2, DNS, 2, DNS, RECURSIVE, START, DEFAULTCOUNT, SUCCESS);
@ -1191,7 +1191,7 @@ void tst_QItemModel::insert()
QFETCH(bool, shouldSucceed);
// Populate the test area so we can insert something. See: cleanup()
// parentOfInserted is stored so that the slots can make sure parentOfInserted is the index that is emited.
// parentOfInserted is stored so that the slots can make sure parentOfInserted is the index that is emitted.
parentOfInserted = testModels->populateTestArea(currentModel);
if (count == -1)
@ -1208,7 +1208,7 @@ void tst_QItemModel::insert()
//qDebug() << "insert start:" << start << "count:" << count << "rowCount:" << currentModel->rowCount(parentOfInserted);
// When a row or column is inserted there should be two signals.
// Watch to make sure they are emited and get the row/column count when they do get emited by connecting them to a slot
// Watch to make sure they are emitted and get the row/column count when they do get emitted by connecting them to a slot
qRegisterMetaType<QModelIndex>("QModelIndex");
QSignalSpy columnsAboutToBeInsertedSpy(currentModel, SIGNAL(columnsAboutToBeInserted( const QModelIndex &, int , int )));
QSignalSpy rowsAboutToBeInsertedSpy(currentModel, SIGNAL(rowsAboutToBeInserted( const QModelIndex &, int , int )));
@ -1253,7 +1253,7 @@ void tst_QItemModel::insert()
QVERIFY(parentOfInserted == parent);
}
// Only the row signals should have been emited
// Only the row signals should have been emitted
if (modelResetSpy.count() >= 1 || modelLayoutChangedSpy.count() >= 1) {
QCOMPARE(columnsAboutToBeInsertedSpy.count(), 0);
QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
@ -1266,7 +1266,7 @@ void tst_QItemModel::insert()
QCOMPARE(columnsInsertedSpy.count(), 0);
QCOMPARE(rowsInsertedSpy.count(), numberOfRowsInsertedSignals);
}
// The row count should only change *after* rowsAboutToBeInserted has been emited
// The row count should only change *after* rowsAboutToBeInserted has been emitted
//qDebug() << beforeInsertRowCount << afterAboutToInsertRowCount << afterInsertRowCount << currentModel->rowCount(parentOfInserted);
if (shouldSucceed) {
if (modelResetSpy.count() == 0 && modelLayoutChangedSpy.count() == 0) {
@ -1315,7 +1315,7 @@ void tst_QItemModel::insert()
QCOMPARE(columnsInsertedSpy.count(), numberOfColumnsInsertedSignals);
QCOMPARE(rowsInsertedSpy.count(), numberOfRowsInsertedSignals);
}
// The column count should only change *after* rowsAboutToBeInserted has been emited
// The column count should only change *after* rowsAboutToBeInserted has been emitted
if (shouldSucceed) {
if (modelResetSpy.count() == 0 && modelLayoutChangedSpy.count() == 0) {
QCOMPARE(afterAboutToInsertColumnCount, beforeInsertColumnCount);

4
tests/auto/qitemview/tst_qitemview.cpp
View File

@ -86,7 +86,7 @@ bool qt_wince_is_mobile() {
See viewstotest.cpp for instructions on how to have your view tested with these tests.
Each test such as visualRect have a _data() function which populate the QTest data with
tests specified by viewstotest.cpp and any extra data needed for that perticular test.
tests specified by viewstotest.cpp and any extra data needed for that particular test.
setupWithNoTestData() fills QTest data with only the tests it is used by most tests.
@ -324,7 +324,7 @@ void tst_QItemView::nonDestructiveBasicTest_data()
}
/*!
nonDestructiveBasicTest trys to call a number of the basic functions (not all)
nonDestructiveBasicTest tries to call a number of the basic functions (not all)
to make sure the view doesn't segfault, testing the functions that makes sense.
*/
void tst_QItemView::nonDestructiveBasicTest()

2
tests/auto/qkeysequence/tst_qkeysequence.cpp
View File

@ -291,7 +291,7 @@ void tst_QKeySequence::checkMultipleCodes()
}
/*
* We must ensure that the keyBindings data is allways sorted
* We must ensure that the keyBindings data is always sorted
* so that we can safely perform binary searches.
*/
void tst_QKeySequence::ensureSorted()

2
tests/auto/qlistview/tst_qlistview.cpp
View File

@ -979,7 +979,7 @@ void tst_QListView::selection_data()
<< IntList(); // expected items
#if defined(Q_OS_WINCE)
// depending on wether the display is double-pixeld, we need
// depending on whether the display is double-pixeld, we need
// to click at a different position
bool doubledSize = false;
int dpi = GetDeviceCaps(GetDC(0), LOGPIXELSX);

2
tests/auto/qmenu/tst_qmenu.cpp
View File

@ -302,7 +302,7 @@ void tst_QMenu::mouseActivation()
QTest::mouseClick(&menu, Qt::LeftButton, 0, menu.rect().center(), 300);
QVERIFY(!menu.isVisible());
//context menus can allways be accessed with right click except on windows
//context menus can always be accessed with right click except on windows
menu.show();
QTest::mouseClick(&menu, Qt::RightButton, 0, menu.rect().center(), 300);
QVERIFY(!menu.isVisible());

2
tests/auto/qprinterinfo/tst_qprinterinfo.cpp
View File

@ -292,7 +292,7 @@ void tst_QPrinterInfo::testForPrinters()
for (int i = 0; i < sysPrinters.size(); ++i) {
if (!qtPrinters.value(sysPrinters.at(i))) {
qDebug() << "Avaliable printers: " << qtPrinters;
qDebug() << "Available printers: " << qtPrinters;
QFAIL(qPrintable(QString("Printer '%1' reported by system, but not reported by Qt").arg(sysPrinters.at(i))));
}
}

2
tests/auto/qpushbutton/tst_qpushbutton.cpp
View File

@ -382,7 +382,7 @@ void tst_QPushButton::toggled()
testWidget->toggle();
QVERIFY( toggle_count == 0 );
// do it again, just to be shure
// do it again, just to be sure
resetCounters();
testWidget->toggle();
QVERIFY( toggle_count == 0 );

2
tests/auto/qshortcut/tst_qshortcut.cpp
View File

@ -1030,7 +1030,7 @@ void tst_QShortcut::context()
other1->clear();
other2->clear();
// edit doens't have focus, so ActiveWindow context should work
// edit doesn't have focus, so ActiveWindow context should work
// ..but Focus context shouldn't..
// Changing focus to edit should make focus context work
// Application context should always work

2
tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
View File

@ -218,7 +218,7 @@ void tst_QSqlRelationalTableModel::data()
QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
QCOMPARE(model.data(model.index(0, 2)).toString(), QString("herr"));
//try a non-existant index
//try a non-existent index
QVERIFY2(model.data(model.index(0,4)).isValid() == false,"Invalid index returned valid QVariant");
//check data retrieval when relational key is a non-integer type

2
tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
View File

@ -1293,7 +1293,7 @@ void tst_QSqlTableModel::tableModifyWithBlank()
QCOMPARE(model.rowCount(), 1); //verify only one entry
QCOMPARE(model.record(0).value(0).toString(), timeString); //verify correct record
//At this point we know that the intial value (timestamp) was succsefully stored in the database
//At this point we know that the initial value (timestamp) was succsefully stored in the database
//Attempt to modify the data in the new record
//equivalent to query.exec("update test set column3="... command in direct test
//set the data in the first column to "col1ModelData"

4
tests/auto/qsslsocket/tst_qsslsocket.cpp
View File

@ -1992,9 +1992,9 @@ void tst_QSslSocket::writeBigChunk()
qWarning() << socket->error() << socket->errorString();
QFAIL("Error while writing! Check if the OpenSSL BIO size is limited?!");
}
// also check the error string. If another error (than UnknownError) occured, it should be different than before
// also check the error string. If another error (than UnknownError) occurred, it should be different than before
QVERIFY(errorBefore == errorAfter);
// check that everything has been written to OpenSSL
QVERIFY(socket->bytesToWrite() == 0);

4
tests/auto/qtextformat/tst_qtextformat.cpp
View File

@ -226,7 +226,7 @@ void tst_QTextFormat::resolveFont()
QVERIFY(fmt.font().underline());
QVERIFY(!fmt.hasProperty(QTextFormat::FontUnderline));
// verify that deleting a non-existant property does not affect the font resolving
// verify that deleting a non-existent property does not affect the font resolving
QVERIFY(!fmt.hasProperty(QTextFormat::BackgroundBrush));
fmt.clearProperty(QTextFormat::BackgroundBrush);
@ -235,7 +235,7 @@ void tst_QTextFormat::resolveFont()
QVERIFY(!fmt.hasProperty(QTextFormat::FontUnderline));
QVERIFY(fmt.font().underline());
// verify that deleting an existant but font _unrelated_ property does not affect the font resolving
// verify that deleting an existent but font _unrelated_ property does not affect the font resolving
QVERIFY(fmt.hasProperty(QTextFormat::ForegroundBrush));
fmt.clearProperty(QTextFormat::ForegroundBrush);

2
tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
View File

@ -124,7 +124,7 @@
systemLock.unlock();
}
If this is called from two seperate processes the resulting log file is
If this is called from two separate processes the resulting log file is
guaranteed to contain both lines.
When you call lock(), other threads or processes that try to call lock()

2
tests/auto/qudpsocket/tst_qudpsocket.cpp
View File

@ -757,7 +757,7 @@ void tst_QUdpSocket::bindMode()
// Depending on the user's privileges, this or will succeed or
// fail. Admins are allowed to reuse the address, but nobody else.
if (!socket2.bind(socket.localPort(), QUdpSocket::ReuseAddressHint), socket2.errorString().toLatin1().constData())
qWarning("Failed to bind with QUdpSocket::ReuseAddressHint, user isn't an adminstrator?");
qWarning("Failed to bind with QUdpSocket::ReuseAddressHint, user isn't an administrator?");
socket.close();
QVERIFY2(socket.bind(0, QUdpSocket::ShareAddress), socket.errorString().toLatin1().constData());
QVERIFY(!socket2.bind(socket.localPort()));