summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2011-10-25 00:11:03 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-26 13:50:12 +0200
commitc3313fdd1c0be9eb02724a0b6dc6cc14028bd409 (patch)
tree39ff04f367163e0dd99342f64f6a021bd5fbd2b2 /tests
parent264272fb88358c1bc681442bbfd4673de29ef969 (diff)
Doc: Fixing typo
Fix typos I was able to find in `tests/auto' directory. Change-Id: Id0bfcc18301381ac8b1ca8d5af17bd926e5913d4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/tools/qsize/tst_qsize.cpp4
-rw-r--r--tests/auto/corelib/tools/qsizef/tst_qsizef.cpp4
-rw-r--r--tests/auto/corelib/tools/qstring/tst_qstring.cpp2
-rw-r--r--tests/auto/corelib/tools/qstringref/tst_qstringref.cpp2
-rw-r--r--tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp2
-rw-r--r--tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h2
-rw-r--r--tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp4
-rw-r--r--tests/auto/other/atwrapper/atWrapper.cpp2
-rw-r--r--tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp2
-rw-r--r--tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp2
-rw-r--r--tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp2
-rw-r--r--tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp2
-rw-r--r--tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp2
13 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/corelib/tools/qsize/tst_qsize.cpp b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
index 36654df618..ae9426c568 100644
--- a/tests/auto/corelib/tools/qsize/tst_qsize.cpp
+++ b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
@@ -195,7 +195,7 @@ void tst_QSize::expandedTo_data()
QTest::newRow("data0") << QSize(10,12) << QSize(6,4) << QSize(10,12);
QTest::newRow("data1") << QSize(0,0) << QSize(6,4) << QSize(6,4);
// This should pick the highest of w,h components independently of each other,
- // thus the result dont have to be equal to neither input1 nor input2.
+ // thus the results don't have to be equal to neither input1 nor input2.
QTest::newRow("data3") << QSize(6,4) << QSize(4,6) << QSize(6,6);
}
@@ -217,7 +217,7 @@ void tst_QSize::boundedTo_data()
QTest::newRow("data0") << QSize(10,12) << QSize(6,4) << QSize(6,4);
QTest::newRow("data1") << QSize(0,0) << QSize(6,4) << QSize(0,0);
// This should pick the lowest of w,h components independently of each other,
- // thus the result dont have to be equal to neither input1 nor input2.
+ // thus the results don't have to be equal to neither input1 nor input2.
QTest::newRow("data3") << QSize(6,4) << QSize(4,6) << QSize(4,4);
}
diff --git a/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
index 2e03a65197..9a40abccf4 100644
--- a/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
+++ b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
@@ -127,7 +127,7 @@ void tst_QSizeF::expandedTo_data() {
QTest::newRow("data0") << QSizeF(10.4, 12.8) << QSizeF(6.6, 4.4) << QSizeF(10.4, 12.8);
QTest::newRow("data1") << QSizeF(0.0, 0.0) << QSizeF(6.6, 4.4) << QSizeF(6.6, 4.4);
// This should pick the highest of w,h components independently of each other,
- // thus the result dont have to be equal to neither input1 nor input2.
+ // thus the result don't have to be equal to neither input1 nor input2.
QTest::newRow("data3") << QSizeF(6.6, 4.4) << QSizeF(4.4, 6.6) << QSizeF(6.6, 6.6);
}
@@ -147,7 +147,7 @@ void tst_QSizeF::boundedTo_data() {
QTest::newRow("data0") << QSizeF(10.4, 12.8) << QSizeF(6.6, 4.4) << QSizeF(6.6, 4.4);
QTest::newRow("data1") << QSizeF(0.0, 0.0) << QSizeF(6.6, 4.4) << QSizeF(0.0, 0.0);
// This should pick the lowest of w,h components independently of each other,
- // thus the result dont have to be equal to neither input1 nor input2.
+ // thus the result don't have to be equal to neither input1 nor input2.
QTest::newRow("data3") << QSizeF(6.6, 4.4) << QSizeF(4.4, 6.6) << QSizeF(4.4, 4.4);
}
diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
index 8ca9489390..107de9b727 100644
--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
@@ -4722,7 +4722,7 @@ void tst_QString::compare_data()
QTest::newRow("data8") << upper << lower << -1 << 0;
// embedded nulls
- // These dont work as of now. Its OK that these dont work since \0 is not a valid unicode
+ // These don't work as of now. It's OK that these don't work since \0 is not a valid unicode
/*QTest::newRow("data9") << QString(QByteArray("\0", 1)) << QString(QByteArray("\0", 1)) << 0 << 0;
QTest::newRow("data10") << QString(QByteArray("\0", 1)) << QString("") << 1 << 1;
QTest::newRow("data11") << QString("") << QString(QByteArray("\0", 1)) << -1 << -1;
diff --git a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
index 2697058f2a..d5284caeb2 100644
--- a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
@@ -812,7 +812,7 @@ void tst_QStringRef::compare_data()
QTest::newRow("data8") << upper << lower << -1 << 0;
// embedded nulls
- // These dont work as of now. Its OK that these dont work since \0 is not a valid unicode
+ // These don't work as of now. It's OK that these don't work since \0 is not a valid unicode
/*QTest::newRow("data9") << QString(QByteArray("\0", 1)) << QString(QByteArray("\0", 1)) << 0 << 0;
QTest::newRow("data10") << QString(QByteArray("\0", 1)) << QString("") << 1 << 1;
QTest::newRow("data11") << QString("") << QString(QByteArray("\0", 1)) << -1 << -1;
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 79d01d8842..c18d81a9af 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -868,7 +868,7 @@ void tst_QTextDocumentFragment::unorderedListEnumeration()
void tst_QTextDocumentFragment::resetHasBlockAfterClosedBlockTags()
{
- // when closing tags we have to make sure hasBlock in import() gets resetted
+ // when closing tags we have to make sure hasBlock in import() gets reset
const char html[] = "<body><table><tr><td><td><p></table><p></body>";
setHtml(QString::fromLatin1(html));
QVERIFY(!doc->isEmpty());
diff --git a/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h b/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h
index 577c59ab0c..bb054b5fd1 100644
--- a/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h
+++ b/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h
@@ -3703,7 +3703,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
/* These requests allow control to move from the simulated CPU to the
- real CPU, calling an arbitary function.
+ real CPU, calling an arbitrary function.
Note that the current ThreadId is inserted as the first argument.
So this call:
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 0509c2f489..9300579bad 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -1787,7 +1787,7 @@ void tst_QSslSocket::disconnectFromHostWhenConnecting()
QVERIFY(socket->isOpen());
QCOMPARE(socket->bytesToWrite(), qint64(0));
- // dont forget to login
+ // don't forget to login
QCOMPARE((int) socket->write("USER ftptest\r\n"), 14);
}
@@ -1829,7 +1829,7 @@ void tst_QSslSocket::resetProxy()
socket.connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
QVERIFY(! socket.waitForConnected(10000));
- // dont forget to login
+ // don't forget to login
QCOMPARE((int) socket.write("USER ftptest\r\n"), 14);
QCOMPARE((int) socket.write("PASS password\r\n"), 15);
diff --git a/tests/auto/other/atwrapper/atWrapper.cpp b/tests/auto/other/atwrapper/atWrapper.cpp
index 81d1965bbb..121f742201 100644
--- a/tests/auto/other/atwrapper/atWrapper.cpp
+++ b/tests/auto/other/atwrapper/atWrapper.cpp
@@ -565,7 +565,7 @@ bool atWrapper::loadConfig( QString path )
{
qDebug() << "Loading config file from ... " << path;
configPath = path;
- //If there is no config file, dont proceed;
+ //If there is no config file, don't proceed;
if ( !QFile::exists( path ) )
{
return false;
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index a07d7cf7a9..959170a5b3 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@@ -455,7 +455,7 @@ void tst_QMessageBox::staticSourceCompat()
QCOMPARE(ret, 1);
QCOMPARE(keyToSend, -1);
- if (0) { // dont run these tests since the dialog wont close!
+ if (0) { // don't run these tests since the dialog won't close!
keyToSend = Qt::Key_Escape;
sendKeySoon();
ret = QMessageBox::information(0, "title", "text", "Yes", "No", QString(), 1);
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 107ddd53aa..2a31e8ebf4 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -2522,7 +2522,7 @@ void tst_QWizard::task161658_alignments()
QWizardPage page;
page.setTitle("Title");
- page.setSubTitle("SUBTITLE#: The subtitle bust be alligned with the rest of the widget");
+ page.setSubTitle("SUBTITLE#: The subtitle bust be aligned with the rest of the widget");
QLabel label1("Field:");
QLineEdit lineEdit1;
diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 96f7249e3c..d1732382c0 100644
--- a/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -528,7 +528,7 @@ void tst_QSortFilterProxyModel::insertRows_data()
<< "Three")
<< 2;
- QTest::newRow("insert one row in the begining")
+ QTest::newRow("insert one row in the beginning")
<< (QStringList()
<< "Two"
<< "Three"
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index d6cdf00218..6604d922a4 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -3852,7 +3852,7 @@ public:
QItemSelectionModel *oldModel = view->selectionModel();
if (oldModel != m_selectionModel)
delete oldModel;
- view->setModel(this); // this creates a new selection model for the view, but we dont want it either ...
+ view->setModel(this); // this creates a new selection model for the view, but we don't want it either ...
oldModel = view->selectionModel();
view->setSelectionModel(m_selectionModel);
delete oldModel;
diff --git a/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp b/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
index d14c75bbac..4e936638f7 100644
--- a/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
+++ b/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
@@ -154,7 +154,7 @@ void tst_QAbstractSpinBox::task228728_cssselector()
{
//QAbstractSpinBox does some call to stylehint into his constructor.
//so while the stylesheet want to access property, it should not crash
- qApp->setStyleSheet("[alignement=\"1\"], [text=\"foo\"] { color:black; }" );
+ qApp->setStyleSheet("[alignment=\"1\"], [text=\"foo\"] { color:black; }" );
QSpinBox box;
}