Fix some typos
Change-Id: I4e8d9bd8ea66ec810e4f1fbfd8ddbf25c4b3d980 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
This commit is contained in:
parent
21e809a486
commit
7706c31eaa
@ -114,7 +114,7 @@
|
||||
QUrl is capable of detecting many errors in URLs while parsing it or when
|
||||
components of the URL are set with individual setter methods (like
|
||||
setScheme(), setHost() or setPath()). If the parsing or setter function is
|
||||
succesful, any previously recorded error conditions will be discarded.
|
||||
successful, any previously recorded error conditions will be discarded.
|
||||
|
||||
By default, QUrl setter methods operate in QUrl::TolerantMode, which means
|
||||
they accept some common mistakes and mis-representation of data. An
|
||||
|
@ -132,7 +132,7 @@ static int bpsIOHandler(int fd, int io_events, void *data)
|
||||
}
|
||||
|
||||
// post unblock event to our thread; in this callback the bps channel is
|
||||
// guarenteed to be the same that was active when bps_add_fd was called
|
||||
// guaranteed to be the same that was active when bps_add_fd was called
|
||||
result = bps_push_event(event);
|
||||
if (result != BPS_SUCCESS) {
|
||||
qWarning("QEventDispatcherBlackberryPrivate::QEventDispatcherBlackberry: bps_push_event() failed");
|
||||
|
@ -394,7 +394,7 @@ bool QBasicMutex::isRecursive()
|
||||
to wait on the mutex. There are two tricks to keep in mind:
|
||||
We don't want to increment waiters after we checked no threads are waiting
|
||||
(waiters == 0). That's why we atomically set the BigNumber flag on waiters when
|
||||
we check waiters. Similarily, if waiters is decremented right after we checked,
|
||||
we check waiters. Similarly, if waiters is decremented right after we checked,
|
||||
the mutex would be unlocked (d->wakeUp() has (or will) be called), but there is
|
||||
no thread waiting. This is only happening if there was a timeout in tryLock at the
|
||||
same time as the mutex is unlocked. So when there was a timeout, we set the
|
||||
@ -531,7 +531,7 @@ void QBasicMutex::unlockInternal() Q_DECL_NOTHROW
|
||||
|
||||
QMutexPrivate *d = reinterpret_cast<QMutexPrivate *>(copy);
|
||||
|
||||
// If no one is waiting for the lock anymore, we shoud reset d to 0x0.
|
||||
// If no one is waiting for the lock anymore, we should reset d to 0x0.
|
||||
// Using fetchAndAdd, we atomically check that waiters was equal to 0, and add a flag
|
||||
// to the waiters variable (BigNumber). That way, we avoid the race in which waiters is
|
||||
// incremented right after we checked, because we won't increment waiters if is
|
||||
|
@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
|
||||
* http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap02.html#tag_02_01_06 )
|
||||
*
|
||||
* The macro _POSIX_MONOTONIC_CLOCK can therefore assume the following values:
|
||||
* -1 monotonic clock is never supported on this sytem
|
||||
* -1 monotonic clock is never supported on this system
|
||||
* 0 monotonic clock might be supported, runtime check is needed
|
||||
* >1 (such as 200809L) monotonic clock is always supported
|
||||
*
|
||||
|
@ -133,7 +133,7 @@ void QDirectFbBlitter::alphaFillRect(const QRectF &rect, const QColor &color, QP
|
||||
int x, y, w, h;
|
||||
DFBResult result;
|
||||
|
||||
// check paramters
|
||||
// check parameters
|
||||
rect.toRect().getRect(&x, &y ,&w, &h);
|
||||
if ((w <= 0) || (h <= 0)) return;
|
||||
|
||||
|
@ -2631,7 +2631,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
|
||||
buttonOption.QStyleOption::operator=(*comboBox);
|
||||
buttonOption.rect = rect;
|
||||
buttonOption.state = (comboBox->state & (State_Enabled | State_MouseOver | State_HasFocus))
|
||||
| State_KeyboardFocusChange; // Allways show hig
|
||||
| State_KeyboardFocusChange; // Always show hig
|
||||
|
||||
if (sunken) {
|
||||
buttonOption.state |= State_Sunken;
|
||||
|
@ -78,7 +78,7 @@ QString uniqueName(const QString &key, const QStyleOption *option, const QSize &
|
||||
qreal dpiScaled(qreal value)
|
||||
{
|
||||
#ifdef Q_OS_MAC
|
||||
// On mac the DPI is allways 72 so we should not scale it
|
||||
// On mac the DPI is always 72 so we should not scale it
|
||||
return value;
|
||||
#else
|
||||
static const qreal scale = qreal(qt_defaultDpiX()) / 96.0;
|
||||
|
@ -6497,7 +6497,7 @@ void tst_QNetworkReply::qtbug27161httpHeaderMayBeDamaged_data(){
|
||||
|
||||
/*
|
||||
* Purpose of this test is to check whether a content from server is parsed correctly
|
||||
* if it is splitted into two parts.
|
||||
* if it is split into two parts.
|
||||
*/
|
||||
void tst_QNetworkReply::qtbug27161httpHeaderMayBeDamaged(){
|
||||
QFETCH(QByteArray, firstPacket);
|
||||
|
@ -579,7 +579,7 @@ void tst_QSqlQuery::mysqlOutValues()
|
||||
|
||||
void tst_QSqlQuery::bindBool()
|
||||
{
|
||||
// QTBUG-27763: bool value got converted to int 127 by mysql driver becuase sizeof(bool) < sizeof(int).
|
||||
// QTBUG-27763: bool value got converted to int 127 by mysql driver because sizeof(bool) < sizeof(int).
|
||||
// The problem was the way the bool value from the application was handled. It doesn't matter
|
||||
// whether the table column type is BOOL or INT. Use INT here because all DBMSs have it and all
|
||||
// should pass this test.
|
||||
|
@ -105,9 +105,9 @@ inline void setComboBoxValue(QComboBox *c, int v)
|
||||
c->setCurrentIndex(c->findData(QVariant(v)));
|
||||
}
|
||||
|
||||
static inline void addButton(const QString &desription, QBoxLayout *layout, QObject *receiver, const char *slotFunc)
|
||||
static inline void addButton(const QString &description, QBoxLayout *layout, QObject *receiver, const char *slotFunc)
|
||||
{
|
||||
QPushButton *button = new QPushButton(desription);
|
||||
QPushButton *button = new QPushButton(description);
|
||||
QObject::connect(button, SIGNAL(clicked()), receiver, slotFunc);
|
||||
layout->addWidget(button);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user