1 files changed, 10 insertions, 13 deletions
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp
index 39622d1..3aa39b6 100644
--- a/src/winextras/qwinthumbnailtoolbar.cpp
+++ b/src/winextras/qwinthumbnailtoolbar.cpp
@@ -52,13 +52,12 @@
 #include "windowsguidsdefs_p.h"
 #include "qwinfunctions.h"
 
-#include <QWindow>
-#include <QCoreApplication>
-#include <QTimer>
-#include <QDebug>
+#include <QtGui/qwindow.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qdebug.h>
 
 #include "qwinevent.h"
-#include "qwinfunctions.h"
 #include "qwinfunctions_p.h"
 #include "qwineventfilter_p.h"
 
@@ -120,9 +119,7 @@ QWinThumbnailToolBar::QWinThumbnailToolBar(QObject *parent) :
 /*!
     Destroys and clears the QWinThumbnailToolBar.
  */
-QWinThumbnailToolBar::~QWinThumbnailToolBar()
-{
-}
+QWinThumbnailToolBar::~QWinThumbnailToolBar() = default;
 
 /*!
     \property QWinThumbnailToolBar::window
@@ -519,12 +516,12 @@ void QWinThumbnailToolBarPrivate::_q_updateToolbar()
     if (FAILED(hresult))
         qWarning() << msgComFailed("ThumbBarUpdateButtons", hresult);
     updateIconicPixmapsEnabled(false);
-    for (int i = 0; i < windowsLimitedThumbbarSize; i++) {
-        if (buttons[i].hIcon) {
-            if (createdIcons.contains(buttons[i].hIcon))
-                DestroyIcon(buttons[i].hIcon);
+    for (auto & button : buttons) {
+        if (button.hIcon) {
+            if (createdIcons.contains(button.hIcon))
+                DestroyIcon(button.hIcon);
             else
-                DeleteObject(buttons[i].hIcon);
+                DeleteObject(button.hIcon);
         }
     }
 }