whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: Fixing typo 

(cherry picked from commit 7f5797a784e237672f291055020ef4bbb6199893)

Conflicts:

	tests/auto/qaccessibility/tst_qaccessibility.cpp
	tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
	tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
	tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp

Change-Id: I8bab7ee83f6e32bba2574aad82b288fb05b503eb
Reviewed-on: http://codereview.qt.nokia.com/1253
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
bb10
Sergio Ahumada 2011-07-06 23:06:42 +02:00 committed by Qt by Nokia
parent 1174b69ee1
commit 10a79f783b
17 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/qaccessibility/tst_qaccessibility.cpp
View File

@ -1130,7 +1130,7 @@ void tst_QAccessibility::buttonTest()
// QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 0), QString("Press"));
// test->release();
// // test splitted menu toolbutton
// // test split menu toolbutton
// QVERIFY(QAccessible::queryAccessibleInterface(&splitToolButton, &test));
// QCOMPARE(test->childCount(), 2);
// QCOMPARE(test->role(0), QAccessible::ButtonDropDown);

18
tests/auto/qlistwidget/tst_qlistwidget.cpp
View File

@ -260,7 +260,7 @@ void tst_QListWidget::addItem2()
{
int count = testWidget->count();
// Boundry Checking
// Boundary Checking
testWidget->addItem(0);
QCOMPARE(testWidget->count(), count);
@ -276,7 +276,7 @@ void tst_QListWidget::addItems()
{
int count = testWidget->count();
// Boundry Checking
// Boundary Checking
testWidget->addItems(QStringList());
QCOMPARE(testWidget->count(), count);
@ -294,7 +294,7 @@ void tst_QListWidget::addItems()
void tst_QListWidget::openPersistentEditor()
{
// Boundry checking
// Boundary checking
testWidget->openPersistentEditor(0);
QListWidgetItem *item = new QListWidgetItem(QString("%1").arg(testWidget->count()));
testWidget->openPersistentEditor(item);
@ -312,7 +312,7 @@ void tst_QListWidget::closePersistentEditor()
QTest::qWait(1000);
#endif
// Boundry checking
// Boundary checking
int childCount = testWidget->viewport()->children().count();
testWidget->closePersistentEditor(0);
QListWidgetItem *item = new QListWidgetItem(QString("%1").arg(testWidget->count()));
@ -337,7 +337,7 @@ void tst_QListWidget::closePersistentEditor()
void tst_QListWidget::setItemHidden()
{
// Boundry checking
// Boundary checking
testWidget->setItemHidden(0, true);
testWidget->setItemHidden(0, false);
@ -394,7 +394,7 @@ void tst_QListWidget::setCurrentItem()
for (int i = 0; i < fill; ++i)
testWidget->addItem(QString("%1").arg(i));
// Boundry checking
// Boundary checking
testWidget->setCurrentItem((QListWidgetItem *)0);
QCOMPARE((QListWidgetItem *)0, testWidget->currentItem());
QListWidgetItem item;
@ -426,7 +426,7 @@ void tst_QListWidget::setCurrentRow()
for (int i = 0; i < fill; ++i)
testWidget->addItem(QString("%1").arg(i));
// Boundry checking
// Boundary checking
testWidget->setCurrentRow(-1);
QCOMPARE(-1, testWidget->currentRow());
testWidget->setCurrentRow(testWidget->count());
@ -483,7 +483,7 @@ void tst_QListWidget::editItem_data()
void tst_QListWidget::editItem()
{
// Boundry checking
// Boundary checking
testWidget->editItem(0);
QListWidgetItem *item = new QListWidgetItem(QString("%1").arg(testWidget->count()));
testWidget->editItem(item);
@ -517,7 +517,7 @@ void tst_QListWidget::findItems()
{
// This really just tests that the items that are returned are converted from index's to items correctly.
// Boundry checking
// Boundary checking
QCOMPARE(testWidget->findItems("GirlsCanWearJeansAndCutTheirHairShort", Qt::MatchExactly).count(), 0);
populate();

2
tests/auto/qmenubar/tst_qmenubar.cpp
View File

@ -200,7 +200,7 @@ const int RESET = 0;
/*!
Test plan:
insertItem (all flavours and combinations)
insertItem (all flavors and combinations)
removing menu items
clearing the menu

2
tests/auto/qmutexlocker/tst_qmutexlocker.cpp
View File

@ -182,7 +182,7 @@ void tst_QMutexLocker::unlockAndRelockTest()
releaseThread();
waitForThread();
// mutex has been explicity relocked via QMutexLocker
// mutex has been explicitly relocked via QMutexLocker
QVERIFY(!thread->mutex.tryLock());
releaseThread();

8
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -2511,7 +2511,7 @@ void tst_QNetworkReply::ioGetFromFile()
QNetworkRequest request(QUrl::fromLocalFile(file.fileName()));
QNetworkReplyPtr reply = manager.get(request);
QVERIFY(reply->isFinished()); // a file should immediatly be done
QVERIFY(reply->isFinished()); // a file should immediately be done
DataReader reader(reply);
connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
@ -2801,7 +2801,7 @@ void tst_QNetworkReply::ioGetFromHttpWithAuth()
void tst_QNetworkReply::ioGetFromHttpWithAuthSynchronous()
{
// verify that we do not enter an endless loop with synchronous calls and wrong credentials
// the case when we succed with the login is tested in ioGetFromHttpWithAuth()
// the case when we succeed with the login is tested in ioGetFromHttpWithAuth()
QNetworkRequest request(QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/rfcs-auth/rfc3252.txt"));
request.setAttribute(
@ -2910,7 +2910,7 @@ void tst_QNetworkReply::ioGetFromHttpWithProxyAuth()
void tst_QNetworkReply::ioGetFromHttpWithProxyAuthSynchronous()
{
// verify that we do not enter an endless loop with synchronous calls and wrong credentials
// the case when we succed with the login is tested in ioGetFromHttpWithAuth()
// the case when we succeed with the login is tested in ioGetFromHttpWithAuth()
QNetworkProxy proxy(QNetworkProxy::HttpCachingProxy, QtNetworkSettings::serverName(), 3129);
QNetworkRequest request(QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/rfc3252.txt"));
@ -6262,7 +6262,7 @@ void tst_QNetworkReply::httpAbort()
QCOMPARE(reply->error(), QNetworkReply::OperationCanceledError);
QVERIFY(reply->isFinished());
// Abort immediatly after the get()
// Abort immediately after the get()
QNetworkReplyPtr reply2 = manager.get(request);
connect(reply2, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
reply2->abort();

22
tests/auto/qnetworksession/test/tst_qnetworksession.cpp
View File

@ -1413,15 +1413,15 @@ void tst_QNetworkSession::outOfProcessSession()
}
}
// A convinience / helper function for testcases. Return the first matching configuration.
// A convenience / helper function for testcases. Return the first matching configuration.
// Ignores configurations in other than 'discovered' -state. Returns invalid (QNetworkConfiguration())
// if none found.
QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfiguration::Type configType) {
// Refresh configurations and derive configurations matching given parameters.
QNetworkConfigurationManager mgr;
QSignalSpy updateSpy(&mgr, SIGNAL(updateCompleted()));
mgr.updateConfigurations();
QTRY_NOOP(updateSpy.count() == 1);
if (updateSpy.count() != 1) {
@ -1430,13 +1430,13 @@ QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfigur
}
QList<QNetworkConfiguration> discoveredConfigs = mgr.allConfigurations(QNetworkConfiguration::Discovered);
foreach(QNetworkConfiguration config, discoveredConfigs) {
if ((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
if ((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
discoveredConfigs.removeOne(config);
} else if (config.type() != configType) {
// qDebug() << "Dumping config because type (IAP/SNAP) mismatches: " << config.name();
discoveredConfigs.removeOne(config);
} else if ((config.type() == QNetworkConfiguration::InternetAccessPoint) &&
bearerType == "cellular") { // 'cellular' bearertype is for convinience
bearerType == "cellular") { // 'cellular' bearertype is for convenience
if (config.bearerName() != "2G" &&
config.bearerName() != "CDMA2000" &&
config.bearerName() != "WCDMA" &&
@ -1458,8 +1458,8 @@ QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfigur
}
}
// A convinience-function: updates configurations and waits that they are updated.
void updateConfigurations()
// A convenience-function: updates configurations and waits that they are updated.
void updateConfigurations()
{
QNetworkConfigurationManager mgr;
QSignalSpy updateSpy(&mgr, SIGNAL(updateCompleted()));
@ -1467,7 +1467,7 @@ void updateConfigurations()
QTRY_NOOP(updateSpy.count() == 1);
}
// A convinience-function: updates and prints all available confiurations and their states
// A convenience-function: updates and prints all available confiurations and their states
void printConfigurations()
{
QNetworkConfigurationManager manager;
@ -1480,7 +1480,7 @@ void printConfigurations()
}
}
// A convinience function for test-cases: opens the given configuration and return
// A convenience function for test-cases: opens the given configuration and return
// true if it was done gracefully.
bool openSession(QNetworkSession *session) {
bool result = true;
@ -1546,10 +1546,10 @@ bool openSession(QNetworkSession *session) {
return result;
}
// Helper function for closing opened session. Performs checks that
// Helper function for closing opened session. Performs checks that
// session is closed gradefully (e.g. signals). Function does not delete
// the session. The lastSessionOnConfiguration (true by default) is used to
// tell if there are more sessions open, basing on same configration. This
// tell if there are more sessions open, basing on same configuration. This
// impacts the checks made.
bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration) {
if (!session) {

2
tests/auto/qreadlocker/tst_qreadlocker.cpp
View File

@ -177,7 +177,7 @@ void tst_QReadLocker::unlockAndRelockTest()
releaseThread();
waitForThread();
// lock has been explicity relocked via QReadLocker
// lock has been explicitly relocked via QReadLocker
QVERIFY(!thread->lock.tryLockForWrite());
releaseThread();

6
tests/auto/qreadwritelock/tst_qreadwritelock.cpp
View File

@ -665,7 +665,7 @@ public:
/*
A writer aquires a read-lock, a reader locks
A writer acquires a read-lock, a reader locks
the writer releases the lock, the reader gets the lock
*/
void tst_QReadWriteLock::readLockBlockRelease()
@ -682,7 +682,7 @@ void tst_QReadWriteLock::readLockBlockRelease()
}
/*
writer1 aquires a read-lock, writer2 blocks,
writer1 acquires a read-lock, writer2 blocks,
writer1 releases the lock, writer2 gets the lock
*/
void tst_QReadWriteLock::writeLockBlockRelease()
@ -698,7 +698,7 @@ void tst_QReadWriteLock::writeLockBlockRelease()
QVERIFY(threadDone);
}
/*
Two readers aquire a read-lock, one writer attempts a write block,
Two readers acquire a read-lock, one writer attempts a write block,
the readers release their locks, the writer gets the lock.
*/
void tst_QReadWriteLock::multipleReadersBlockRelease()

2
tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
View File

@ -448,7 +448,7 @@ void tst_QStyleSheetStyle::widgetStyle()
window2->setStyleSheet("");
qApp->setStyle(0);
qApp->setStyleSheet("may_insanity_prevail { }"); // app has styleshet
qApp->setStyleSheet("may_insanity_prevail { }"); // app has stylesheet
QCOMPARE(window1->style(), qApp->style());
QCOMPARE(window1->style()->metaObject()->className(), "QStyleSheetStyle");
QCOMPARE(widget1->style()->metaObject()->className(), "QStyleSheetStyle"); // check the child

2
tests/auto/qtextcodec/tst_qtextcodec.cpp
View File

@ -496,7 +496,7 @@ void tst_QTextCodec::flagEFBFBF() const
start.append("?>");
}
/* When 0xEFBFBF is preceeded by what seems to be an arbitrary character,
/* When 0xEFBFBF is preceded by what seems to be an arbitrary character,
* QTextCodec fails to flag it. */
{
QByteArray start("B");

2
tests/auto/qtextcursor/tst_qtextcursor.cpp
View File

@ -1302,7 +1302,7 @@ void tst_QTextCursor::selectVisually()
cursor.setPosition(6); // somewhere in the long paragraph.
cursor.select(QTextCursor::LineUnderCursor);
// since we are not yet layed-out, we expect the whole paragraph to be selected.
// since we are not yet laid-out, we expect the whole paragraph to be selected.
QCOMPARE(cursor.position(), 77);
QCOMPARE(cursor.anchor(), 4);
}

2
tests/auto/qvector/tst_qvector.cpp
View File

@ -157,7 +157,7 @@ void tst_QVector::capacity() const
{
QVector<QString> myvec;
// TODO: is this guarenteed? seems a safe assumption, but I suppose preallocation of a
// TODO: is this guaranteed? seems a safe assumption, but I suppose preallocation of a
// few items isn't an entirely unforseeable possibility.
QVERIFY(myvec.capacity() == 0);

2
tests/auto/qwizard/tst_qwizard.cpp
View File

@ -923,7 +923,7 @@ void tst_QWizard::setOption_IndependentPages()
CHECK_PAGE_INIT(11, 10, 11, 10, 10, 10);
// Now, turn on the option and check that they're called at the
// appropiate times (which aren't the same).
// appropriate times (which aren't the same).
wizard.setOption(QWizard::IndependentPages, true);
CHECK_PAGE_INIT(11, 10, 11, 10, 10, 10);

2
tests/auto/qwritelocker/tst_qwritelocker.cpp
View File

@ -177,7 +177,7 @@ void tst_QWriteLocker::unlockAndRelockTest()
releaseThread();
waitForThread();
// lock has been explicity relocked via QWriteLocker
// lock has been explicitly relocked via QWriteLocker
QVERIFY(!thread->lock.tryLockForWrite());
releaseThread();

6
tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp
View File

@ -536,12 +536,12 @@ void tst_QWSWindowSystem::dontFlushUnitializedWindowSurfaces()
// At this point w has a windowsurface but it's completely covered by
// the directpainter so nothing will be painted here and the
// windowsurface contains unitialized data.
// windowsurface contains uninitialized data.
QApplication::processEvents();
QCOMPARE(p.allocatedRegion(), QRegion(r));
QCOMPARE(w.visibleRegion(), QRegion());
fillWindowSurface(&w, Qt::black); // fill with "unitialized" data
fillWindowSurface(&w, Qt::black); // fill with "uninitialized" data
p.setRegion(QRegion());
@ -569,7 +569,7 @@ void tst_QWSWindowSystem::dontFlushUnitializedWindowSurfaces()
QApplication::processEvents();
QCOMPARE(p.allocatedRegion(), QRegion(r));
QCOMPARE(w.visibleRegion(), QRegion());
fillWindowSurface(&w, Qt::black); // fill with "unitialized" data
fillWindowSurface(&w, Qt::black); // fill with "uninitialized" data
p.setRegion(QRegion());

2
tests/auto/selftests/subtest/tst_subtest.cpp
View File

@ -153,7 +153,7 @@ void tst_Subtest::test3()
QFETCH(QString, str);
// second and third time we call this it shoud FAIL
// second and third time we call this it should FAIL
QCOMPARE(str, QString("hello0"));
printf("test2 end\n");

2
tests/auto/uiloader/tst_screenshot/main.cpp
View File

@ -39,7 +39,7 @@
**
****************************************************************************/
/*
* This programm takes a *.ui file and an output dir as argument in order to
* This program takes a *.ui file and an output dir as argument in order to
* create a screenshot of the widget defined in the ui file.
*
* The screenshot is saved in the output dir (default current dir), ".png" is