summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/activeqt/comapp/main.cpp2
-rw-r--r--examples/activeqt/qutlook/addressview.cpp2
-rw-r--r--src/activeqt/container/qaxbase.cpp28
-rw-r--r--src/activeqt/container/qaxdump.cpp12
-rw-r--r--src/activeqt/container/qaxselect.cpp2
-rw-r--r--src/activeqt/container/qaxwidget.cpp6
-rw-r--r--src/activeqt/control/qaxserver.cpp10
-rw-r--r--src/activeqt/control/qaxserverbase.cpp42
-rw-r--r--src/activeqt/control/qaxserverdll.cpp4
-rw-r--r--src/activeqt/control/qaxservermain.cpp12
-rw-r--r--src/activeqt/shared/qaxtypes.cpp10
-rw-r--r--src/tools/idc/main.cpp2
-rw-r--r--tools/dumpcpp/main.cpp20
-rw-r--r--tools/testcon/changeproperties.cpp2
-rw-r--r--tools/testcon/invokemethod.cpp2
-rw-r--r--tools/testcon/mainwindow.cpp4
16 files changed, 80 insertions, 80 deletions
diff --git a/examples/activeqt/comapp/main.cpp b/examples/activeqt/comapp/main.cpp
index 3d98555..9f8ba2b 100644
--- a/examples/activeqt/comapp/main.cpp
+++ b/examples/activeqt/comapp/main.cpp
@@ -188,7 +188,7 @@ Application *DocumentList::application() const
int DocumentList::count() const
{
- return m_list.count();
+ return m_list.size();
}
Document *DocumentList::item(int index) const
diff --git a/examples/activeqt/qutlook/addressview.cpp b/examples/activeqt/qutlook/addressview.cpp
index fd1e0d3..a0eaad4 100644
--- a/examples/activeqt/qutlook/addressview.cpp
+++ b/examples/activeqt/qutlook/addressview.cpp
@@ -149,7 +149,7 @@ QVariant AddressBookModel::data(const QModelIndex &index, int role) const
cache.insert(index, data);
}
- if (index.column() < data.count())
+ if (index.column() < data.size())
return data.at(index.column());
return QVariant();
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index a2c6ffd..c97ad9a 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -186,7 +186,7 @@ int QMetaObjectExtra::numParameter(const QByteArray &prototype) const
if (!memberInfo.contains(prototype))
parsePrototype(prototype);
- return memberInfo.value(prototype).count();
+ return memberInfo.value(prototype).size();
}
QByteArray QMetaObjectExtra::paramType(const QByteArray &prototype, int index, bool *out) const
@@ -198,7 +198,7 @@ QByteArray QMetaObjectExtra::paramType(const QByteArray &prototype, int index, b
*out = false;
const auto plist = memberInfo.value(prototype);
- if (index > plist.count() - 1)
+ if (index > plist.size() - 1)
return QByteArray();
QByteArray param(plist.at(index));
@@ -2321,8 +2321,8 @@ QByteArray MetaObjectGenerator::createPrototype(FUNCDESC *funcdesc, ITypeInfo *t
if (funcdesc->invkind == INVOKE_FUNC && type == hresult)
type = nullptr;
- int p;
- for (p = 1; p < names.count(); ++p) {
+ qsizetype p;
+ for (p = 1; p < names.size(); ++p) {
// parameter
QByteArray paramName = names.at(p);
bool optional = p > (funcdesc->cParams - funcdesc->cParamsOpt);
@@ -2498,9 +2498,9 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs)
bool defargs;
do {
QByteArray pnames;
- for (int p = 0; p < parameters.count(); ++p) {
+ for (qsizetype p = 0; p < parameters.size(); ++p) {
pnames += parameters.at(p);
- if (p < parameters.count() - 1)
+ if (p < parameters.size() - 1)
pnames += ',';
}
defargs = pnames.contains("=0");
@@ -2512,7 +2512,7 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs)
if (defargs) {
parameters.takeLast();
- int lastParam = prototype.lastIndexOf(',');
+ qsizetype lastParam = prototype.lastIndexOf(',');
if (lastParam == -1)
lastParam = prototype.indexOf('(') + 1;
prototype.truncate(lastParam);
@@ -2725,9 +2725,9 @@ void MetaObjectGenerator::readEventInterface(ITypeInfo *eventinfo, IConnectionPo
prototype = createPrototype(/*in*/ funcdesc, eventinfo, names, /*out*/type, parameters);
if (!hasSignal(prototype)) {
QByteArray pnames;
- for (int p = 0; p < parameters.count(); ++p) {
+ for (qsizetype p = 0; p < parameters.size(); ++p) {
pnames += parameters.at(p);
- if (p < parameters.count() - 1)
+ if (p < parameters.size() - 1)
pnames += ',';
}
addSignal(prototype, pnames);
@@ -3581,7 +3581,7 @@ bool QAxBase::dynamicCallHelper(const char *name, void *inout, QList<QVariant> &
Q_ASSERT(d->metaobj);
const QMetaObjectExtra &moExtra = moextra_cache.value(d->metaobj);
- int varc = vars.count();
+ qsizetype varc = vars.size();
QByteArray normFunction = QMetaObject::normalizedSignature(name);
QByteArray function(normFunction);
@@ -3691,7 +3691,7 @@ bool QAxBase::dynamicCallHelper(const char *name, void *inout, QList<QVariant> &
curArg += cc;
}
- varc = vars.count();
+ varc = vars.size();
}
} else {
if (d->useMetaObject)
@@ -3713,7 +3713,7 @@ bool QAxBase::dynamicCallHelper(const char *name, void *inout, QList<QVariant> &
varc = qMin(varc, moExtra.numParameter(normFunction));
arg = varc <= QAX_NUM_PARAMS ? staticarg : new VARIANT[varc];
outArgs = QBitArray(varc);
- for (int i = 0; i < varc; ++i) {
+ for (qsizetype i = 0; i < varc; ++i) {
const QVariant &var = vars.at(i);
VariantInit(arg + (varc - i - 1));
bool out = false;
@@ -3775,13 +3775,13 @@ bool QAxBase::dynamicCallHelper(const char *name, void *inout, QList<QVariant> &
}
if (disptype == (DISPATCH_METHOD|DISPATCH_PROPERTYGET) && hres == S_OK && varc) {
- for (int i = 0; i < varc; ++i)
+ for (qsizetype i = 0; i < varc; ++i)
if ((arg[varc-i-1].vt & VT_BYREF) || outArgs[i]) // update out-parameters
vars[i] = VARIANTToQVariant(arg[varc-i-1], vars.at(i).typeName());
}
// clean up
- for (int i = 0; i < varc; ++i)
+ for (qsizetype i = 0; i < varc; ++i)
clearVARIANT(params.rgvarg+i);
if (arg && arg != staticarg)
delete[] arg;
diff --git a/src/activeqt/container/qaxdump.cpp b/src/activeqt/container/qaxdump.cpp
index fba3f1a..5ba18c5 100644
--- a/src/activeqt/container/qaxdump.cpp
+++ b/src/activeqt/container/qaxdump.cpp
@@ -102,15 +102,15 @@ static inline QString docuFromName(ITypeInfo *typeInfo, const QString &name)
static QByteArray namedPrototype(const QByteArrayList &parameterTypes, const QByteArrayList &parameterNames, int numDefArgs = 0)
{
QByteArray prototype("(");
- for (int p = 0; p < parameterTypes.count(); ++p) {
+ for (qsizetype p = 0; p < parameterTypes.size(); ++p) {
prototype += parameterTypes.at(p);
- if (p < parameterNames.count())
+ if (p < parameterNames.size())
prototype += ' ' + parameterNames.at(p);
- if (numDefArgs >= parameterTypes.count() - p)
+ if (numDefArgs >= parameterTypes.size() - p)
prototype += " = 0";
- if (p < parameterTypes.count() - 1)
+ if (p < parameterTypes.size() - 1)
prototype += ", ";
}
prototype += ')';
@@ -394,12 +394,12 @@ QString qax_generateDocumentation(QAxBase *that)
}
if (!methodDetails.isEmpty()) {
stream << "<hr><h2>Member Function Documentation</h2>" << Qt::endl;
- for (int i = 0; i < methodDetails.count(); ++i)
+ for (qsizetype i = 0; i < methodDetails.size(); ++i)
stream << methodDetails.at(i) << Qt::endl;
}
if (!propDetails.isEmpty()) {
stream << "<hr><h2>Property Documentation</h2>" << Qt::endl;
- for (int i = 0; i < propDetails.count(); ++i)
+ for (qsizetype i = 0; i < propDetails.size(); ++i)
stream << propDetails.at(i) << Qt::endl;
}
diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp
index 2c87b9c..0fcc2e9 100644
--- a/src/activeqt/container/qaxselect.cpp
+++ b/src/activeqt/container/qaxselect.cpp
@@ -277,7 +277,7 @@ public:
std::sort(m_controls.begin(), m_controls.end());
}
- int rowCount(const QModelIndex & = QModelIndex()) const override { return m_controls.count(); }
+ int rowCount(const QModelIndex & = QModelIndex()) const override { return m_controls.size(); }
QVariant data(const QModelIndex &index, int role) const override ;
Qt::ItemFlags flags(const QModelIndex &index) const override ;
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index 1bd5d4f..cb81f24 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -1238,11 +1238,11 @@ HRESULT WINAPI QAxClientSite::InsertMenus(HMENU /*hmenuShared*/, LPOLEMENUGROUPW
}
}
if (fileMenu)
- lpMenuWidths->width[0] = fileMenu->actions().count();
+ lpMenuWidths->width[0] = fileMenu->actions().size();
if (viewMenu)
- lpMenuWidths->width[2] = viewMenu->actions().count();
+ lpMenuWidths->width[2] = viewMenu->actions().size();
if (windowMenu)
- lpMenuWidths->width[4] = windowMenu->actions().count();
+ lpMenuWidths->width[4] = windowMenu->actions().size();
return S_OK;
}
diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp
index afc8413..dfe877b 100644
--- a/src/activeqt/control/qaxserver.cpp
+++ b/src/activeqt/control/qaxserver.cpp
@@ -104,7 +104,7 @@ QAxFactory *qAxFactory()
// register all types with metatype system as pointers
QStringList keys(qax_factory->featureList());
- for (int i = 0; i < keys.count(); ++i) {
+ for (int i = 0; i < keys.size(); ++i) {
QByteArray pointerType = keys.at(i).toLatin1() + '*';
if (QMetaType::fromName(pointerType).id() == QMetaType::UnknownType)
qRegisterMetaType<void *>(pointerType);
@@ -307,7 +307,7 @@ static void UpdateRegistryKeys(bool bRegister, const QString keyPath, QScopedPoi
QString mime = QLatin1String(mo->classInfo(mo->indexOfClassInfo("MIME")).value());
if (!mime.isEmpty()) {
QStringList mimeTypes = mime.split(QLatin1Char(';'));
- for (int m = 0; m < mimeTypes.count(); ++m) {
+ for (qsizetype m = 0; m < mimeTypes.size(); ++m) {
mime = mimeTypes.at(m);
if (mime.isEmpty())
continue;
@@ -397,7 +397,7 @@ static void UpdateRegistryKeys(bool bRegister, const QString keyPath, QScopedPoi
QString mime = QLatin1String(mo->classInfo(mo->indexOfClassInfo("MIME")).value());
if (!mime.isEmpty()) {
QStringList mimeTypes = mime.split(QLatin1Char(';'));
- for (int m = 0; m < mimeTypes.count(); ++m) {
+ for (qsizetype m = 0; m < mimeTypes.size(); ++m) {
mime = mimeTypes.at(m);
if (mime.isEmpty())
continue;
@@ -764,7 +764,7 @@ static QByteArray prototype(const QByteArrayList &parameterTypes, const QByteArr
{
QByteArray prototype;
- for (int p = 0; p < parameterTypes.count() && *ok; ++p) {
+ for (qsizetype p = 0; p < parameterTypes.size() && *ok; ++p) {
bool out = false;
QByteArray type(parameterTypes.at(p));
const QByteArray &name = parameterNames.at(p);
@@ -795,7 +795,7 @@ static QByteArray prototype(const QByteArrayList &parameterTypes, const QByteArr
else
prototype += "p_" + replaceKeyword(name);
- if (p < parameterTypes.count() - 1)
+ if (p < parameterTypes.size() - 1)
prototype += ", ";
}
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index f6480e0..99623ef 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -580,7 +580,7 @@ public:
if (!pcFetched && cConnections > 1)
return E_POINTER;
- const int count = cpoints.count();
+ const qsizetype count = cpoints.size();
unsigned long i;
for (i = 0; i < cConnections; i++) {
if (current==count)
@@ -596,7 +596,7 @@ public:
}
STDMETHOD(Skip)(ULONG cConnections) override
{
- const int count = cpoints.count();
+ const qsizetype count = cpoints.size();
while (cConnections) {
if (current == count)
return S_FALSE;
@@ -717,7 +717,7 @@ public:
}
CONNECTDATA cd;
- cd.dwCookie = connections.count()+1;
+ cd.dwCookie = connections.size() + 1;
cd.pUnk = pUnk;
cd.pUnk->AddRef();
connections.append(cd);
@@ -726,8 +726,8 @@ public:
}
STDMETHOD(Unadvise)(DWORD dwCookie) override
{
- const int count = connections.count();
- for (int i = 0; i < count; ++i) {
+ const qsizetype count = connections.size();
+ for (qsizetype i = 0; i < count; ++i) {
if (connections.at(i).dwCookie == dwCookie) {
connections.at(i).pUnk->Release();
connections.removeAt(i);
@@ -755,7 +755,7 @@ public:
if (!pcFetched && cConnections > 1)
return E_POINTER;
- const int count = connections.count();
+ const qsizetype count = connections.size();
unsigned long i;
for (i = 0; i < cConnections; i++) {
@@ -771,7 +771,7 @@ public:
}
STDMETHOD(Skip)(ULONG cConnections) override
{
- const int count = connections.count();
+ const qsizetype count = connections.size();
while (cConnections) {
if (current == count)
return S_FALSE;
@@ -1144,7 +1144,7 @@ QAxServerBase::~QAxServerBase()
if (m_spAdviseSink) m_spAdviseSink->Release();
m_spAdviseSink = nullptr;
- for (int i = 0; i < adviseSinks.count(); ++i) {
+ for (qsizetype i = 0; i < adviseSinks.size(); ++i) {
adviseSinks.at(i).pAdvSink->Release();
}
if (m_spClientSite) m_spClientSite->Release();
@@ -1832,7 +1832,7 @@ void QAxServerBase::update()
m_spInPlaceSiteWindowless->InvalidateRect(nullptr, true);
} else if (m_spAdviseSink) {
m_spAdviseSink->OnViewChange(DVASPECT_CONTENT, -1);
- for (int i = 0; i < adviseSinks.count(); ++i) {
+ for (qsizetype i = 0; i < adviseSinks.size(); ++i) {
adviseSinks.at(i).pAdvSink->OnViewChange(DVASPECT_CONTENT, -1);
}
}
@@ -1961,7 +1961,7 @@ int QAxServerBase::qt_metacall(QMetaObject::Call call, int index, void **argv)
const QMetaObject *mo = qt.object->metaObject();
QMetaMethod signal;
DISPID eventId = index;
- int pcount = 0;
+ qsizetype pcount = 0;
QByteArray type;
QByteArrayList ptypes;
@@ -2014,12 +2014,12 @@ int QAxServerBase::qt_metacall(QMetaObject::Call call, int index, void **argv)
if (!signature.isEmpty())
ptypes = signature.split(',');
- pcount = ptypes.count();
+ pcount = ptypes.size();
}
break;
}
if (pcount && !argv) {
- qWarning("QAxServerBase::qt_metacall: Missing %d arguments", pcount);
+ qWarning("QAxServerBase::qt_metacall: Missing %d arguments", int(pcount));
return false;
}
if (eventId == -1)
@@ -2048,7 +2048,7 @@ int QAxServerBase::qt_metacall(QMetaObject::Call call, int index, void **argv)
if (pcount) // Use malloc/free for eval package compatibility
dispParams.rgvarg = static_cast<VARIANTARG *>(malloc(size_t(pcount) * sizeof(VARIANTARG)));
- int p = 0;
+ qsizetype p = 0;
for (p = 0; p < pcount; ++p) {
VARIANT *arg = dispParams.rgvarg + (pcount - p - 1);
VariantInit(arg);
@@ -2432,7 +2432,7 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid,
QByteArrayList ptypes;
if (!prototype.isEmpty())
ptypes = prototype.split(',');
- UINT pcount = UINT(ptypes.count());
+ UINT pcount = UINT(ptypes.size());
// verify parameter count
if (pcount > pDispParams->cArgs) {
@@ -2630,7 +2630,7 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid,
m_spAdviseSink->OnViewChange(DVASPECT_CONTENT, -1);
m_spAdviseSink->OnDataChange(&fmt, &stg);
}
- for (int i = 0; i < adviseSinks.count(); ++i) {
+ for (qsizetype i = 0; i < adviseSinks.size(); ++i) {
adviseSinks.at(i).pAdvSink->OnDataChange(&fmt, &stg);
}
}
@@ -3072,7 +3072,7 @@ HRESULT WINAPI QAxServerBase::Load(LPCOLESTR fileName, DWORD /* mode */)
QString mimeType = QLatin1String(mo->classInfo(mimeIndex).value());
QStringList mimeTypes = mimeType.split(QLatin1Char(';'));
- for (int m = 0; m < mimeTypes.count(); ++m) {
+ for (qsizetype m = 0; m < mimeTypes.size(); ++m) {
const QString &mime = mimeTypes.at(m);
if (mime.count(QLatin1Char(':')) != 2) {
qWarning() << class_name << ": Invalid syntax in Q_CLASSINFO for MIME";
@@ -3117,7 +3117,7 @@ HRESULT WINAPI QAxServerBase::Save(LPCOLESTR fileName, BOOL fRemember)
QString mimeType = QLatin1String(mo->classInfo(mimeIndex).value());
QStringList mimeTypes = mimeType.split(QLatin1Char(';'));
- for (int m = 0; m < mimeTypes.count(); ++m) {
+ for (qsizetype m = 0; m < mimeTypes.size(); ++m) {
const QString &mime = mimeTypes.at(m);
if (mime.count(QLatin1Char(':')) != 2) {
qWarning() << class_name << ": Invalid syntax in Q_CLASSINFO for MIME";
@@ -3739,7 +3739,7 @@ HRESULT WINAPI QAxServerBase::GetMiscStatus(DWORD dwAspect, DWORD *pdwStatus)
*/
HRESULT WINAPI QAxServerBase::Advise(IAdviseSink* pAdvSink, DWORD* pdwConnection)
{
- *pdwConnection = DWORD(adviseSinks.count()) + 1;
+ *pdwConnection = DWORD(adviseSinks.size()) + 1;
STATDATA data = { {0, nullptr, DVASPECT_CONTENT, -1, TYMED_NULL} , 0, pAdvSink, *pdwConnection };
adviseSinks.append(data);
pAdvSink->AddRef();
@@ -3774,7 +3774,7 @@ HRESULT WINAPI QAxServerBase::Close(DWORD dwSaveOption)
if (m_spAdviseSink)
m_spAdviseSink->OnClose();
- for (int i = 0; i < adviseSinks.count(); ++i) {
+ for (qsizetype i = 0; i < adviseSinks.size(); ++i) {
adviseSinks.at(i).pAdvSink->OnClose();
}
@@ -4110,7 +4110,7 @@ HRESULT WINAPI QAxServerBase::SetMoniker(DWORD, IMoniker*)
*/
HRESULT WINAPI QAxServerBase::Unadvise(DWORD dwConnection)
{
- for (int i = 0; i < adviseSinks.count(); ++i) {
+ for (qsizetype i = 0; i < adviseSinks.size(); ++i) {
STATDATA entry = adviseSinks.at(i);
if (entry.dwConnection == dwConnection) {
entry.pAdvSink->Release();
@@ -4207,7 +4207,7 @@ HRESULT WINAPI QAxServerBase::DAdvise(FORMATETC *pformatetc, DWORD advf,
if (pformatetc->dwAspect != DVASPECT_CONTENT)
return E_FAIL;
- *pdwConnection = adviseSinks.count() + 1;
+ *pdwConnection = adviseSinks.size() + 1;
STATDATA data = {
{pformatetc->cfFormat,pformatetc->ptd,pformatetc->dwAspect,pformatetc->lindex,pformatetc->tymed},
advf, pAdvSink, *pdwConnection
diff --git a/src/activeqt/control/qaxserverdll.cpp b/src/activeqt/control/qaxserverdll.cpp
index c1e6767..50d4e95 100644
--- a/src/activeqt/control/qaxserverdll.cpp
+++ b/src/activeqt/control/qaxserverdll.cpp
@@ -126,8 +126,8 @@ STDAPI DllCanUnloadNow()
// check if qApp still runs widgets (in other DLLs)
QWidgetList widgets = QApplication::allWidgets();
- int count = widgets.count();
- for (int w = 0; w < widgets.count(); ++w) {
+ qsizetype count = widgets.size();
+ for (qsizetype w = 0; w < widgets.size(); ++w) {
// remove all Qt generated widgets
QWidget *widget = widgets.at(w);
if (widget->windowType() == Qt::Desktop || widget->objectName() == QLatin1String("Qt internal tablet widget"))
diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp
index dfed97b..9c1d597 100644
--- a/src/activeqt/control/qaxservermain.cpp
+++ b/src/activeqt/control/qaxservermain.cpp
@@ -134,7 +134,7 @@ bool qax_startServer(QAxFactory::ServerType type)
return true;
const QStringList keys = qAxFactory()->featureList();
- const int keyCount = keys.count();
+ const qsizetype keyCount = keys.size();
if (!keyCount)
return false;
@@ -142,7 +142,7 @@ bool qax_startServer(QAxFactory::ServerType type)
StartMonitor();
classRegistration = new DWORD[keyCount];
- int object = 0;
+ qsizetype object = 0;
for (object = 0; object < keyCount; ++object) {
IUnknown* p = nullptr;
CLSID clsid = qAxFactory()->classID(keys.at(object));
@@ -247,7 +247,7 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
int nRet = 0;
bool run = true;
bool runServer = false;
- for (int i = 0; i < cmds.count(); ++i) {
+ for (qsizetype i = 0; i < cmds.size(); ++i) {
const QString &cmd = cmds.at(i);
if (matchesOption(cmd, "activex") || matchesOption(cmd, "embedding")) {
runServer = true;
@@ -269,13 +269,13 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
break;
} else if (matchesOption(cmd, "dumpidl")) {
++i;
- if (i < cmds.count()) {
+ if (i < cmds.size()) {
const QString &outfile = cmds.at(i);
++i;
QString version;
- if (i < cmds.count() && matchesOption(cmds.at(i), "version")) {
+ if (i < cmds.size() && matchesOption(cmds.at(i), "version")) {
++i;
- if (i < cmds.count())
+ if (i < cmds.size())
version = cmds.at(i);
else
version = QStringLiteral("1.0");
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp
index fa74c7b..99ffaf2 100644
--- a/src/activeqt/shared/qaxtypes.cpp
+++ b/src/activeqt/shared/qaxtypes.cpp
@@ -447,7 +447,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
case QMetaType::QVariantList:
{
const auto list = qvar.toList();
- const int count = list.count();
+ const qsizetype count = list.size();
VARTYPE vt = VT_VARIANT;
int listType = QMetaType::QVariant;
if (!typeName.isEmpty() && typeName.startsWith("QList<")) {
@@ -487,7 +487,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
// treated as a 2D array. The column count is taken from the 1st element.
if (count) {
QVariantList col = list.at(0).toList();
- int maxColumns = col.count();
+ qsizetype maxColumns = col.size();
if (maxColumns) {
is2D = true;
SAFEARRAYBOUND rgsabound[2] = { {0, 0}, {0, 0} };
@@ -498,7 +498,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
for (LONG i = 0; i < count; ++i) {
rgIndices[0] = i;
QVariantList columns = list.at(i).toList();
- int columnCount = qMin(maxColumns, columns.count());
+ qsizetype columnCount = qMin(maxColumns, columns.size());
for (LONG j = 0; j < columnCount; ++j) {
const QVariant &elem = columns.at(j);
VariantInit(&variant);
@@ -541,7 +541,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
case QMetaType::QStringList:
{
const QStringList list = qvar.toStringList();
- const int count = list.count();
+ const qsizetype count = list.size();
SAFEARRAY *array = SafeArrayCreateVector(VT_BSTR, 0, count);
for (LONG index = 0; index < count; ++index) {
QString elem = list.at(index);
@@ -568,7 +568,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
case QMetaType::QByteArray:
{
const QByteArray bytes = qvar.toByteArray();
- const uint count = bytes.count();
+ const uint count = static_cast<uint>(bytes.size());
SAFEARRAY *array = SafeArrayCreateVector(VT_UI1, 0, count);
if (count) {
const char *data = bytes.constData();
diff --git a/src/tools/idc/main.cpp b/src/tools/idc/main.cpp
index 3a84cd7..b26dfec 100644
--- a/src/tools/idc/main.cpp
+++ b/src/tools/idc/main.cpp
@@ -145,7 +145,7 @@ static bool attachTypeLibrary(const QString &applicationName, int resource, cons
return false;
}
if (!UpdateResource(hExe, L"TYPELIB", MAKEINTRESOURCE(resource), 0,
- const_cast<char *>(data.data()), DWORD(data.count()))) {
+ const_cast<char *>(data.data()), DWORD(data.size()))) {
EndUpdateResource(hExe, true);
if (errorMessage)
*errorMessage = QString::fromLatin1("Failed to attach type library to binary %1 - could not update file.").arg(applicationName);
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index e8b6568..162c6c6 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -124,9 +124,9 @@ void generateNameSpace(QTextStream &out, const QMetaObject *mo, const QByteArray
static QByteArray joinParameterNames(const QByteArrayList &parameterNames)
{
QByteArray slotParameters;
- for (int p = 0; p < parameterNames.count(); ++p) {
+ for (qsizetype p = 0; p < parameterNames.size(); ++p) {
slotParameters += parameterNames.at(p);
- if (p < parameterNames.count() - 1)
+ if (p < parameterNames.size() - 1)
slotParameters += ',';
}
@@ -435,19 +435,19 @@ void generateClassDecl(QTextStream &out, const QMetaObject *mo,
const auto signatureSplit = slotSignatureTruncated.split(',');
QByteArrayList parameterSplit;
if (slotParameters.isEmpty()) { // generate parameter names
- for (int i = 0; i < signatureSplit.count(); ++i)
+ for (qsizetype i = 0; i < signatureSplit.size(); ++i)
parameterSplit << QByteArray("p") + QByteArray::number(i);
} else {
parameterSplit = slotParameters.split(',');
}
- for (int i = 0; i < signatureSplit.count(); ++i) {
+ for (qsizetype i = 0; i < signatureSplit.count(); ++i) {
QByteArray parameterType = signatureSplit.at(i);
if (!parameterType.contains("::") && namespaceForType.contains(parameterType))
parameterType.prepend(namespaceForType.value(parameterType) + "::");
QByteArray arraySpec; // transform array method signature "foo(int[4])" ->"foo(int p[4])"
- const int arrayPos = parameterType.lastIndexOf('[');
+ const qsizetype arrayPos = parameterType.lastIndexOf('[');
if (arrayPos != -1) {
arraySpec = parameterType.right(parameterType.size() - arrayPos);
parameterType.truncate(arrayPos);
@@ -456,11 +456,11 @@ void generateClassDecl(QTextStream &out, const QMetaObject *mo,
slotNamedSignature += ' ';
slotNamedSignature += parameterSplit.at(i);
slotNamedSignature += arraySpec;
- if (defaultArguments >= signatureSplit.count() - i) {
+ if (defaultArguments >= signatureSplit.size() - i) {
slotNamedSignature += " = ";
slotNamedSignature += parameterType + "()";
}
- if (i + 1 < signatureSplit.count())
+ if (i + 1 < signatureSplit.size())
slotNamedSignature += ", ";
}
slotNamedSignature += ')';
@@ -774,7 +774,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
typeinfo->Release();
}
- for (int i = 0; i < qax_qualified_usertypes.count(); ++i) {
+ for (qsizetype i = 0; i < qax_qualified_usertypes.size(); ++i) {
QByteArray refType = qax_qualified_usertypes.at(i);
QByteArray refTypeLib;
if (refType.contains("::")) {
@@ -1096,7 +1096,7 @@ int main(int argc, char **argv)
typeLib, QSettings::NativeFormat);
typeLib.clear();
QStringList codes = settings.childGroups();
- for (int c = 0; c < codes.count(); ++c) {
+ for (qsizetype c = 0; c < codes.size(); ++c) {
const QString keyPrefix = QLatin1Char('/') + codes.at(c) + QLatin1String("/0/");
if (QT_POINTER_SIZE == 8) {
typeLib = settings.value(keyPrefix + QLatin1String("win64/.")).toString();
@@ -1160,7 +1160,7 @@ int main(int argc, char **argv)
}
settings.endGroup();
- for (int c = 0; c < codes.count(); ++c) {
+ for (qsizetype c = 0; c < codes.size(); ++c) {
const QString keyPrefix = key + QLatin1Char('/') + codes.at(c) + QLatin1Char('/');
if (QT_POINTER_SIZE == 8) {
typeLib = settings.value(keyPrefix + QLatin1String("win64/.")).toString();
diff --git a/tools/testcon/changeproperties.cpp b/tools/testcon/changeproperties.cpp
index ca609bd..1119624 100644
--- a/tools/testcon/changeproperties.cpp
+++ b/tools/testcon/changeproperties.cpp
@@ -145,7 +145,7 @@ void ChangeProperties::on_buttonSet_clicked()
{
QStringList txtList = editValue->text().split(QRegularExpression(QLatin1String("[,;]")));
QVariantList varList;
- for (int i = 0; i < txtList.count(); ++i) {
+ for (qsizetype i = 0; i < txtList.size(); ++i) {
QVariant svar(txtList.at(i));
QString str = svar.toString();
str = str.trimmed();
diff --git a/tools/testcon/invokemethod.cpp b/tools/testcon/invokemethod.cpp
index 1651537..9919a63 100644
--- a/tools/testcon/invokemethod.cpp
+++ b/tools/testcon/invokemethod.cpp
@@ -122,7 +122,7 @@ void InvokeMethod::on_comboMethods_textActivated(const QString &method)
const auto pnames = slot.parameterNames();
const auto ptypes = slot.parameterTypes();
- for (int p = 0; p < ptypes.count(); ++p) {
+ for (qsizetype p = 0; p < ptypes.size(); ++p) {
QString ptype(QString::fromLatin1(ptypes.at(p)));
if (ptype.isEmpty())
continue;
diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp
index 8c68e32..b7bcbb1 100644
--- a/tools/testcon/mainwindow.cpp
+++ b/tools/testcon/mainwindow.cpp
@@ -349,7 +349,7 @@ void MainWindow::on_VerbMenu_aboutToShow()
return;
QStringList verbs = container->verbs();
- for (int i = 0; i < verbs.count(); ++i) {
+ for (qsizetype i = 0; i < verbs.size(); ++i) {
VerbMenu->addAction(verbs.at(i));
}
@@ -404,7 +404,7 @@ void MainWindow::on_actionScriptingRun_triggered()
// If we have only one script loaded we can use the cool dialog
QStringList scriptList = m_scripts->scriptNames();
- if (scriptList.count() == 1) {
+ if (scriptList.size() == 1) {
InvokeMethod scriptInvoke(this);
scriptInvoke.setWindowTitle(tr("Execute Script Function"));
scriptInvoke.setControl(m_scripts->script(scriptList[0])->scriptEngine());
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 12:42:16 +0000