Remove duplicate words and punctuation from documentation.
Change-Id: I5550c62d412510bc2c5acceb2cae7d2f2ef6a8d3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
parent
a798b956b9
commit
6b6fefad48
@ -1988,7 +1988,7 @@ namespace {
|
|||||||
// indicating success or not
|
// indicating success or not
|
||||||
// b) the GNU version, which returns a char*, which may or may not
|
// b) the GNU version, which returns a char*, which may or may not
|
||||||
// be the beginning of the buffer we used
|
// be the beginning of the buffer we used
|
||||||
// The GNU libc manpage for strerror_r says you should use the the XSI
|
// The GNU libc manpage for strerror_r says you should use the XSI
|
||||||
// version in portable code. However, it's impossible to do that if
|
// version in portable code. However, it's impossible to do that if
|
||||||
// _GNU_SOURCE is defined so we use C++ overloading to decide what to do
|
// _GNU_SOURCE is defined so we use C++ overloading to decide what to do
|
||||||
// depending on the return type
|
// depending on the return type
|
||||||
|
@ -219,7 +219,7 @@ QStringList QJsonObject::keys() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Returns the the number of (key, value) pairs stored in the object.
|
Returns the number of (key, value) pairs stored in the object.
|
||||||
*/
|
*/
|
||||||
int QJsonObject::size() const
|
int QJsonObject::size() const
|
||||||
{
|
{
|
||||||
|
@ -65,7 +65,7 @@ namespace {
|
|||||||
// indicating success or not
|
// indicating success or not
|
||||||
// b) the GNU version, which returns a char*, which may or may not
|
// b) the GNU version, which returns a char*, which may or may not
|
||||||
// be the beginning of the buffer we used
|
// be the beginning of the buffer we used
|
||||||
// The GNU libc manpage for strerror_r says you should use the the XSI
|
// The GNU libc manpage for strerror_r says you should use the XSI
|
||||||
// version in portable code. However, it's impossible to do that if
|
// version in portable code. However, it's impossible to do that if
|
||||||
// _GNU_SOURCE is defined so we use C++ overloading to decide what to do
|
// _GNU_SOURCE is defined so we use C++ overloading to decide what to do
|
||||||
// depending on the return type
|
// depending on the return type
|
||||||
|
@ -359,7 +359,7 @@ QStringList QMimeType::suffixes() const
|
|||||||
|
|
||||||
QStringList result;
|
QStringList result;
|
||||||
foreach (const QString &pattern, d->globPatterns) {
|
foreach (const QString &pattern, d->globPatterns) {
|
||||||
// Not a simple suffix if if looks like: README or *. or *.* or *.JP*G or *.JP?
|
// Not a simple suffix if it looks like: README or *. or *.* or *.JP*G or *.JP?
|
||||||
if (pattern.startsWith(QLatin1String("*.")) &&
|
if (pattern.startsWith(QLatin1String("*.")) &&
|
||||||
pattern.length() > 2 &&
|
pattern.length() > 2 &&
|
||||||
pattern.indexOf(QLatin1Char('*'), 2) < 0 && pattern.indexOf(QLatin1Char('?'), 2) < 0) {
|
pattern.indexOf(QLatin1Char('*'), 2) < 0 && pattern.indexOf(QLatin1Char('?'), 2) < 0) {
|
||||||
|
@ -75,13 +75,13 @@ QT_BEGIN_NAMESPACE
|
|||||||
\value StartDragDistance (int) Start drag distance,
|
\value StartDragDistance (int) Start drag distance,
|
||||||
overriding QPlatformIntegration::styleHint.
|
overriding QPlatformIntegration::styleHint.
|
||||||
|
|
||||||
\value StartDragTime (int) Start drag time in ms,,
|
\value StartDragTime (int) Start drag time in ms,
|
||||||
overriding QPlatformIntegration::styleHint.
|
overriding QPlatformIntegration::styleHint.
|
||||||
|
|
||||||
\value KeyboardAutoRepeatRate (int) Keyboard auto repeat rate,
|
\value KeyboardAutoRepeatRate (int) Keyboard auto repeat rate,
|
||||||
overriding QPlatformIntegration::styleHint.
|
overriding QPlatformIntegration::styleHint.
|
||||||
|
|
||||||
\value PasswordMaskDelay (int) Pass word mask delay in ms,,
|
\value PasswordMaskDelay (int) Pass word mask delay in ms,
|
||||||
overriding QPlatformIntegration::styleHint.
|
overriding QPlatformIntegration::styleHint.
|
||||||
|
|
||||||
\value StartDragVelocity (int) Velocity of a drag,
|
\value StartDragVelocity (int) Velocity of a drag,
|
||||||
|
@ -923,7 +923,7 @@ QPoint QPaintEngine::coordinateOffset() const
|
|||||||
|
|
||||||
Sets the system clip for this engine. The system clip defines the
|
Sets the system clip for this engine. The system clip defines the
|
||||||
basis area that the engine has to draw in. All clips that are
|
basis area that the engine has to draw in. All clips that are
|
||||||
set will be be an intersection with the system clip.
|
set will be an intersection with the system clip.
|
||||||
|
|
||||||
Reset the systemclip to no clip by setting an empty region.
|
Reset the systemclip to no clip by setting an empty region.
|
||||||
*/
|
*/
|
||||||
|
@ -4375,8 +4375,7 @@ void QPainter::drawArc(const QRectF &r, int a, int alen)
|
|||||||
/*!
|
/*!
|
||||||
\fn void QPainter::drawPie(const QRectF &rectangle, int startAngle, int spanAngle)
|
\fn void QPainter::drawPie(const QRectF &rectangle, int startAngle, int spanAngle)
|
||||||
|
|
||||||
Draws a pie defined by the given \a rectangle, \a startAngle and
|
Draws a pie defined by the given \a rectangle, \a startAngle and \a spanAngle.
|
||||||
and \a spanAngle.
|
|
||||||
|
|
||||||
The pie is filled with the current brush().
|
The pie is filled with the current brush().
|
||||||
|
|
||||||
|
@ -346,7 +346,7 @@ static void ensureInitialized()
|
|||||||
|
|
||||||
\note To have the request not send credentials you must not call
|
\note To have the request not send credentials you must not call
|
||||||
setUser() or setPassword() on the \a authenticator object. This
|
setUser() or setPassword() on the \a authenticator object. This
|
||||||
will result in the the \l finished() signal being emitted with a
|
will result in the \l finished() signal being emitted with a
|
||||||
\l QNetworkReply with error \l AuthenticationRequiredError.
|
\l QNetworkReply with error \l AuthenticationRequiredError.
|
||||||
|
|
||||||
\note It is not possible to use a QueuedConnection to connect to
|
\note It is not possible to use a QueuedConnection to connect to
|
||||||
|
@ -174,7 +174,7 @@ QUdpSocket::~QUdpSocket()
|
|||||||
/*!
|
/*!
|
||||||
\since 4.8
|
\since 4.8
|
||||||
|
|
||||||
Joins the the multicast group specified by \a groupAddress on the default
|
Joins the multicast group specified by \a groupAddress on the default
|
||||||
interface chosen by the operating system. The socket must be in BoundState,
|
interface chosen by the operating system. The socket must be in BoundState,
|
||||||
otherwise an error occurs.
|
otherwise an error occurs.
|
||||||
|
|
||||||
|
@ -1432,7 +1432,7 @@ bool QSqlDatabase::isValid() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Clones the database connection \a other and and stores it as \a
|
Clones the database connection \a other and stores it as \a
|
||||||
connectionName. All the settings from the original database, e.g.
|
connectionName. All the settings from the original database, e.g.
|
||||||
databaseName(), hostName(), etc., are copied across. Does nothing
|
databaseName(), hostName(), etc., are copied across. Does nothing
|
||||||
if \a other is an invalid database. Returns the newly created
|
if \a other is an invalid database. Returns the newly created
|
||||||
|
@ -566,7 +566,7 @@ Node::ThreadSafeness Node::inheritedThreadSafeness() const
|
|||||||
#if 0
|
#if 0
|
||||||
/*!
|
/*!
|
||||||
Returns the sanitized file name without the path.
|
Returns the sanitized file name without the path.
|
||||||
If the the file is an html file, the html suffix
|
If the file is an html file, the html suffix
|
||||||
is removed. Why?
|
is removed. Why?
|
||||||
*/
|
*/
|
||||||
QString Node::fileBase() const
|
QString Node::fileBase() const
|
||||||
|
@ -250,7 +250,7 @@ QGraphicsAnchorLayout::~QGraphicsAnchorLayout()
|
|||||||
Creates an anchor between the edge \a firstEdge of item \a firstItem and the edge \a secondEdge
|
Creates an anchor between the edge \a firstEdge of item \a firstItem and the edge \a secondEdge
|
||||||
of item \a secondItem. The spacing of the anchor is picked up from the style. Anchors
|
of item \a secondItem. The spacing of the anchor is picked up from the style. Anchors
|
||||||
between a layout edge and an item edge will have a size of 0.
|
between a layout edge and an item edge will have a size of 0.
|
||||||
If there is already an anchor between the edges, the the new anchor will replace the old one.
|
If there is already an anchor between the edges, the new anchor will replace the old one.
|
||||||
|
|
||||||
\a firstItem and \a secondItem are automatically added to the layout if they are not part
|
\a firstItem and \a secondItem are automatically added to the layout if they are not part
|
||||||
of the layout. This means that count() can increase by up to 2.
|
of the layout. This means that count() can increase by up to 2.
|
||||||
|
@ -384,7 +384,7 @@ void QBoxLayoutPrivate::setupGeom()
|
|||||||
}
|
}
|
||||||
|
|
||||||
a[i].empty = empty;
|
a[i].empty = empty;
|
||||||
a[i].spacing = 0; // might be be initialized with a non-zero value in a later iteration
|
a[i].spacing = 0; // might be initialized with a non-zero value in a later iteration
|
||||||
hasHfw = hasHfw || box->item->hasHeightForWidth();
|
hasHfw = hasHfw || box->item->hasHeightForWidth();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -782,7 +782,7 @@ void QTapAndHoldGesture::setPosition(const QPointF &value)
|
|||||||
/*!
|
/*!
|
||||||
Set the timeout, in milliseconds, before the gesture triggers.
|
Set the timeout, in milliseconds, before the gesture triggers.
|
||||||
|
|
||||||
The recognizer will detect a touch down and and if \a msecs
|
The recognizer will detect a touch down and if \a msecs
|
||||||
later the touch is still down, it will trigger the QTapAndHoldGesture.
|
later the touch is still down, it will trigger the QTapAndHoldGesture.
|
||||||
The default value is 700 milliseconds.
|
The default value is 700 milliseconds.
|
||||||
*/
|
*/
|
||||||
@ -795,7 +795,7 @@ void QTapAndHoldGesture::setTimeout(int msecs)
|
|||||||
/*!
|
/*!
|
||||||
Gets the timeout, in milliseconds, before the gesture triggers.
|
Gets the timeout, in milliseconds, before the gesture triggers.
|
||||||
|
|
||||||
The recognizer will detect a touch down and and if timeout()
|
The recognizer will detect a touch down and if timeout()
|
||||||
later the touch is still down, it will trigger the QTapAndHoldGesture.
|
later the touch is still down, it will trigger the QTapAndHoldGesture.
|
||||||
The default value is 700 milliseconds.
|
The default value is 700 milliseconds.
|
||||||
*/
|
*/
|
||||||
|
@ -2475,7 +2475,7 @@ bool QMdiArea::event(QEvent *event)
|
|||||||
switch (event->type()) {
|
switch (event->type()) {
|
||||||
#ifdef Q_WS_WIN
|
#ifdef Q_WS_WIN
|
||||||
// QWidgetPrivate::hide_helper activates another sub-window when closing a
|
// QWidgetPrivate::hide_helper activates another sub-window when closing a
|
||||||
// modal dialog on Windows (see activateWindow() inside the the ifdef).
|
// modal dialog on Windows (see activateWindow() inside the ifdef).
|
||||||
case QEvent::WindowUnblocked:
|
case QEvent::WindowUnblocked:
|
||||||
d->activateCurrentWindow();
|
d->activateCurrentWindow();
|
||||||
break;
|
break;
|
||||||
|
@ -276,7 +276,7 @@ public:
|
|||||||
int skipCount;
|
int skipCount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \a baseURI is the the URI of where the catalog file resides.
|
* \a baseURI is the URI of where the catalog file resides.
|
||||||
*/
|
*/
|
||||||
TestSuiteHandler(const QUrl &baseURI) : runCount(0),
|
TestSuiteHandler(const QUrl &baseURI) : runCount(0),
|
||||||
skipCount(0)
|
skipCount(0)
|
||||||
|
@ -122,7 +122,7 @@ void tst_MacGui::dummy()
|
|||||||
const int delay = 1000;
|
const int delay = 1000;
|
||||||
clickLater(interface, Qt::LeftButton, delay);
|
clickLater(interface, Qt::LeftButton, delay);
|
||||||
|
|
||||||
// Show dialog and and enter event loop.
|
// Show dialog and enter event loop.
|
||||||
connect(wn.getWidget(interface), SIGNAL(clicked()), SLOT(exitLoopSlot()));
|
connect(wn.getWidget(interface), SIGNAL(clicked()), SLOT(exitLoopSlot()));
|
||||||
const int timeout = 4;
|
const int timeout = 4;
|
||||||
QTestEventLoop::instance().enterLoop(timeout);
|
QTestEventLoop::instance().enterLoop(timeout);
|
||||||
@ -148,7 +148,7 @@ void tst_MacGui::splashScreenModality()
|
|||||||
const int delay = 1000;
|
const int delay = 1000;
|
||||||
clickLater(interface, Qt::LeftButton, delay);
|
clickLater(interface, Qt::LeftButton, delay);
|
||||||
|
|
||||||
// Show dialog and and enter event loop.
|
// Show dialog and enter event loop.
|
||||||
connect(wn.getWidget(interface), SIGNAL(clicked()), SLOT(exitLoopSlot()));
|
connect(wn.getWidget(interface), SIGNAL(clicked()), SLOT(exitLoopSlot()));
|
||||||
const int timeout = 4;
|
const int timeout = 4;
|
||||||
QTestEventLoop::instance().enterLoop(timeout);
|
QTestEventLoop::instance().enterLoop(timeout);
|
||||||
|
@ -492,7 +492,7 @@ void tst_MacNativeEvents::testModifierCtrlWithDontSwapCtrlAndMeta()
|
|||||||
// don't (and never have) respected this flag for raw key events. Only for
|
// don't (and never have) respected this flag for raw key events. Only for
|
||||||
// menus, through QKeySequence. I don't want to change this behaviour now, at
|
// menus, through QKeySequence. I don't want to change this behaviour now, at
|
||||||
// least not until someone complains. So I choose to let the test just stop
|
// least not until someone complains. So I choose to let the test just stop
|
||||||
// any unintended regressions instead. If we decide to resepect the the flag at one
|
// any unintended regressions instead. If we decide to resepect the flag at one
|
||||||
// point, fix the test.
|
// point, fix the test.
|
||||||
QCoreApplication::setAttribute(Qt::AA_MacDontSwapCtrlAndMeta);
|
QCoreApplication::setAttribute(Qt::AA_MacDontSwapCtrlAndMeta);
|
||||||
QWidget w;
|
QWidget w;
|
||||||
|
@ -961,7 +961,7 @@ void tst_QSqlRelationalTableModel::clearDisplayValuesCache()
|
|||||||
QCOMPARE(model.data(model.index(4, 3)).toInt(), 2);
|
QCOMPARE(model.data(model.index(4, 3)).toInt(), 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
// For task 140782 and 176374: If the main table and the the related tables uses the same
|
// For task 140782 and 176374: If the main table and the related tables uses the same
|
||||||
// name for a column or display column then insertRecord() would return true though it
|
// name for a column or display column then insertRecord() would return true though it
|
||||||
// actually failed.
|
// actually failed.
|
||||||
void tst_QSqlRelationalTableModel::insertRecordDuplicateFieldNames()
|
void tst_QSqlRelationalTableModel::insertRecordDuplicateFieldNames()
|
||||||
|
@ -1462,7 +1462,7 @@ void tst_QTableWidget::task219380_removeLastRow()
|
|||||||
testWidget->setColumnCount(1);
|
testWidget->setColumnCount(1);
|
||||||
testWidget->setRowCount(20);
|
testWidget->setRowCount(20);
|
||||||
QTableWidgetItem item;
|
QTableWidgetItem item;
|
||||||
testWidget->setItem(18, 0, &item); //we put the item in the the second last row
|
testWidget->setItem(18, 0, &item); //we put the item in the second last row
|
||||||
testWidget->openPersistentEditor(&item);
|
testWidget->openPersistentEditor(&item);
|
||||||
|
|
||||||
testWidget->scrollToBottom();
|
testWidget->scrollToBottom();
|
||||||
|
@ -753,7 +753,7 @@ void tst_QApplication::quitOnLastWindowClosed()
|
|||||||
int returnValue = app.exec();
|
int returnValue = app.exec();
|
||||||
QCOMPARE(returnValue, 0);
|
QCOMPARE(returnValue, 0);
|
||||||
// failure here means the timer above didn't fire, and the
|
// failure here means the timer above didn't fire, and the
|
||||||
// quit was caused the the dialog being closed (not the window)
|
// quit was caused the dialog being closed (not the window)
|
||||||
QCOMPARE(timerSpy.count(), 1);
|
QCOMPARE(timerSpy.count(), 1);
|
||||||
QCOMPARE(appSpy.count(), 2);
|
QCOMPARE(appSpy.count(), 2);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user