From 48f9a5fbc0be93124fcfc355779fffd1bceebd5d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 22 Mar 2021 20:20:33 +0100
Subject: [PATCH] (Qt) Silence sign comparison warnings

---
 ui/drivers/qt/qt_dialogs.cpp | 17 ++++++++++-------
 ui/drivers/qt/qt_options.h   |  6 ++++--
 ui/drivers/ui_qt.cpp         |  3 ++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ui/drivers/qt/qt_dialogs.cpp b/ui/drivers/qt/qt_dialogs.cpp
index 0444751a7e..c037210b24 100644
--- a/ui/drivers/qt/qt_dialogs.cpp
+++ b/ui/drivers/qt/qt_dialogs.cpp
@@ -645,8 +645,9 @@ void ViewOptionsDialog::addCategory(OptionsCategory *category)
 void ViewOptionsDialog::repaintIcons()
 {
    unsigned i;
+   size_t list_size = (size_t)m_categoryList.size();
 
-   for (i = 0; i < m_categoryList.size(); i++)
+   for (i = 0; i < list_size; i++)
       m_optionsList->item(i)->setIcon(getIcon(m_categoryList.at(i)));
 }
 #else
@@ -676,12 +677,13 @@ ViewOptionsDialog::ViewOptionsDialog(MainWindow *mainwindow, QWidget *parent) :
 
 void ViewOptionsDialog::showDialog()
 {
-#ifndef HAVE_MENU
-   m_viewOptionsWidget->loadViewOptions();
-#else
+#ifdef HAVE_MENU
    unsigned i;
-   for (i = 0; i < m_categoryList.size(); i++)
+   size_t list_size = (size_t)m_categoryList.size();
+   for (i = 0; i < list_size; i++)
       m_categoryList.at(i)->load();
+#else
+   m_viewOptionsWidget->loadViewOptions();
 #endif
    show();
    activateWindow();
@@ -695,8 +697,9 @@ void ViewOptionsDialog::hideDialog()
 void ViewOptionsDialog::onRejected()
 {
 #ifdef HAVE_MENU
-   int i;
-   for (i = 0; i < m_categoryList.size(); i++)
+   unsigned i;
+   size_t list_size = (size_t)m_categoryList.size();
+   for (i = 0; i < list_size; i++)
       m_categoryList.at(i)->apply();
 #endif
 }
diff --git a/ui/drivers/qt/qt_options.h b/ui/drivers/qt/qt_options.h
index 54f7402882..3035626977 100644
--- a/ui/drivers/qt/qt_options.h
+++ b/ui/drivers/qt/qt_options.h
@@ -57,14 +57,16 @@ public:
    QString categoryIconName() const { return m_categoryIconName; }
    virtual void load()
    {
+      unsigned i;
       size_t size = m_pages.size();
-      for (int i = 0; i < size; i++)
+      for (i = 0; i < size; i++)
          m_pages.at(i)->load();
    }
    virtual void apply()
    {
+      unsigned i;
       size_t size = m_pages.size();
-      for (int i = 0; i < size; i++)
+      for (i = 0; i < size; i++)
          m_pages.at(i)->apply();
    }
 protected:
diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp
index c59f13e833..58d9c2d57f 100644
--- a/ui/drivers/ui_qt.cpp
+++ b/ui/drivers/ui_qt.cpp
@@ -3793,8 +3793,9 @@ void MainWindow::initContentTableWidget()
       settings_t *settings = config_get_ptr();
       QDir playlistDir(settings->paths.directory_playlist);
       QStringList playlists;
+      size_t list_size = (size_t)m_playlistFiles.count();
 
-      for (i = 0; i < m_playlistFiles.count(); i++)
+      for (i = 0; i < list_size; i++)
       {
          const QString &playlist = m_playlistFiles.at(i);
          playlists.append(playlistDir.absoluteFilePath(playlist));