1 files changed, 5 insertions, 31 deletions

diff --git a/src/designer/src/lib/shared/actionprovider_p.h b/src/designer/src/lib/shared/actionprovider_p.h
index 63d902951..16f987da9 100644
--- a/src/designer/src/lib/shared/actionprovider_p.h
+++ b/src/designer/src/lib/shared/actionprovider_p.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Designer of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #ifndef ACTIONPROVIDER_H
 #define ACTIONPROVIDER_H
@@ -67,15 +42,14 @@ template <class Widget>
     int actionIndexAt(const Widget *w, const QPoint &pos, Qt::Orientation orientation)
 {
     const auto actions = w->actions();
-    const int actionCount = actions.count();
-    if (actionCount == 0)
+    if (actions.isEmpty())
         return -1;
     // actionGeometry() can be wrong sometimes; it returns a geometry that
     // stretches to the end of the toolbar/menu bar. So, check from the beginning
     // in the case of a horizontal right-to-left orientation.
     const bool checkTopRight = orientation == Qt::Horizontal && w->layoutDirection() == Qt::RightToLeft;
     const QPoint topRight = QPoint(w->rect().width(), 0);
-    for (int index = 0; index < actionCount; ++index) {
+    for (qsizetype index = 0, actionCount = actions.size(); index < actionCount; ++index) {
         QRect g = w->actionGeometry(actions.at(index));
         if (checkTopRight)
             g.setTopRight(topRight);
@@ -83,7 +57,7 @@ template <class Widget>
             g.setTopLeft(QPoint(0, 0));
 
         if (g.contains(pos))
-            return index;
+            return int(index);
     }
     return -1;
 }