diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 4 | ||||
| -rw-r--r-- | src/client/qwaylandscreen.cpp | 2 | ||||
| -rw-r--r-- | src/client/qwaylandtouch.cpp | 8 | ||||
| -rw-r--r-- | src/client/qwaylandwindow.cpp | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 2d82f447..9d70924c 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -610,7 +610,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin void QWaylandDisplay::registry_global_remove(uint32_t id) { - for (int i = 0, ie = mGlobals.count(); i != ie; ++i) { + for (int i = 0, ie = mGlobals.size(); i != ie; ++i) { RegistryGlobal &global = mGlobals[i]; if (global.id == id) { if (global.interface == QLatin1String(QtWayland::wl_output::interface()->name)) { @@ -677,7 +677,7 @@ void QWaylandDisplay::addRegistryListener(RegistryListener listener, void *data) { Listener l = { listener, data }; mRegistryListeners.append(l); - for (int i = 0, ie = mGlobals.count(); i != ie; ++i) + for (int i = 0, ie = mGlobals.size(); i != ie; ++i) (*l.listener)(l.data, mGlobals[i].registry, mGlobals[i].id, mGlobals[i].interface, mGlobals[i].version); } diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp index 57bccde3..fd56a252 100644 --- a/src/client/qwaylandscreen.cpp +++ b/src/client/qwaylandscreen.cpp @@ -148,7 +148,7 @@ QList<QPlatformScreen *> QWaylandScreen::virtualSiblings() const const QList<QWaylandScreen*> screens = mWaylandDisplay->screens(); auto *placeholder = mWaylandDisplay->placeholderScreen(); - list.reserve(screens.count() + (placeholder ? 1 : 0)); + list.reserve(screens.size() + (placeholder ? 1 : 0)); for (QWaylandScreen *screen : qAsConst(screens)) { if (screen->screen()) diff --git a/src/client/qwaylandtouch.cpp b/src/client/qwaylandtouch.cpp index 41dfd085..a88947e0 100644 --- a/src/client/qwaylandtouch.cpp +++ b/src/client/qwaylandtouch.cpp @@ -107,12 +107,12 @@ void QWaylandTouchExtension::touch_extension_touch(uint32_t time, void QWaylandTouchExtension::sendTouchEvent() { // Copy all points, that are in the previous but not in the current list, as stationary. - for (int i = 0; i < mPrevTouchPoints.count(); ++i) { + for (int i = 0; i < mPrevTouchPoints.size(); ++i) { const QWindowSystemInterface::TouchPoint &prevPoint(mPrevTouchPoints.at(i)); if (prevPoint.state == QEventPoint::Released) continue; bool found = false; - for (int j = 0; j < mTouchPoints.count(); ++j) + for (int j = 0; j < mTouchPoints.size(); ++j) if (mTouchPoints.at(j).id == prevPoint.id) { found = true; break; @@ -132,14 +132,14 @@ void QWaylandTouchExtension::sendTouchEvent() QWindowSystemInterface::handleTouchEvent(mTargetWindow, mTimestamp, mTouchDevice, mTouchPoints); QEventPoint::States states = {}; - for (int i = 0; i < mTouchPoints.count(); ++i) + for (int i = 0; i < mTouchPoints.size(); ++i) states |= mTouchPoints.at(i).state; if (mFlags & QT_TOUCH_EXTENSION_FLAGS_MOUSE_FROM_TOUCH) { const bool firstPress = states == QEventPoint::Pressed; if (firstPress) mMouseSourceId = mTouchPoints.first().id; - for (int i = 0; i < mTouchPoints.count(); ++i) { + for (int i = 0; i < mTouchPoints.size(); ++i) { const QWindowSystemInterface::TouchPoint &tp(mTouchPoints.at(i)); if (tp.id == mMouseSourceId) { const bool released = tp.state == QEventPoint::Released; diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 001f99d0..73a14b89 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -132,7 +132,7 @@ void QWaylandWindow::initWindow() mShellSurface->setAppId(fi.baseName()); } else { QString appId; - for (int i = 0; i < domainName.count(); ++i) + for (int i = 0; i < domainName.size(); ++i) appId.prepend(QLatin1Char('.')).prepend(domainName.at(i)); appId.append(fi.baseName()); mShellSurface->setAppId(appId); @@ -288,9 +288,9 @@ void QWaylandWindow::setWindowTitle(const QString &title) const int maxLength = libwaylandMaxBufferSize / 3 - 100; auto truncated = QStringView{formatted}.left(maxLength); - if (truncated.length() < formatted.length()) { + if (truncated.size() < formatted.size()) { qCWarning(lcQpaWayland) << "Window titles longer than" << maxLength << "characters are not supported." - << "Truncating window title (from" << formatted.length() << "chars)"; + << "Truncating window title (from" << formatted.size() << "chars)"; } mShellSurface->setTitle(truncated.toString()); } |