Fix some typos
Change-Id: I7dbe938bff5ac3ab50a0197f94bdb2f6c22fbd16 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
This commit is contained in:
parent
2b15c9c256
commit
7e872de76e
@ -208,7 +208,7 @@
|
|||||||
\l{QCoreApplication::}{postEvent()} is also used during object
|
\l{QCoreApplication::}{postEvent()} is also used during object
|
||||||
initialization, since the posted event will typically be dispatched
|
initialization, since the posted event will typically be dispatched
|
||||||
very soon after the initialization of the object is complete.
|
very soon after the initialization of the object is complete.
|
||||||
When implementing a widget, it is important to realise that events
|
When implementing a widget, it is important to realize that events
|
||||||
can be delivered very early in its lifetime so, in its constructor,
|
can be delivered very early in its lifetime so, in its constructor,
|
||||||
be sure to initialize member variables early on, before there's any
|
be sure to initialize member variables early on, before there's any
|
||||||
chance that it might receive an event.
|
chance that it might receive an event.
|
||||||
|
@ -241,7 +241,7 @@ public:
|
|||||||
3. User increments month: 31/03/2000
|
3. User increments month: 31/03/2000
|
||||||
|
|
||||||
At step 1, cachedDay stores 31. At step 2, the 31 is invalid for February, so the cachedDay is not updated.
|
At step 1, cachedDay stores 31. At step 2, the 31 is invalid for February, so the cachedDay is not updated.
|
||||||
At step 3, the the month is changed to March, for which 31 is a valid day. Since 29 < 31, the day is set to cachedDay.
|
At step 3, the month is changed to March, for which 31 is a valid day. Since 29 < 31, the day is set to cachedDay.
|
||||||
This is good for when users have selected their desired day and are scrolling up or down in the month or year section
|
This is good for when users have selected their desired day and are scrolling up or down in the month or year section
|
||||||
and do not want smaller months (or non-leap years) to alter the day that they chose.
|
and do not want smaller months (or non-leap years) to alter the day that they chose.
|
||||||
*/
|
*/
|
||||||
|
@ -90,7 +90,7 @@
|
|||||||
qopenglslMainVertexShader
|
qopenglslMainVertexShader
|
||||||
qopenglslMainWithTexCoordsVertexShader
|
qopenglslMainWithTexCoordsVertexShader
|
||||||
|
|
||||||
And the the following position vertex shaders:
|
And the following position vertex shaders:
|
||||||
qopenglslPositionOnlyVertexShader
|
qopenglslPositionOnlyVertexShader
|
||||||
qopenglslPositionWithTextureBrushVertexShader
|
qopenglslPositionWithTextureBrushVertexShader
|
||||||
qopenglslPositionWithPatternBrushVertexShader
|
qopenglslPositionWithPatternBrushVertexShader
|
||||||
|
@ -283,7 +283,7 @@ GLuint64 QOpenGLTimerQueryPrivate::result() const
|
|||||||
As this function's name implies, it blocks CPU execution until OpenGL notifies
|
As this function's name implies, it blocks CPU execution until OpenGL notifies
|
||||||
that the timer query result is available. To avoid blocking, you can check
|
that the timer query result is available. To avoid blocking, you can check
|
||||||
if the query result is available by calling isResultAvailable(). Note that
|
if the query result is available by calling isResultAvailable(). Note that
|
||||||
modern GPUs are deeply pipelined and query results may not become availble for
|
modern GPUs are deeply pipelined and query results may not become available for
|
||||||
between 1-5 frames after they were issued.
|
between 1-5 frames after they were issued.
|
||||||
|
|
||||||
Note that OpenGL does not permit nesting or interleaving of multiple timer queries
|
Note that OpenGL does not permit nesting or interleaving of multiple timer queries
|
||||||
|
@ -690,7 +690,7 @@ void QBlitterPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const Q
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Overriden methods to lock the graphics memory
|
// Overridden methods to lock the graphics memory
|
||||||
void QBlitterPaintEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode)
|
void QBlitterPaintEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode)
|
||||||
{
|
{
|
||||||
Q_D(QBlitterPaintEngine);
|
Q_D(QBlitterPaintEngine);
|
||||||
|
@ -349,7 +349,7 @@ SSL* QSslContext::createSsl()
|
|||||||
// We cache exactly one session here
|
// We cache exactly one session here
|
||||||
bool QSslContext::cacheSession(SSL* ssl)
|
bool QSslContext::cacheSession(SSL* ssl)
|
||||||
{
|
{
|
||||||
// dont cache the same session again
|
// don't cache the same session again
|
||||||
if (session && session == q_SSL_get_session(ssl))
|
if (session && session == q_SSL_get_session(ssl))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
@ -90,7 +90,7 @@
|
|||||||
qglslMainVertexShader
|
qglslMainVertexShader
|
||||||
qglslMainWithTexCoordsVertexShader
|
qglslMainWithTexCoordsVertexShader
|
||||||
|
|
||||||
And the the following position vertex shaders:
|
And the following position vertex shaders:
|
||||||
qglslPositionOnlyVertexShader
|
qglslPositionOnlyVertexShader
|
||||||
qglslPositionWithTextureBrushVertexShader
|
qglslPositionWithTextureBrushVertexShader
|
||||||
qglslPositionWithPatternBrushVertexShader
|
qglslPositionWithPatternBrushVertexShader
|
||||||
|
@ -117,7 +117,7 @@ private:
|
|||||||
CursorAtlas() : cursorsPerRow(0), texture(0), cursorWidth(0), cursorHeight(0) { }
|
CursorAtlas() : cursorsPerRow(0), texture(0), cursorWidth(0), cursorHeight(0) { }
|
||||||
int cursorsPerRow;
|
int cursorsPerRow;
|
||||||
uint texture;
|
uint texture;
|
||||||
int width, height; // width and height of the the atlas
|
int width, height; // width and height of the atlas
|
||||||
int cursorWidth, cursorHeight; // width and height of cursors inside the atlas
|
int cursorWidth, cursorHeight; // width and height of cursors inside the atlas
|
||||||
QList<QPoint> hotSpots;
|
QList<QPoint> hotSpots;
|
||||||
QImage image; // valid until it's uploaded
|
QImage image; // valid until it's uploaded
|
||||||
|
@ -469,7 +469,7 @@ bool QEventDispatcherCoreFoundation::hasPendingEvents()
|
|||||||
// assume that if the run-loop is currently blocking and waiting for a
|
// assume that if the run-loop is currently blocking and waiting for a
|
||||||
// source to signal then there are no system-events pending. If this
|
// source to signal then there are no system-events pending. If this
|
||||||
// function is called from the main thread then the second clause
|
// function is called from the main thread then the second clause
|
||||||
// of the condition will always be true, as the the run loop is
|
// of the condition will always be true, as the run loop is
|
||||||
// never waiting in that case. The function would be more aptly named
|
// never waiting in that case. The function would be more aptly named
|
||||||
// 'maybeHasPendingEvents' in our case.
|
// 'maybeHasPendingEvents' in our case.
|
||||||
|
|
||||||
|
@ -681,7 +681,7 @@ void QCocoaEventDispatcherPrivate::cleanupModalSessions()
|
|||||||
{
|
{
|
||||||
// Go through the list of modal sessions, and end those
|
// Go through the list of modal sessions, and end those
|
||||||
// that no longer has a window assosiated; no window means
|
// that no longer has a window assosiated; no window means
|
||||||
// the the session has logically ended. The reason we wait like
|
// the session has logically ended. The reason we wait like
|
||||||
// this to actually end the sessions for real (rather than at the
|
// this to actually end the sessions for real (rather than at the
|
||||||
// point they were marked as stopped), is that ending a session
|
// point they were marked as stopped), is that ending a session
|
||||||
// when no other session runs below it on the stack will make cocoa
|
// when no other session runs below it on the stack will make cocoa
|
||||||
|
@ -737,7 +737,7 @@ bool QSqlTableModel::submitAll()
|
|||||||
bool success = true;
|
bool success = true;
|
||||||
|
|
||||||
foreach (int row, d->cache.keys()) {
|
foreach (int row, d->cache.keys()) {
|
||||||
// be sure cache *still* contains the row since overriden selectRow() could have called select()
|
// be sure cache *still* contains the row since overridden selectRow() could have called select()
|
||||||
QSqlTableModelPrivate::CacheMap::iterator it = d->cache.find(row);
|
QSqlTableModelPrivate::CacheMap::iterator it = d->cache.find(row);
|
||||||
if (it == d->cache.end())
|
if (it == d->cache.end())
|
||||||
continue;
|
continue;
|
||||||
|
@ -160,7 +160,7 @@ a signal should be documented.
|
|||||||
\endlist
|
\endlist
|
||||||
|
|
||||||
For properties that have overloaded signals, QDoc groups the overloaded
|
For properties that have overloaded signals, QDoc groups the overloaded
|
||||||
notifiers together. To refer to a specifc version of a notifier or signal,
|
notifiers together. To refer to a specific version of a notifier or signal,
|
||||||
simply refer to the property and mention that there are different versions of
|
simply refer to the property and mention that there are different versions of
|
||||||
the notifier.
|
the notifier.
|
||||||
|
|
||||||
|
@ -5457,7 +5457,7 @@ bool QGraphicsScene::focusNextPrevChild(bool next)
|
|||||||
scene (i.e., when an item gains or loses input focus, or when focus
|
scene (i.e., when an item gains or loses input focus, or when focus
|
||||||
passes from one item to another). You can connect to this signal if you
|
passes from one item to another). You can connect to this signal if you
|
||||||
need to keep track of when other items gain input focus. It is
|
need to keep track of when other items gain input focus. It is
|
||||||
particularily useful for implementing virtual keyboards, input methods,
|
particularly useful for implementing virtual keyboards, input methods,
|
||||||
and cursor items.
|
and cursor items.
|
||||||
|
|
||||||
\a oldFocusItem is a pointer to the item that previously had focus, or
|
\a oldFocusItem is a pointer to the item that previously had focus, or
|
||||||
|
@ -1026,7 +1026,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
|
|||||||
break;
|
break;
|
||||||
case CE_Splitter:
|
case CE_Splitter:
|
||||||
{
|
{
|
||||||
// Dont draw handle for single pixel splitters
|
// Don't draw handle for single pixel splitters
|
||||||
if (option->rect.width() > 1 && option->rect.height() > 1) {
|
if (option->rect.width() > 1 && option->rect.height() > 1) {
|
||||||
//draw grips
|
//draw grips
|
||||||
if (option->state & State_Horizontal) {
|
if (option->state & State_Horizontal) {
|
||||||
|
@ -1032,7 +1032,7 @@ void QGtkStyle::drawPrimitive(PrimitiveElement element,
|
|||||||
case PE_FrameFocusRect: {
|
case PE_FrameFocusRect: {
|
||||||
QRect frameRect = option->rect.adjusted(1, 1, -2, -2); // ### this mess should move to subcontrolrect
|
QRect frameRect = option->rect.adjusted(1, 1, -2, -2); // ### this mess should move to subcontrolrect
|
||||||
if (qobject_cast<const QAbstractItemView*>(widget)) {
|
if (qobject_cast<const QAbstractItemView*>(widget)) {
|
||||||
// Dont draw anything
|
// Don't draw anything
|
||||||
} else if (qobject_cast<const QTabBar*>(widget)) {
|
} else if (qobject_cast<const QTabBar*>(widget)) {
|
||||||
GtkWidget *gtkNotebook = d->gtkWidget("GtkNotebook");
|
GtkWidget *gtkNotebook = d->gtkWidget("GtkNotebook");
|
||||||
style = d->gtk_widget_get_style(gtkNotebook);
|
style = d->gtk_widget_get_style(gtkNotebook);
|
||||||
|
@ -5024,7 +5024,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
|
|||||||
int oldState = styleObject->property("_q_stylestate").toInt();
|
int oldState = styleObject->property("_q_stylestate").toInt();
|
||||||
uint oldActiveControls = styleObject->property("_q_stylecontrols").toUInt();
|
uint oldActiveControls = styleObject->property("_q_stylecontrols").toUInt();
|
||||||
|
|
||||||
// a scrollbar is transient when the the scrollbar itself and
|
// a scrollbar is transient when the scrollbar itself and
|
||||||
// its sibling are both inactive (ie. not pressed/hovered/moved)
|
// its sibling are both inactive (ie. not pressed/hovered/moved)
|
||||||
bool transient = !opt->activeSubControls && !(slider->state & State_On);
|
bool transient = !opt->activeSubControls && !(slider->state & State_On);
|
||||||
|
|
||||||
|
@ -76,6 +76,6 @@ int main(int argc, char *argv[])
|
|||||||
gv.show();
|
gv.show();
|
||||||
MyObject o(rect);
|
MyObject o(rect);
|
||||||
QMessageBox::information(0, "What you should see",
|
QMessageBox::information(0, "What you should see",
|
||||||
"The red rectangle should toggle visiblity, so you should see it flash on and off");
|
"The red rectangle should toggle visibility, so you should see it flash on and off");
|
||||||
return a.exec();
|
return a.exec();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user