diff options
| -rw-r--r-- | src/activeqt/container/qaxbase.cpp | 6 | ||||
| -rw-r--r-- | src/activeqt/container/qaxdump.cpp | 6 | ||||
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 2 | ||||
| -rw-r--r-- | tools/dumpcpp/main.cpp | 2 | ||||
| -rw-r--r-- | tools/testcon/mainwindow.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 4944c3b..a2c6ffd 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -2421,7 +2421,7 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs) if (funcdesc->cParams - funcdesc->cParamsOpt <= 1) { bool dontBreak = false; // getter with non-default-parameters -> fall through to function handling - if (funcdesc->invkind == INVOKE_PROPERTYGET && parameters.count() && funcdesc->cParams - funcdesc->cParamsOpt) { + if (funcdesc->invkind == INVOKE_PROPERTYGET && !parameters.isEmpty() && funcdesc->cParams - funcdesc->cParamsOpt) { dontBreak = true; } else { uint flags = Readable; @@ -3071,7 +3071,7 @@ const QMetaObject *QAxBase::axBaseMetaObject() const */ void QAxBase::connectNotify() { - if (d->eventSink.count()) // already listening + if (!d->eventSink.isEmpty()) // already listening return; IEnumConnectionPoints *epoints = nullptr; @@ -3168,7 +3168,7 @@ void QAxBase::connectNotify() typelib->Release(); // make sure we don't try again - if (!d->eventSink.count()) + if (d->eventSink.isEmpty()) d->eventSink.insert(QUuid{}, nullptr); } diff --git a/src/activeqt/container/qaxdump.cpp b/src/activeqt/container/qaxdump.cpp index 5ae4f79..fba3f1a 100644 --- a/src/activeqt/container/qaxdump.cpp +++ b/src/activeqt/container/qaxdump.cpp @@ -223,7 +223,7 @@ QString qax_generateDocumentation(QAxBase *that) detail += QLatin1String("<p>Or call the function directly:<pre>\n"); - bool hasParams = slot.parameterTypes().count() != 0; + const bool hasParams = !slot.parameterTypes().isEmpty(); if (hasParams) detail += QLatin1String("\tQVariantList params = ...\n"); detail += QLatin1String("\t"); @@ -392,12 +392,12 @@ QString qax_generateDocumentation(QAxBase *that) stream << "</ul>" << Qt::endl; } } - if (methodDetails.count()) { + if (!methodDetails.isEmpty()) { stream << "<hr><h2>Member Function Documentation</h2>" << Qt::endl; for (int i = 0; i < methodDetails.count(); ++i) stream << methodDetails.at(i) << Qt::endl; } - if (propDetails.count()) { + if (!propDetails.isEmpty()) { stream << "<hr><h2>Property Documentation</h2>" << Qt::endl; for (int i = 0; i < propDetails.count(); ++i) stream << propDetails.at(i) << Qt::endl; diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index b08b484..3d10886 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -2616,7 +2616,7 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid, case DISPATCH_METHOD: case DISPATCH_PROPERTYPUT: case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: - if (m_spAdviseSink || adviseSinks.count()) { + if (m_spAdviseSink || !adviseSinks.isEmpty()) { FORMATETC fmt; fmt.cfFormat = 0; fmt.ptd = nullptr; diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index 6aae5e1..e8b6568 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -1152,7 +1152,7 @@ int main(int argc, char **argv) settings.beginGroup(key); QStringList versions = settings.childGroups(); QStringList codes; - if (versions.count()) { + if (!versions.isEmpty()) { settings.beginGroup(QLatin1Char('/') + versions.last()); codes = settings.childGroups(); key += QLatin1Char('/') + versions.last(); diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp index 1e5347e..8c68e32 100644 --- a/tools/testcon/mainwindow.cpp +++ b/tools/testcon/mainwindow.cpp @@ -353,7 +353,7 @@ void MainWindow::on_VerbMenu_aboutToShow() VerbMenu->addAction(verbs.at(i)); } - if (!verbs.count()) { // no verbs? + if (verbs.isEmpty()) { // no verbs? VerbMenu->addAction(tr("-- Object does not support any verbs --"))->setEnabled(false); } } |