AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix minor typos in docs, printed messages & comments

Browse Source 
Missing apostrophes

Change-Id: I3ef5e9d494fb7a37f8e6075f24cd3a274e572c23
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
Sze Howe Koh 2013-01-27 12:58:38 +08:00 committed by The Qt Project
parent 5f71203dd0
commit 7bb43454b8
23 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qmetaobject_moc_p.h
View File

@ -71,7 +71,7 @@ static QByteArray normalizeTypeInternal(const char *t, const char *e, bool fixSc
break;
}
/*
We musn't convert 'char * const *' into 'const char **'
We mustn't convert 'char * const *' into 'const char **'
and we must beware of 'Bar<const Bla>'.
*/
if (t[i] == '&' || t[i] == '*' ||t[i] == '<')

2
src/gui/itemmodels/qstandarditemmodel.cpp
View File

@ -1470,7 +1470,7 @@ void QStandardItem::insertRow(int row, const QList<QStandardItem*> &items)
}
/*!
Inserts \a items at \a row. The column count wont be changed.
Inserts \a items at \a row. The column count won't be changed.
\sa insertRow(), insertColumn()
*/

4
src/gui/kernel/qopenglcontext.cpp
View File

@ -165,7 +165,7 @@ QOpenGLContext *QOpenGLContextPrivate::setCurrentContext(QOpenGLContext *context
QGuiGLThreadContext *threadContext = qwindow_context_storage.localData();
if (!threadContext) {
if (!QThread::currentThread()) {
qWarning("No QTLS available. currentContext wont work");
qWarning("No QTLS available. currentContext won't work");
return 0;
}
threadContext = new QGuiGLThreadContext;
@ -667,7 +667,7 @@ QScreen *QOpenGLContext::screen() const
}
/*!
internal: Needs to have a pointer to qGLContext. But since this is in Qt GUI we cant
internal: Needs to have a pointer to qGLContext. But since this is in Qt GUI we can't
have any type information.
\internal

2
src/network/socket/qlocalsocket_unix.cpp
View File

@ -248,7 +248,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode)
QLatin1String("QLocalSocket::connectToServer"));
return;
}
// set non blocking so we can try to connect and it wont wait
// set non blocking so we can try to connect and it won't wait
int flags = fcntl(d->connectingSocket, F_GETFL, 0);
if (-1 == flags
|| -1 == (fcntl(d->connectingSocket, F_SETFL, flags | O_NONBLOCK))) {

2
src/plugins/platforms/cocoa/qmacclipboard.mm
View File

@ -135,7 +135,7 @@ OSStatus QMacPasteboard::promiseKeeper(PasteboardRef paste, PasteboardItemID id,
}
if (!promise.itemId && flavorAsQString == QLatin1String("com.trolltech.qt.MimeTypeName")) {
// we have promised this data, but wont be able to convert, so return null data.
// we have promised this data, but won't be able to convert, so return null data.
// This helps in making the application/x-qt-mime-type-name hidden from normal use.
QByteArray ba;
QCFType<CFDataRef> data = CFDataCreate(0, (UInt8*)ba.constData(), ba.size());

2
src/plugins/platforms/cocoa/qnsview.mm
View File

@ -1025,7 +1025,7 @@ static QTouchDevice *touchDevice = 0;
- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint
{
// We dont support cursor movements using mouse while composing.
// We don't support cursor movements using mouse while composing.
Q_UNUSED(aPoint);
return NSNotFound;
}

2
src/plugins/platforms/cocoa/qprintengine_mac.mm
View File

@ -109,7 +109,7 @@ bool QMacPrintEngine::end()
if (d->state == QPrinter::Aborted)
return true; // I was just here a function call ago :)
if (d->paintEngine->type() == QPaintEngine::CoreGraphics) {
// We dont need the paint engine to call restoreGraphicsState()
// We don't need the paint engine to call restoreGraphicsState()
static_cast<QCoreGraphicsPaintEngine*>(d->paintEngine)->d_func()->stackCount = 0;
static_cast<QCoreGraphicsPaintEngine*>(d->paintEngine)->d_func()->hd = 0;
}

2
src/plugins/platforms/openwfd/qopenwfdport.cpp
View File

@ -125,7 +125,7 @@ void QOpenWFDPort::attach()
}
if (mPipeline == WFD_INVALID_HANDLE) {
qWarning("Failed to create pipeline and cant bind it to port");
qWarning("Failed to create pipeline and can't bind it to port");
}
WFDint geomerty[] = { 0, 0, mPixelSize.width(), mPixelSize.height() };

2
src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
View File

@ -247,7 +247,7 @@ static bool addFontToDatabase(QString familyName, const QString &scriptName,
value = fontCache.value(faceName);
//Fallback if we havent cached the font yet or the font got removed/renamed iterate again over all fonts
//Fallback if we haven't cached the font yet or the font got removed/renamed iterate again over all fonts
if (value.isEmpty() || !QFile::exists(value)) {
QSettings settings(QSettings::SystemScope, QStringLiteral("Qt-Project"), QStringLiteral("Qtbase"));
settings.beginGroup(QStringLiteral("CEFontCache"));

2
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -6212,7 +6212,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event)
// if the gesture was ignored by its target, we will update the
// targetItems list with a possible target items (items that
// want to receive partial gestures).
// ### wont' work if the target was destroyed in the event
// ### won't work if the target was destroyed in the event
// we will just stop delivering it.
if (receiver && receiver.data() == gestureTargets.value(g, 0))
ignoredGestures.insert(g);

2
src/widgets/graphicsview/qgraphicswidget_p.cpp
View File

@ -466,7 +466,7 @@ static QSizeF closestAcceptableSize(const QSizeF &proposed,
do {
if (maxw - minw < 0.1) {
// we still havent found anything, cut off binary search
// we still haven't found anything, cut off binary search
minw = maxw;
minh = maxh;
}

8
src/widgets/itemviews/qtreewidget.cpp
View File

@ -1896,7 +1896,7 @@ void QTreeWidgetItem::addChild(QTreeWidgetItem *child)
/*!
Inserts the \a child item at \a index in the list of children.
If the child has already been inserted somewhere else it wont be inserted again.
If the child has already been inserted somewhere else it won't be inserted again.
*/
void QTreeWidgetItem::insertChild(int index, QTreeWidgetItem *child)
{
@ -1998,7 +1998,7 @@ void QTreeWidgetItem::addChildren(const QList<QTreeWidgetItem*> &children)
Inserts the given list of \a children into the list of the item children at \a index .
Children that have already been inserted somewhere else wont be inserted.
Children that have already been inserted somewhere else won't be inserted.
*/
void QTreeWidgetItem::insertChildren(int index, const QList<QTreeWidgetItem*> &children)
{
@ -2621,7 +2621,7 @@ int QTreeWidget::topLevelItemCount() const
/*!
Inserts the \a item at \a index in the top level in the view.
If the item has already been inserted somewhere else it wont be inserted.
If the item has already been inserted somewhere else it won't be inserted.
\sa addTopLevelItem(), columnCount()
*/
@ -2675,7 +2675,7 @@ int QTreeWidget::indexOfTopLevelItem(QTreeWidgetItem *item) const
Inserts the list of \a items at \a index in the top level in the view.
Items that have already been inserted somewhere else wont be inserted.
Items that have already been inserted somewhere else won't be inserted.
\sa addTopLevelItems()
*/

2
src/xml/dom/qdom.cpp
View File

@ -261,7 +261,7 @@ public:
/**
* If true, then the node will redirect insert/remove calls
* to its parent by calling QDomNodePrivate::appendChild or removeChild.
* In addition the map wont increase or decrease the reference count
* In addition the map won't increase or decrease the reference count
* of the nodes it contains.
*
* By default this value is false and the map will handle reference counting

2
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -2914,7 +2914,7 @@ void tst_QFile::map()
QVERIFY(file.unmap(memory));
QCOMPARE(file.error(), QFile::NoError);
// hpux wont let you map multiple times.
// hpux won't let you map multiple times.
#if !defined(Q_OS_HPUX) && !defined(Q_USE_DEPRECATED_MAP_API) && !defined(Q_OS_WINCE)
// exotic test to make sure that multiple maps work

2
tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
View File

@ -67,7 +67,7 @@ public:
void cleanupTestArea(QAbstractItemModel *model);
enum Read {
ReadOnly, // wont perform remove(), insert(), and setData()
ReadOnly, // won't perform remove(), insert(), and setData()
ReadWrite
};
enum Contains {

2
tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
View File

@ -478,7 +478,7 @@ void tst_QItemModel::parent()
currentModel = testModels->createModel(modelType);
QVERIFY(currentModel);
// Make sure the model wont crash and will return an invalid QModelIndex
// Make sure the model won't crash and will return an invalid QModelIndex
// when asked for the parent of an invalid index.
QCOMPARE(currentModel->parent(QModelIndex()), QModelIndex());

2
tests/auto/corelib/kernel/qsharedmemory/test/tst_qsharedmemory.cpp
View File

@ -491,7 +491,7 @@ void tst_QSharedMemory::useTooMuchMemory()
QVERIFY(sm->data() == 0);
if (sm->error() != QSharedMemory::OutOfResources)
qDebug() << sm->error() << sm->errorString();
// ### Linux wont return OutOfResources if there are not enough semaphores to use.
// ### Linux won't return OutOfResources if there are not enough semaphores to use.
QVERIFY(sm->error() == QSharedMemory::OutOfResources
|| sm->error() == QSharedMemory::LockError);
QVERIFY(sm->errorString() != QString());

2
tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
View File

@ -1489,7 +1489,7 @@ void tst_QCssParser::gradient_data()
"spread: repeat, stop:0.2 rgb(1, 2, 3), stop:0.5 rgba(1, 2, 3, 4))" << "conical" << QPointF(4, 2) << QPointF()
<< 2 << qreal(0.2) << QColor(1, 2, 3) << qreal(0.5) << QColor(1, 2, 3, 4);
/* wont pass: stop values are expected to be sorted
/* won't pass: stop values are expected to be sorted
QTest::newRow("unsorted-stop") <<
"selection-background: lineargradient(x1:0, y1:0, x2:0, y2:1, "
"stop:0.5 green, stop:0.2 red)" << QPointF(0, 0) << QPointF(0, 1)

2
tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
View File

@ -468,7 +468,7 @@ void tst_QNetworkCookie::parseSingleCookie_data()
cookie.setExpirationDate(QDateTime(QDate(2010, 2, 3), QTime(0, 0), Qt::UTC));
QTest::newRow("ambiguousd-2") << "a=b;expires=2/3/10 0:0" << cookie;
// FYI If you try these in Firefox it wont set a cookie for the following two string
// FYI If you try these in Firefox it won't set a cookie for the following two string
// because 03 is turned into the year at which point it is expired
cookie.setExpirationDate(QDateTime(QDate(2003, 2, 10), QTime(0, 0), Qt::UTC));
QTest::newRow("ambiguousd-3") << "a=b;expires=2/10/3 0:0" << cookie;

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

@ -1001,7 +1001,7 @@ void tst_QSslSocket::protocolServerSide_data()
QTest::newRow("ssl3-tls1ssl3") << QSsl::SslV3 << QSsl::TlsV1SslV3 << true;
QTest::newRow("ssl3-secure") << QSsl::SslV3 << QSsl::SecureProtocols << true;
#ifndef OPENSSL_NO_SSL2
QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << false; // we wont set a SNI header here because we connect to a
QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << false; // we won't set a SNI header here because we connect to a
// numerical IP, so OpenSSL will send a SSL 2 handshake
#else
QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << true;
@ -1014,7 +1014,7 @@ void tst_QSslSocket::protocolServerSide_data()
QTest::newRow("tls1-tls1ssl3") << QSsl::TlsV1_0 << QSsl::TlsV1SslV3 << true;
QTest::newRow("tls1.0-secure") << QSsl::TlsV1_0 << QSsl::SecureProtocols << true;
#ifndef OPENSSL_NO_SSL2
QTest::newRow("tls1.0-any") << QSsl::TlsV1_0 << QSsl::AnyProtocol << false; // we wont set a SNI header here because we connect to a
QTest::newRow("tls1.0-any") << QSsl::TlsV1_0 << QSsl::AnyProtocol << false; // we won't set a SNI header here because we connect to a
// numerical IP, so OpenSSL will send a SSL 2 handshake
#else
QTest::newRow("tls1.0-any") << QSsl::TlsV1_0 << QSsl::AnyProtocol << true;

2
tests/auto/other/modeltest/modeltest.cpp
View File

@ -255,7 +255,7 @@ void ModelTest::index()
void ModelTest::parent()
{
// qDebug() << "p";
// Make sure the model wont crash and will return an invalid QModelIndex
// Make sure the model won't crash and will return an invalid QModelIndex
// when asked for the parent of an invalid index.
QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() );

2
tools/configure/configureapp.cpp
View File

@ -1916,7 +1916,7 @@ QString Configure::defaultTo(const QString &option)
}
// By default we do not want to compile OCI driver when compiling with
// MinGW, due to lack of such support from Oracle. It prob. wont work.
// MinGW, due to lack of such support from Oracle. It prob. won't work.
// (Customer may force the use though)
if (dictionary["QMAKESPEC"].endsWith("-g++")
&& option == "SQL_OCI")

2
util/local_database/xpathlite.py
View File

@ -248,7 +248,7 @@ def _findEntry(base, path, draft=None, attribute=None):
# see http://www.unicode.org/reports/tr35/#Common_Elements
aliasfile = os.path.dirname(file) + "/" + alias + ".xml"
if not os.path.isfile(aliasfile):
raise Error("findEntry: fatal error: found an alias '%s' to '%s', but the alias file couldnt be found" % (filename, alias))
raise Error("findEntry: fatal error: found an alias '%s' to '%s', but the alias file couldn't be found" % (filename, alias))
# found an alias, recurse into parsing it
result = _findEntry(aliasfile, path, draft, attribute)
return result