\fn QAnimationDriver::started()
This signal is emitted by the animation framework to notify the driver
- that continous animation has started.
+ that continuous animation has started.
\internal
*/
\fn QAnimationDriver::stopped()
This signal is emitted by the animation framework to notify the driver
- that continous animation has stopped.
+ that continuous animation has stopped.
\internal
*/
template <>
struct QAtomicOpsBySize<4> : QGenericAtomicOps<QAtomicOpsBySize<4> >
{
- // The 32-bit Interlocked*() API takes paramters as longs.
+ // The 32-bit Interlocked*() API takes parameters as longs.
typedef long Type;
static inline bool isReferenceCountingNative() { return true; }
\since 5.0
Tells the compiler that the current point cannot be reached by any
- execution, so it may optimise any code paths leading here as dead code, as
+ execution, so it may optimize any code paths leading here as dead code, as
well as code continuing from here.
This macro is useful to mark impossible conditions. For example, given the
Returns the reconstructed query string, formed from the key-value pairs
currently stored in this QUrlQuery object and separated by the query
delimiters chosen for this object. The keys and values are encoded using
- the options given by the \a encoding paramter.
+ the options given by the \a encoding parameter.
For this function, the only ambiguous delimiter is the hash ("#"), as in
URLs it is used to separate the query string from the fragment that may
This enum describes the type of error that occurred during the parsing of a JSON document.
- \value NoError No error occured
+ \value NoError No error occurred
\value UnterminatedObject An object is not correctly terminated with a closing curly bracket
\value MissingNameSeparator A comma separating different items is missing
\value UnterminatedArray The array is not correctly terminated with a closing square bracket
\value Object An object. Use toObject() to convert to a QJsonObject.
\value Undefined The value is undefined. This is usually returned as an
error condition, when trying to read an out of bounds value
- in an array or a non existant key in an object.
+ in an array or a non existent key in an object.
*/
/*!
// An exception was thrown when calling qt_plugin_query_verification_data().
// This usually happens when plugin is compiled with the /clr compiler flag,
// & will only work if the dependencies are loaded & DLLMain() is called.
- // LoadLibrary() will do this, try once with this & if it fails dont load.
+ // LoadLibrary() will do this, try once with this & if it fails don't load.
retryLoadLibrary = !retryLoadLibrary;
}
#endif
old_waiters = d->waiters.load();
if (old_waiters == -QMutexPrivate::BigNumber) {
// we are unlocking, and the thread that unlocks is about to change d to 0
- // we try to aquire the mutex by changing to dummyLocked()
+ // we try to acquire the mutex by changing to dummyLocked()
if (d_ptr.testAndSetAcquire(d, dummyLocked())) {
- // Mutex aquired
+ // Mutex acquired
Q_ASSERT(d->waiters.load() == -QMutexPrivate::BigNumber || d->waiters.load() == 0);
d->waiters.store(0);
d->deref();
d->deref();
}
-//The freelist managment
+//The freelist management
namespace {
struct FreeListConstants : QFreeListDefaultConstants {
enum { BlockCount = 4, MaxIndex=0xffff };
freelist()->release(id);
}
-// atomically substract "value" to the waiters, and remove the QMutexPrivate::BigNumber flag
+// atomically subtract "value" to the waiters, and remove the QMutexPrivate::BigNumber flag
void QMutexPrivate::derefWaiters(int value)
{
int old_waiters;
#ifndef QT_NO_DATESTRING
// These anonymous functions tidy up QDateTime::fromString()
-// and avoid confusion of reponsibility between it and QTime::fromString().
+// and avoid confusion of responsibility between it and QTime::fromString().
namespace {
inline bool isMidnight(int hour, int minute, int second, int msec)
{
\li the input cannot possibly match the regular expression;
\li the input does match the regular expression;
\li the input does not match the regular expression right now,
- but it will if more charaters will be added to it.
+ but it will if more characters will be added to it.
\endlist
Note that these three cases represent exactly the possible states of a
string, but also at a newline character right before the end of the string;
that is, the previous pattern matches against the string "this pattern must
match exactly\\n". Also, the behaviour of both the \c{^} and the \c{$}
- anchors changes if the MultiLineOption is set either explicitely (as a
+ anchors changes if the MultiLineOption is set either explicitly (as a
pattern option) or implicitly (as a directive inside the pattern string).
Therefore, in the most general case, you should wrap the pattern between
\value UseUnicodePropertiesOption
The meaning of the \c{\w}, \c{\d}, etc., character classes, as well as
the meaning of their counterparts (\c{\W}, \c{\D}, etc.), is changed
- from matching ASCII charaters only to matching any character with the
+ from matching ASCII characters only to matching any character with the
corresponding Unicode property. For instance, \c{\d} is changed to
match any character with the Unicode Nd (decimal digit) property;
\c{\w} to match any character with either the Unicode L (letter) or N
Returns true if the regular expression partially matched against the
subject string, or false otherwise.
- \note Only a match that explicitely used the one of the partial match types
+ \note Only a match that explicitly used the one of the partial match types
can yield a partial match. Still, if such a match succeeds totally, this
function will return false, while hasMatch() will return true.
/*!
\fn int QAccessibleTextInterface::characterCount() const
- Returns the lenght of the text (total size including spaces).
+ Returns the length of the text (total size including spaces).
*/
/*!
QOpenGLContext internally keeps track of a QOpenGLContextGroup object which
can be accessed with shareGroup(), and which can be used to find all the
contexts in a given share group. A share group consists of all contexts that
- have been succesfully initialized and are sharing with an existing context in
+ have been successfully initialized and are sharing with an existing context in
the share group. A non-sharing context has a share group consisting of a
single context.
}
}
-// Overriden methods to lock the graphics memory
+// Overridden methods to lock the graphics memory
void QBlitterPaintEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode)
{
Q_D(QBlitterPaintEngine);
break;
}
- // For Happy Eyeballs the networkLayerState is set to Unkown
+ // For Happy Eyeballs the networkLayerState is set to Unknown
// untill we have started the first connection attempt. So no
// request will be started untill we know if IPv4 or IPv6
// should be used.
{
networkLayerState = InProgress;
- // check if we already now can descide if this is IPv4 or IPv6
+ // check if we already now can decide if this is IPv4 or IPv6
QString lookupHost = hostName;
#ifndef QT_NO_NETWORKPROXY
if (networkProxy.capabilities() & QNetworkProxy::HostNameLookupCapability) {
emit reply->dataReadProgress(replyPrivate->totalProgress, replyPrivate->bodyLength);
}
} else if (haveRead == -1) {
- // Some error occured
+ // Some error occurred
connection->d_func()->emitReplyError(socket, reply, QNetworkReply::ProtocolFailure);
break;
}
if (socket->bytesAvailable()) {
// Read everything from the socket into the reply buffer.
// we can ignore the readbuffersize as the data is already
- // in memory and we will not recieve more data on the socket.
+ // in memory and we will not receive more data on the socket.
reply->setReadBufferSize(0);
_q_receiveReply();
#ifndef QT_NO_SSL
int ret = inflate(inflateStrm, Z_NO_FLUSH);
//All negative return codes are errors, in the context of HTTP compression, Z_NEED_DICT is also an error.
- // in the case where we get Z_DATA_ERROR this could be because we recieved raw deflate compressed data.
+ // in the case where we get Z_DATA_ERROR this could be because we received raw deflate compressed data.
if (ret == Z_DATA_ERROR && !triedRawDeflate) {
inflateEnd(inflateStrm);
triedRawDeflate = true;
qWarning("QAbstractSocketPrivate::_q_startConnecting() received hostInfo for wrong lookup ID %d expected %d", hostInfo.lookupId(), hostLookupId);
}
- // Only add the addresses for the prefered network layer.
- // Or all if prefered network layer is not set.
+ // Only add the addresses for the preferred network layer.
+ // Or all if preferred network layer is not set.
if (preferredNetworkLayerProtocol == QAbstractSocket::UnknownNetworkLayerProtocol || preferredNetworkLayerProtocol == QAbstractSocket::AnyIPProtocol) {
addresses = hostInfo.addresses();
} else {
QHostAddress address;
if (addr.protocol() == QAbstractSocket::AnyIPProtocol)
- address = QHostAddress::AnyIPv4; //SOCKS5 doesnt support dual stack, and there isn't any implementation of udp on ipv6 yet
+ address = QHostAddress::AnyIPv4; //SOCKS5 doesn't support dual stack, and there isn't any implementation of udp on ipv6 yet
else
address = addr;
return reinterpret_cast<QGLContext *>(context->qGLContextHandle());
}
QGLContext *glContext = new QGLContext(context);
- //Dont call create on context. This can cause the platformFormat to be set on the widget, which
+ //Don't call create on context. This can cause the platformFormat to be set on the widget, which
//will cause the platformWindow to be recreated.
return glContext;
}
WFDint overflow = wfdGetEventAttribi(mDevice,mEvent, WFD_EVENT_PIPELINE_BIND_QUEUE_OVERFLOW);
if (overflow == WFD_TRUE) {
- qDebug() << "PIPELINE_BIND_QUEUE_OVERFLOW event occured";
+ qDebug() << "PIPELINE_BIND_QUEUE_OVERFLOW event occurred";
}
WFDint pipelineId = wfdGetEventAttribi(mDevice,mEvent,WFD_EVENT_PIPELINE_BIND_PIPELINE_ID);
QOpenWFDIntegration::~QOpenWFDIntegration()
{
- //dont delete screens since they are deleted by the devices
+ //don't delete screens since they are deleted by the devices
qDebug() << "deleting platform integration";
for (int i = 0; i < mDevices.size(); i++) {
delete mDevices[i];
#include <xcb/render.h>
#endif
-#ifdef XCB_USE_EGL //dont pull in eglext prototypes
+#ifdef XCB_USE_EGL //don't pull in eglext prototypes
#include <EGL/egl.h>
#endif
break;
case XI_Motion:
// Report TabletMove only when the stylus is touching the tablet.
- // No possiblity to report proximity motion (no suitable Qt event exists yet).
+ // No possibility to report proximity motion (no suitable Qt event exists yet).
if (tabletData->down)
xi2ReportTabletEvent(*tabletData, xiEvent);
break;
name of some other QML class node. If so, then this node's
parent will be a NameCollisionNode.This function sets the
NameCollisionNode's current child to this node. This is
- important when outputing the documentation for this node,
+ important when outputting the documentation for this node,
when, for example, the documentation contains a link to
the page being output. We don't want to generate a link
to the disambiguation page if we can avoid it, and to be
in >> hiddenSectionSize;
in >> length;
- int unusedSectionCount; // For compability
+ int unusedSectionCount; // For compatibility
in >> unusedSectionCount;
in >> movableSections;
in >> clickableSections;
in >> sectionItems;
// In Qt4 we had a vector of spans where one span could hold information on more sections.
// Now we have an itemvector where one items contains information about one section
- // For backward compability with Qt4 we do the following
+ // For backward compatibility with Qt4 we do the following
QVector<SectionItem> newSectionItems;
for (int u = 0; u < sectionItems.count(); ++u) {
int count = sectionItems.at(u).tmpDataStreamSectionCount;
QVector<int> finals; // indices in reverse order of each property's final occurrence
{
- // scan decls for final occurence of each "qproperty"
+ // scan decls for final occurrence of each "qproperty"
QSet<const QString> propertySet;
for (int i = decls.count() - 1; i >= 0; --i) {
const QString property = decls.at(i).d->property;
int left, top, right, bottom;
w->getContentsMargins(&left, &top, &right, &bottom);
- //we need to substract the contents margin (it will be added by the caller)
+ //we need to subtract the contents margin (it will be added by the caller)
QSize min = w->minimumSize() - QSize(left + right, top + bottom);
QSize max = w->maximumSize() - QSize(left + right, top + bottom);
QDomNodePrivate* p = first;
while (p) {
if (p->isEntity())
- // Dont use normal insert function since we would create infinite recursion
+ // Don't use normal insert function since we would create infinite recursion
entities->map.insertMulti(p->nodeName(), p);
if (p->isNotation())
- // Dont use normal insert function since we would create infinite recursion
+ // Don't use normal insert function since we would create infinite recursion
notations->map.insertMulti(p->nodeName(), p);
p = p->next;
}
len += 4;
i += 5;
} else if (d[i] == '&' && i + 1 < len && d[i+1] == '#') {
- // Dont encode < or " or &custom;.
+ // Don't encode < or " or &custom;.
// Only encode character references
tmp.replace(i, 1, "&");
d = tmp.constData();
QVERIFY2(keys.contains("string"), "key string not found");
QVERIFY2(keys.contains("boolean"), "key boolean not found");
- // if we put a JsonValue into the JsonObject and retreive
+ // if we put a JsonValue into the JsonObject and retrieve
// it, it should be identical.
QJsonValue value(QLatin1String("foo"));
object.insert("value", value);
QCOMPARE(array.at(2).toBool(), true);
QCOMPARE(array.size(), 3);
- // if we put a JsonValue into the JsonArray and retreive
+ // if we put a JsonValue into the JsonArray and retrieve
// it, it should be identical.
QJsonValue value(QLatin1String("foo"));
array.append(value);
// But make sure that we don't hide anything else
QCOMPARE(e->layoutData->items.size(), 11);
QCOMPARE(e->layoutData->items[0].num_glyphs, ushort(7)); // Thai: The ZWJ and ZWNJ characters are inherited, so should be part of the thai script
- QCOMPARE(e->layoutData->items[1].num_glyphs, ushort(1)); // Common: The smart quotes cannot be handled by thai, so should be a seperate item
+ QCOMPARE(e->layoutData->items[1].num_glyphs, ushort(1)); // Common: The smart quotes cannot be handled by thai, so should be a separate item
QCOMPARE(e->layoutData->items[2].num_glyphs, ushort(1)); // Thai: Thai character
QCOMPARE(e->layoutData->items[3].num_glyphs, ushort(1)); // Common: Ellipsis
QCOMPARE(e->layoutData->items[4].num_glyphs, ushort(1)); // Thai: Thai character
QTest::newRow("ftp-tag") << (int)QNetworkProxyQuery::TcpSocket << QUrl() << QString("ftp") << QString("qt-project.org") << 21 << (int)QNetworkProxy::TunnelingCapability;
QTest::newRow("https-tag") << (int)QNetworkProxyQuery::TcpSocket << QUrl() << QString("https") << QString("qt-project.org") << 443 << (int)QNetworkProxy::TunnelingCapability;
#ifdef Q_OS_WIN
- //in Qt 4.8, "socks" would get the socks proxy, but we dont want to enforce that for all platforms
+ //in Qt 4.8, "socks" would get the socks proxy, but we don't want to enforce that for all platforms
QTest::newRow("socks-tag") << (int)QNetworkProxyQuery::TcpSocket << QUrl() << QString("socks") << QString("qt-project.org") << 21 << (int)(QNetworkProxy::TunnelingCapability | QNetworkProxy::ListeningCapability);
#endif
//windows: ssh is not a tag provided by the os, but any tunneling proxy is acceptable
}
// additionally, try bind to known-bad addresses, and make sure this doesn't work
- // these ranges are guarenteed to be reserved for 'documentation purposes',
+ // these ranges are guaranteed to be reserved for 'documentation purposes',
// and thus, should be unused in the real world. Not that I'm assuming the
// world is full of competent administrators, or anything.
QStringList knownBad;
virtual void destroyEditor(QWidget *editor, const QModelIndex &i) const
{ // This is a reimplementation of QAbstractItemDelegate::destroyEditor just set the variable m_editor to 0
- // The only reason we do this is to avoid the not recomended direct delete of editor (destroyEditor uses deleteLater)
+ // The only reason we do this is to avoid the not recommended direct delete of editor (destroyEditor uses deleteLater)
QItemDelegate::destroyEditor(editor, i); // Allow destroy
m_editor = 0; // but clear the variable
}
{
QScriptValue r;
QScriptEngine engine;
- // the m flag doesnt actually work here; dunno
+ // the m flag doesn't actually work here; dunno
engine.globalObject().setProperty("s", str2.replace('\n', ' '));
QScriptValue replaceFunc = engine.evaluate("(function() { return s.replace(/.*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*/gm, '$1.$2.$3') } )");
QVERIFY(replaceFunc.isFunction());
QSize topBarStatusBarLeftSize = m_topBarStatusBarLeft.size();
QSize topBarStatusBarMiddleSize = m_topBarStatusBarMiddle.size();
- //Location for Title text 5% width, 35% heigth of the background pixmap
+ //Location for Title text 5% width, 35% height of the background pixmap
m_topBarTitlePoint = QPoint(topBarPixmapSize.width()* 0.05,
topBarPixmapSize.height() * 0.35);
for (int i = 0; i < count; i++)
helper.requestList.append(request);
- // Warm up DNS cache and then immediatly start HTTP
+ // Warm up DNS cache and then immediately start HTTP
QHostInfo::lookupHost(QtNetworkSettings::serverName(), &helper, SLOT(doNextRequest()));
//QHostInfo::lookupHost("www.nokia.com", &helper, SLOT(doNextRequest()));
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();
}
msgBox.exec();
// Check if the networksession still exists - it may have gone after returning from
// the modal dialog (in the case that app has been closed, and deleting QHttp will
- // trigger the done() invokation).
+ // trigger the done() invocation).
if (m_NetworkSession) {
sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+
QString(" / ")+
projects / profile / ivi / qtbase.git / commitdiff