Remove extra semi-colons
Change-Id: I92fddb36cd136fd1bd627955f15d0559b9942d7e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
parent
8b601e6dbe
commit
bd6d7d4d74
@ -71,7 +71,7 @@ void SslClient::socketEncrypted()
|
||||
const QSslCipher cipher = socket->sessionCipher();
|
||||
const QString cipherInfo = QString("%1, %2 (%3/%4)").arg(cipher.authenticationMethod())
|
||||
.arg(cipher.name()).arg(cipher.usedBits())
|
||||
.arg(cipher.supportedBits());;
|
||||
.arg(cipher.supportedBits());
|
||||
form->cipherLabel->setText(cipherInfo);
|
||||
padLock->show();
|
||||
}
|
||||
|
@ -46,7 +46,7 @@ protected:
|
||||
|
||||
bool m_showDoc = false;
|
||||
bool m_preferImage = false;
|
||||
QTextDocument *m_document = nullptr;;
|
||||
QTextDocument *m_document = nullptr;
|
||||
|
||||
QString m_sourceFileName;
|
||||
};
|
||||
|
@ -1977,7 +1977,7 @@ static QString quotedStringLiteral(const QString &value)
|
||||
|
||||
// Escape
|
||||
for (int i = 0; i < len; ++i) {
|
||||
QChar character = value.at(i);;
|
||||
QChar character = value.at(i);
|
||||
ushort code = character.unicode();
|
||||
switch (code) {
|
||||
case '\\':
|
||||
|
@ -1357,7 +1357,7 @@ bool QJniObject::isClassAvailable(const char *className)
|
||||
if (!env.jniEnv())
|
||||
return false;
|
||||
|
||||
return loadClass(className, env.jniEnv());;
|
||||
return loadClass(className, env.jniEnv());
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -117,7 +117,7 @@ Q_DECL_UNUSED static QDebug &operator<<(QDebug &d, HeaderDebug h)
|
||||
switch (h.h->FileHeader.Machine) {
|
||||
case IMAGE_FILE_MACHINE_I386: d << "i386"; break;
|
||||
case IMAGE_FILE_MACHINE_ARM: d << "ARM"; break;
|
||||
case IMAGE_FILE_MACHINE_ARMNT: d << "ARM Thumb-2"; break;;
|
||||
case IMAGE_FILE_MACHINE_ARMNT: d << "ARM Thumb-2"; break;
|
||||
case IMAGE_FILE_MACHINE_THUMB: d << "Thumb"; break;
|
||||
case IMAGE_FILE_MACHINE_IA64: d << "IA-64"; break;
|
||||
case IMAGE_FILE_MACHINE_MIPS16: d << "MIPS16"; break;
|
||||
|
@ -699,7 +699,7 @@ static QLibraryScanResult scanSections(QByteArrayView data, const ErrorMaker &er
|
||||
// sections aren't allowed to extend past the end of the file, unless
|
||||
// they are NOBITS sections
|
||||
if (shdr->sh_type == SHT_NOBITS)
|
||||
continue;;
|
||||
continue;
|
||||
if (T::Off end; qAddOverflow(shdr->sh_offset, shdr->sh_size, &end)
|
||||
|| end > size_t(data.size())) {
|
||||
return error(QLibrary::tr("section contents extend past the end of the file"));
|
||||
|
@ -956,7 +956,7 @@ QDateTimeParser::parseSection(const QDateTime ¤tValue, int sectionIndex, i
|
||||
m_text.insert(offset, QString(missingZeroes, u'0'));
|
||||
++(const_cast<QDateTimeParser*>(this)->sectionNodes[sectionIndex].zeroesAdded);
|
||||
} else {
|
||||
result = ParsedSection(Intermediate, lastVal, used);;
|
||||
result = ParsedSection(Intermediate, lastVal, used);
|
||||
}
|
||||
} else {
|
||||
result = ParsedSection(Acceptable, lastVal, used);
|
||||
|
@ -131,7 +131,7 @@ public:
|
||||
}
|
||||
static QTimeZone fromSecondsAheadOfUtc(int offset)
|
||||
{
|
||||
return fromDurationAheadOfUtc(std::chrono::seconds{offset});;
|
||||
return fromDurationAheadOfUtc(std::chrono::seconds{offset});
|
||||
}
|
||||
constexpr Qt::TimeSpec timeSpec() const noexcept { return d.s.spec(); }
|
||||
constexpr int fixedSecondsAheadOfUtc() const noexcept
|
||||
|
@ -898,7 +898,7 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId)
|
||||
}
|
||||
|
||||
// Now for each transition time calculate and store our rule:
|
||||
const int tranCount = tranList.size();;
|
||||
const int tranCount = tranList.size();
|
||||
ret.m_tranTimes.reserve(tranCount);
|
||||
// The DST offset when in effect: usually stable, usually an hour:
|
||||
int lastDstOff = 3600;
|
||||
|
@ -1325,7 +1325,7 @@ static void convert_ARGB32_to_RGBA64(QImageData *dest, const QImageData *src, Qt
|
||||
|
||||
for (int i = 0; i < src->height; ++i) {
|
||||
fetch(reinterpret_cast<QRgba64 *>(dest_data), src_data, 0, src->width, nullptr, nullptr);
|
||||
src_data += src->bytes_per_line;;
|
||||
src_data += src->bytes_per_line;
|
||||
dest_data += dest->bytes_per_line;
|
||||
}
|
||||
}
|
||||
|
@ -3656,7 +3656,7 @@ static inline Operator getOperator(const QSpanData *data, const QT_FT_Span *span
|
||||
solidSource = !data->texture.hasAlpha;
|
||||
op.srcFetch = getSourceFetch(getBlendType(data), data->texture.format);
|
||||
#if QT_CONFIG(raster_64bit)
|
||||
op.srcFetch64 = getSourceFetch64(getBlendType(data), data->texture.format);;
|
||||
op.srcFetch64 = getSourceFetch64(getBlendType(data), data->texture.format);
|
||||
#endif
|
||||
#if QT_CONFIG(raster_fp)
|
||||
op.srcFetchFP = getSourceFetchFP(getBlendType(data), data->texture.format);
|
||||
|
@ -869,7 +869,7 @@ QSizeF QPageSizePrivate::size(QPageSize::Unit units) const
|
||||
|
||||
QSize QPageSizePrivate::sizePixels(int resolution) const
|
||||
{
|
||||
return qt_convertPointsToPixels(m_pointSize, resolution);;
|
||||
return qt_convertPointsToPixels(m_pointSize, resolution);
|
||||
}
|
||||
|
||||
|
||||
|
@ -184,7 +184,7 @@ void QNetworkAccessDebugPipeBackend::possiblyFinish()
|
||||
|
||||
void QNetworkAccessDebugPipeBackend::close()
|
||||
{
|
||||
qWarning("QNetworkAccessDebugPipeBackend::closeDownstreamChannel() %d",operation());;
|
||||
qWarning("QNetworkAccessDebugPipeBackend::closeDownstreamChannel() %d",operation());
|
||||
//if (operation() == QNetworkAccessManager::GetOperation)
|
||||
// socket.disconnectFromHost();
|
||||
}
|
||||
|
@ -36,7 +36,7 @@ QCocoaMenuBar::QCocoaMenuBar()
|
||||
|
||||
QCocoaMenuBar::~QCocoaMenuBar()
|
||||
{
|
||||
qCDebug(lcQpaMenus) << "Destructing" << this << "with" << m_nativeMenu;;
|
||||
qCDebug(lcQpaMenus) << "Destructing" << this << "with" << m_nativeMenu;
|
||||
for (auto menu : std::as_const(m_menus)) {
|
||||
if (!menu)
|
||||
continue;
|
||||
|
@ -408,7 +408,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMenuHelper);
|
||||
|
||||
- (QCocoaWindow*)platformWindow
|
||||
{
|
||||
return m_platformWindow.data();;
|
||||
return m_platformWindow.data();
|
||||
}
|
||||
|
||||
@end
|
||||
|
@ -424,7 +424,7 @@ void QDirectFbBlitter::drawDebugRect(const QRect &rect, const QColor &color)
|
||||
|
||||
void QDirectFbTextureGlyphCache::resizeTextureData(int width, int height)
|
||||
{
|
||||
m_surface.reset();;
|
||||
m_surface.reset();
|
||||
QImageTextureGlyphCache::resizeTextureData(width, height);
|
||||
}
|
||||
|
||||
|
@ -200,7 +200,7 @@ bool QLinuxMediaDevice::resetLinks()
|
||||
|
||||
struct media_link *QLinuxMediaDevice::parseLink(const QString &link)
|
||||
{
|
||||
char *endp = nullptr;;
|
||||
char *endp = nullptr;
|
||||
struct media_link *mediaLink = media_parse_link(m_mediaDevice, link.toStdString().c_str(), &endp);
|
||||
|
||||
if (!mediaLink)
|
||||
|
@ -902,7 +902,7 @@
|
||||
QInputMethodEvent e(m_markedText, attrs);
|
||||
[self sendEventToFocusObject:e];
|
||||
}
|
||||
QRectF startRect = QPlatformInputContext::cursorRectangle();;
|
||||
QRectF startRect = QPlatformInputContext::cursorRectangle();
|
||||
|
||||
attrs = QList<QInputMethodEvent::Attribute>();
|
||||
attrs << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, r.location + r.length, 0, 0);
|
||||
@ -910,7 +910,7 @@
|
||||
QInputMethodEvent e(m_markedText, attrs);
|
||||
[self sendEventToFocusObject:e];
|
||||
}
|
||||
QRectF endRect = QPlatformInputContext::cursorRectangle();;
|
||||
QRectF endRect = QPlatformInputContext::cursorRectangle();
|
||||
|
||||
if (cursorPos != int(r.location + r.length) || cursorPos != anchorPos) {
|
||||
attrs = QList<QInputMethodEvent::Attribute>();
|
||||
|
@ -204,7 +204,7 @@ QPlatformPixmap *QXcbIntegration::createPlatformPixmap(QPlatformPixmap::PixelTyp
|
||||
QPlatformWindow *QXcbIntegration::createPlatformWindow(QWindow *window) const
|
||||
{
|
||||
QXcbGlIntegration *glIntegration = nullptr;
|
||||
const bool isTrayIconWindow = QXcbWindow::isTrayIconWindow(window);;
|
||||
const bool isTrayIconWindow = QXcbWindow::isTrayIconWindow(window);
|
||||
if (window->type() != Qt::Desktop && !isTrayIconWindow) {
|
||||
if (window->supportsOpenGL()) {
|
||||
glIntegration = connection()->glIntegration();
|
||||
|
@ -1209,7 +1209,7 @@ const QAndroidStyle::AndroidDrawable * QAndroidStyle::AndroidStateDrawable::best
|
||||
|
||||
int QAndroidStyle::AndroidStateDrawable::extractState(const QVariantMap &value)
|
||||
{
|
||||
QStyle::State state = QStyle::State_Enabled | QStyle::State_Active;;
|
||||
QStyle::State state = QStyle::State_Enabled | QStyle::State_Active;
|
||||
for (auto it = value.cbegin(), end = value.cend(); it != end; ++it) {
|
||||
const QString &key = it.key();
|
||||
bool val = it.value().toString() == QLatin1String("true");
|
||||
|
@ -5553,7 +5553,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
|
||||
const auto cw = QMacStylePrivate::CocoaControl(ct, cs);
|
||||
auto *cc = static_cast<NSControl *>(d->cocoaControl(cw));
|
||||
cc.enabled = isEnabled;
|
||||
QRectF frameRect = cw.adjustedControlFrame(combo->rect);;
|
||||
QRectF frameRect = cw.adjustedControlFrame(combo->rect);
|
||||
if (cw.type == QMacStylePrivate::Button_PopupButton) {
|
||||
// Non-editable QComboBox
|
||||
auto *pb = static_cast<NSPopUpButton *>(cc);
|
||||
@ -5982,7 +5982,7 @@ QRect QMacStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex *op
|
||||
qreal controlsSpacing = lastButtonRect.right() + titleBarButtonSpacing;
|
||||
if (!titlebar->icon.isNull()) {
|
||||
const auto iconSize = proxy()->pixelMetric(PM_SmallIconSize);
|
||||
const auto actualIconSize = titlebar->icon.actualSize(QSize(iconSize, iconSize)).width();;
|
||||
const auto actualIconSize = titlebar->icon.actualSize(QSize(iconSize, iconSize)).width();
|
||||
controlsSpacing += actualIconSize + titleBarIconTitleSpacing;
|
||||
}
|
||||
|
||||
|
@ -1427,7 +1427,7 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
|
||||
}
|
||||
painter->setPen(act ? menuitem->palette.highlightedText().color() : menuitem->palette.buttonText().color());
|
||||
|
||||
QColor discol = menuitem->palette.text().color();;
|
||||
QColor discol = menuitem->palette.text().color();
|
||||
if (dis) {
|
||||
discol = menuitem->palette.color(QPalette::Disabled, QPalette::WindowText);
|
||||
painter->setPen(discol);
|
||||
|
@ -118,7 +118,7 @@ QList<QSslCertificate> X509CertificateGeneric::certificatesFromPem(const QByteAr
|
||||
|
||||
QByteArray decoded = QByteArray::fromBase64(
|
||||
QByteArray::fromRawData(pem.data() + startPos, endPos - startPos));
|
||||
certificates << certificatesFromDer(decoded, 1);;
|
||||
certificates << certificatesFromDer(decoded, 1);
|
||||
}
|
||||
|
||||
return certificates;
|
||||
|
@ -328,7 +328,7 @@ void QWindowsPrintDevice::loadInputSlots() const
|
||||
|
||||
QPrint::InputSlot QWindowsPrintDevice::defaultInputSlot() const
|
||||
{
|
||||
QPrint::InputSlot inputSlot = QPlatformPrintDevice::defaultInputSlot();;
|
||||
QPrint::InputSlot inputSlot = QPlatformPrintDevice::defaultInputSlot();
|
||||
|
||||
if (LPDEVMODE pDevMode = getDevmode(m_hPrinter, m_id)) {
|
||||
// Get the default input slot
|
||||
|
@ -436,7 +436,7 @@ bool Moc::parseFunction(FunctionDef *def, bool inMacro)
|
||||
// note that testFunctionAttribute is handled further below,
|
||||
// and revisions and attributes must come first
|
||||
while (testForFunctionModifiers(def)) {}
|
||||
Type tempType = parseType();;
|
||||
Type tempType = parseType();
|
||||
while (!tempType.name.isEmpty() && lookup() != LPAREN) {
|
||||
if (testFunctionAttribute(def->type.firstToken, def))
|
||||
; // fine
|
||||
@ -554,7 +554,7 @@ bool Moc::parseMaybeFunction(const ClassDef *cdef, FunctionDef *def)
|
||||
// but otherwise we end up with misparses
|
||||
if (def->isSlot || def->isSignal || def->isInvokable)
|
||||
while (testForFunctionModifiers(def)) {}
|
||||
Type tempType = parseType();;
|
||||
Type tempType = parseType();
|
||||
while (!tempType.name.isEmpty() && lookup() != LPAREN) {
|
||||
if (testFunctionAttribute(def->type.firstToken, def))
|
||||
; // fine
|
||||
|
@ -1462,7 +1462,7 @@ static DeployResult deploy(const Options &options, const QMap<QString, QString>
|
||||
if (optVerboseLevel > 1)
|
||||
std::wcout << "Adding ICU version " << icuVersion << '\n';
|
||||
QString icuLib = QStringLiteral("icudt") + icuVersion
|
||||
+ QLatin1StringView(windowsSharedLibrarySuffix);;
|
||||
+ QLatin1StringView(windowsSharedLibrarySuffix);
|
||||
// Some packages contain debug dlls of ICU libraries even though it's a C
|
||||
// library and the official packages do not differentiate (QTBUG-87677)
|
||||
if (result.isDebug) {
|
||||
|
@ -363,7 +363,7 @@ static void convolute(
|
||||
(((cr*(255-a) >> 8)+r) << 16)+
|
||||
(((cg*(255-a) >> 8)+g) << 8)+
|
||||
(((cb*(255-a) >> 8)+b));
|
||||
*output++ = color;;
|
||||
*output++ = color;
|
||||
}
|
||||
xk++;
|
||||
}
|
||||
|
@ -5597,7 +5597,7 @@ QIcon QCommonStylePrivate::iconFromWindowsTheme(QCommonStyle::StandardPixmap sta
|
||||
{
|
||||
Q_UNUSED(option);
|
||||
Q_UNUSED(widget);
|
||||
QIcon icon;;
|
||||
QIcon icon;
|
||||
#ifdef Q_OS_WIN
|
||||
switch (standardIcon) {
|
||||
case QStyle::SP_DriveCDIcon:
|
||||
|
@ -2577,7 +2577,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
|
||||
|
||||
}
|
||||
painter->restore();
|
||||
break;;
|
||||
break;
|
||||
#endif // QT_CONFIG(slider)
|
||||
case CC_ComboBox:
|
||||
painter->save();
|
||||
|
@ -226,7 +226,7 @@ void tst_QtConcurrentMap::map()
|
||||
#if 0
|
||||
// not allowed: map() on a const list, where functors try to modify the items in the list
|
||||
{
|
||||
const QList<int> list = QList<int>() << 1 << 2 << 3;;
|
||||
const QList<int> list = QList<int>() << 1 << 2 << 3;
|
||||
|
||||
QtConcurrent::map(list, MultiplyBy2InPlace());
|
||||
QtConcurrent::map(list, multiplyBy2InPlace);
|
||||
@ -363,7 +363,7 @@ void tst_QtConcurrentMap::blockingMap()
|
||||
#if 0
|
||||
// not allowed: map() on a const list, where functors try to modify the items in the list
|
||||
{
|
||||
const QList<int> list = QList<int>() << 1 << 2 << 3;;
|
||||
const QList<int> list = QList<int>() << 1 << 2 << 3;
|
||||
|
||||
QtConcurrent::blockingMap(list, MultiplyBy2InPlace());
|
||||
QtConcurrent::blockingMap(list, multiplyBy2InPlace);
|
||||
|
@ -541,7 +541,7 @@ void tst_QSettings::ctor()
|
||||
#if defined(Q_OS_DARWIN)
|
||||
if (format == QSettings::NativeFormat) {
|
||||
// more details in QMacSettingsPrivate::QMacSettingsPrivate(), organization was comify()-ed
|
||||
caseSensitive = settings5.fileName().contains("SoftWare.ORG");;
|
||||
caseSensitive = settings5.fileName().contains("SoftWare.ORG");
|
||||
} else {
|
||||
caseSensitive = pathconf(settings5.fileName().toLatin1().constData(), _PC_CASE_SENSITIVE);
|
||||
}
|
||||
|
@ -474,7 +474,7 @@ static void loadCorruptElfCommonRows()
|
||||
memcpy(h, &o, sizeof(o));
|
||||
});
|
||||
newRow("invalid-word-size", "file is for a different word size", [](H h) {
|
||||
h->e_ident[EI_CLASS] = ELFCLASSNONE;;
|
||||
h->e_ident[EI_CLASS] = ELFCLASSNONE;
|
||||
});
|
||||
newRow("unknown-word-size", "file is for a different word size", [](H h) {
|
||||
h->e_ident[EI_CLASS] |= 0x40;
|
||||
|
@ -3206,7 +3206,7 @@ void tst_QStringApiSymmetry::contains_data(bool rhsHasVariableLength)
|
||||
QTest::addRow("haystack: null, needle: empty") << null << QLatin1String()
|
||||
<< empty << QLatin1String("") << true << true;
|
||||
QTest::addRow("haystack: a, needle: empty") << a << QLatin1String("a")
|
||||
<< empty << QLatin1String("") << true << true;;
|
||||
<< empty << QLatin1String("") << true << true;
|
||||
QTest::addRow("haystack: empty, needle: empty") << empty << QLatin1String("")
|
||||
<< empty << QLatin1String("") << true << true;
|
||||
}
|
||||
|
@ -530,7 +530,7 @@ void tst_Collections::list()
|
||||
list << "one" << "two" << "one" << "two";
|
||||
QVERIFY(!list.removeOne("three"));
|
||||
QVERIFY(list.removeOne("two"));
|
||||
QCOMPARE(list, QList<QString>() << "one" << "one" << "two");;
|
||||
QCOMPARE(list, QList<QString>() << "one" << "one" << "two");
|
||||
QVERIFY(list.removeOne("two"));
|
||||
QCOMPARE(list, QList<QString>() << "one" << "one");
|
||||
QVERIFY(!list.removeOne("two"));
|
||||
|
@ -1254,7 +1254,7 @@ void tst_QDBusAbstractAdaptor::sameObjectDifferentPathsPeer()
|
||||
|
||||
void tst_QDBusAbstractAdaptor::scriptableSignalOrNotPeer()
|
||||
{
|
||||
QDBusConnection con("peer");;
|
||||
QDBusConnection con("peer");
|
||||
QVERIFY(con.isConnected());
|
||||
|
||||
{
|
||||
|
@ -192,7 +192,7 @@ void tst_QIcon::isNull() {
|
||||
// test string constructor with empty string
|
||||
QIcon iconEmptyString = QIcon(QString());
|
||||
QVERIFY(iconEmptyString.isNull());
|
||||
QVERIFY(!iconEmptyString.actualSize(QSize(32, 32)).isValid());;
|
||||
QVERIFY(!iconEmptyString.actualSize(QSize(32, 32)).isValid());
|
||||
|
||||
// test string constructor with non-existing file
|
||||
QIcon iconNoFile = QIcon("imagedoesnotexist");
|
||||
|
@ -662,7 +662,7 @@ void tst_QImageReader::supportsAnimation_data()
|
||||
QTest::newRow("BMP: colorful") << QString("colorful.bmp") << false;
|
||||
QTest::newRow("BMP: font") << QString("font.bmp") << false;
|
||||
QTest::newRow("BMP: signed char") << QString("crash-signed-char.bmp") << false;
|
||||
QTest::newRow("BMP: test32bfv4") << QString("test32bfv4.bmp") << false;;
|
||||
QTest::newRow("BMP: test32bfv4") << QString("test32bfv4.bmp") << false;
|
||||
QTest::newRow("BMP: test32v5") << QString("test32v5.bmp") << false;
|
||||
QTest::newRow("XPM: marble") << QString("marble.xpm") << false;
|
||||
QTest::newRow("PNG: kollada") << QString("kollada.png") << false;
|
||||
|
@ -45,7 +45,7 @@ void tst_QRasterWindow::basic()
|
||||
w.reset();
|
||||
w.resize(400, 400);
|
||||
w.show();
|
||||
QVERIFY(QTest::qWaitForWindowExposed(&w));;
|
||||
QVERIFY(QTest::qWaitForWindowExposed(&w));
|
||||
|
||||
QVERIFY(w.paintCount >= 1);
|
||||
|
||||
|
@ -73,7 +73,7 @@ private slots:
|
||||
void toCmykNonDestructive();
|
||||
|
||||
void toHsl_data();
|
||||
void toHsl();;
|
||||
void toHsl();
|
||||
void toHslNonDestructive();
|
||||
|
||||
void convertTo();
|
||||
|
@ -776,7 +776,7 @@ void tst_QPathClipper::testIntersections7()
|
||||
void tst_QPathClipper::testIntersections8()
|
||||
{
|
||||
QPainterPath path1 = Paths::node() * QTransform().translate(100, 50);
|
||||
QPainterPath path2 = Paths::node() * QTransform().translate(150, 50);;
|
||||
QPainterPath path2 = Paths::node() * QTransform().translate(150, 50);
|
||||
|
||||
QVERIFY(path1.intersects(path2));
|
||||
QVERIFY(path2.intersects(path1));
|
||||
@ -824,7 +824,7 @@ void tst_QPathClipper::testIntersections9()
|
||||
QVERIFY(path1.intersects(path2));
|
||||
QVERIFY(path2.intersects(path1));
|
||||
|
||||
path1 = QPainterPath();;
|
||||
path1 = QPainterPath();
|
||||
path2 = QPainterPath();
|
||||
|
||||
path1.addRect(QRectF(-1,191, 136, 106));
|
||||
@ -832,7 +832,7 @@ void tst_QPathClipper::testIntersections9()
|
||||
QVERIFY(path1.intersects(path2));
|
||||
QVERIFY(path2.intersects(path1));
|
||||
|
||||
path1 = QPainterPath();;
|
||||
path1 = QPainterPath();
|
||||
path2 = QPainterPath();
|
||||
|
||||
path1.moveTo(-1 , 143);
|
||||
|
@ -2583,7 +2583,7 @@ void tst_QTcpSocket::moveToThread0()
|
||||
|
||||
{
|
||||
// Case 1: Moved after connecting, before waiting for connection.
|
||||
QTcpSocket *socket = newSocket();;
|
||||
QTcpSocket *socket = newSocket();
|
||||
socket->connectToHost(QtNetworkSettings::imapServerName(), 143);
|
||||
socket->moveToThread(0);
|
||||
QVERIFY(socket->waitForConnected(5000));
|
||||
|
@ -3376,7 +3376,7 @@ void tst_QGraphicsItem::childrenBoundingRect()
|
||||
childChild->setPos(500, 500);
|
||||
child->setTransform(QTransform().rotate(90), true);
|
||||
|
||||
scene.addPolygon(parent->mapToScene(parent->boundingRect() | parent->childrenBoundingRect()))->setPen(QPen(Qt::red));;
|
||||
scene.addPolygon(parent->mapToScene(parent->boundingRect() | parent->childrenBoundingRect()))->setPen(QPen(Qt::red));
|
||||
|
||||
QGraphicsView view(&scene);
|
||||
view.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
|
||||
|
@ -619,7 +619,7 @@ void tst_QListView::moveCursor4()
|
||||
|
||||
void tst_QListView::moveCursor5()
|
||||
{
|
||||
PublicListView listView;;
|
||||
PublicListView listView;
|
||||
QStandardItemModel model;
|
||||
QIcon icon(QPixmap(300,300));
|
||||
model.appendRow(new QStandardItem(icon,"11"));
|
||||
|
@ -1504,7 +1504,7 @@ void tst_QTreeWidget::keyboardNavigation()
|
||||
if (testWidget->currentItem() != item) {
|
||||
QCOMPARE(testWidget->currentItem(), item->parent());
|
||||
item = testWidget->currentItem();
|
||||
row = item->parent() ? item->parent()->indexOfChild(item) : testWidget->indexOfTopLevelItem(item);;
|
||||
row = item->parent() ? item->parent()->indexOfChild(item) : testWidget->indexOfTopLevelItem(item);
|
||||
}
|
||||
break;
|
||||
case Qt::Key_Right:
|
||||
|
@ -192,7 +192,7 @@ void tst_QBoxLayout::setStyleShouldChangeSpacing()
|
||||
window.setWindowTitle(QTest::currentTestFunction());
|
||||
QHBoxLayout *hbox = new QHBoxLayout(&window);
|
||||
QPushButton *pb1 = new QPushButton(tr("The spacing between this"));
|
||||
QPushButton *pb2 = new QPushButton(tr("and this button should depend on the style of the parent widget"));;
|
||||
QPushButton *pb2 = new QPushButton(tr("and this button should depend on the style of the parent widget"));
|
||||
pb1->setAttribute(Qt::WA_LayoutUsesWidgetRect);
|
||||
pb2->setAttribute(Qt::WA_LayoutUsesWidgetRect);
|
||||
hbox->addWidget(pb1);
|
||||
|
@ -3801,7 +3801,7 @@ void tst_QDateTimeEdit::deleteCalendarWidget()
|
||||
QVERIFY(!edit.calendarWidget());
|
||||
edit.setCalendarPopup(true);
|
||||
QVERIFY(edit.calendarWidget());
|
||||
edit.calendarWidget()->setObjectName("cw1");;
|
||||
edit.calendarWidget()->setObjectName("cw1");
|
||||
|
||||
// delete
|
||||
delete edit.calendarWidget();
|
||||
|
@ -1930,7 +1930,7 @@ void tst_QMainWindow::addToolbarAfterShow()
|
||||
void tst_QMainWindow::centralWidgetSize()
|
||||
{
|
||||
if (qGuiApp->styleHints()->showIsFullScreen())
|
||||
QSKIP("The platform is auto maximizing, so the test makes no sense");;
|
||||
QSKIP("The platform is auto maximizing, so the test makes no sense");
|
||||
|
||||
QMainWindow mainWindow;
|
||||
mainWindow.menuBar()->addMenu("menu");
|
||||
|
@ -1377,7 +1377,7 @@ void tst_QMdiSubWindow::setWindowTitle()
|
||||
// other widgets which are not real top-level widgets).
|
||||
QCOMPARE(window->windowTitle(), expectedWindowTitle);
|
||||
|
||||
textEdit->setWindowModified(true);;
|
||||
textEdit->setWindowModified(true);
|
||||
expectedWindowTitle = QLatin1String("Override child title");
|
||||
window->setWindowTitle(expectedWindowTitle);
|
||||
QVERIFY(window->isWindowModified());
|
||||
|
@ -26,9 +26,9 @@ int main(int argc, char **argv)
|
||||
|
||||
QToolBar *toolBar = new QToolBar();
|
||||
|
||||
toolBar->addWidget(new StaticWidget())->setVisible(true);;
|
||||
toolBar->addWidget(new StaticWidget())->setVisible(true);
|
||||
|
||||
toolBar->addWidget(new QSpinBox())->setVisible(true);;
|
||||
toolBar->addWidget(new QSpinBox())->setVisible(true);
|
||||
mainWindow.addToolBar(toolBar);
|
||||
|
||||
mainWindow.resize(600, 400);
|
||||
|
@ -623,7 +623,7 @@ void createWindow()
|
||||
static QColor colors[] = { Qt::red, Qt::green, Qt::blue, Qt::yellow, Qt::cyan, Qt::gray };
|
||||
const int n = windows.count();
|
||||
Window *w = new Window(QString::asprintf("Window+Thread #%d (%s)", n, qPrintable(graphicsApiName())), graphicsApi);
|
||||
Renderer *renderer = new Renderer(w, colors[n % 6], n % 3);;
|
||||
Renderer *renderer = new Renderer(w, colors[n % 6], n % 3);
|
||||
QObject::connect(w, &Window::initRequested, w, [renderer] {
|
||||
renderer->sendInit();
|
||||
});
|
||||
|
@ -35,7 +35,7 @@ public:
|
||||
#elif QT_CONFIG(xcb)
|
||||
using Handle = xcb_window_t;
|
||||
#elif defined(ANDROID)
|
||||
using Handle = QtJniTypes::View;;
|
||||
using Handle = QtJniTypes::View;
|
||||
#endif
|
||||
|
||||
NativeWindow();
|
||||
|
@ -457,7 +457,7 @@ DFA DFA::minimize() const
|
||||
}
|
||||
|
||||
/*
|
||||
qDebug() << "states to eliminiate:" << statesToEliminate.count();;
|
||||
qDebug() << "states to eliminiate:" << statesToEliminate.count();
|
||||
qDebug() << "merging" << statesToEliminate;
|
||||
debug();
|
||||
*/
|
||||
|
Loading…
x
Reference in New Issue
Block a user