Fix warnings

Author: Christian Feldmann

YUViewLib/YUViewLib.pro

@@ -2,7 +2,7 @@ QT += core gui widgets opengl xml concurrent network
 
 TEMPLATE = lib
 CONFIG += staticlib
-CONFIG +=20
+CONFIG += c++20
 CONFIG -= debug_and_release
 CONFIG += object_parallel_to_source
 

YUViewLib/src/common/Typedef.h

@@ -256,50 +256,3 @@ enum recacheIndicator
                  // useless in the cache.
 };
 Q_DECLARE_METATYPE(recacheIndicator)
-
-#if QT_VERSION <= 0x050700
-// copied from newer version of qglobal.h
-template <typename... Args> struct QNonConstOverload
-{
-  template <typename R, typename T>
-  Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...)) const Q_DECL_NOTHROW->decltype(ptr)
-  {
-    return ptr;
-  }
-  template <typename R, typename T>
-  static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr)
-  {
-    return ptr;
-  }
-};
-template <typename... Args> struct QConstOverload
-{
-  template <typename R, typename T>
-  Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...) const) const Q_DECL_NOTHROW->decltype(ptr)
-  {
-    return ptr;
-  }
-  template <typename R, typename T>
-  static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...) const) Q_DECL_NOTHROW -> decltype(ptr)
-  {
-    return ptr;
-  }
-};
-template <typename... Args> struct QOverload : QConstOverload<Args...>, QNonConstOverload<Args...>
-{
-  using QConstOverload<Args...>::of;
-  using QConstOverload<Args...>::operator();
-  using QNonConstOverload<Args...>::of;
-  using QNonConstOverload<Args...>::operator();
-  template <typename R>
-  Q_DECL_CONSTEXPR auto operator()(R (*ptr)(Args...)) const Q_DECL_NOTHROW->decltype(ptr)
-  {
-    return ptr;
-  }
-  template <typename R>
-  static Q_DECL_CONSTEXPR auto of(R (*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr)
-  {
-    return ptr;
-  }
-};
-#endif

YUViewLib/src/common/TypedefQtDeprecated.h

@@ -0,0 +1,42 @@
+/*  This file is part of YUView - The YUV player with advanced analytics toolset
+ *   <https://github.com/IENT/YUView>
+ *   Copyright (C) 2015  Institut für Nachrichtentechnik, RWTH Aachen University, GERMANY
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   In addition, as a special exception, the copyright holders give
+ *   permission to link the code of portions of this program with the
+ *   OpenSSL library under certain conditions as described in each
+ *   individual source file, and distribute linked combinations including
+ *   the two.
+ *
+ *   You must obey the GNU General Public License in all respects for all
+ *   of the code used other than OpenSSL. If you modify file(s) with this
+ *   exception, you may extend this exception to your version of the
+ *   file(s), but you are not obligated to do so. If you do not wish to do
+ *   so, delete this exception statement from your version. If you delete
+ *   this exception statement from all source files in the program, then
+ *   also delete it here.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ #pragma once
+
+#include <QCheckBox>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+constexpr auto QCheckBoxStateChanged = &QCheckBox::checkStateChanged;
+#else
+constexpr auto QCheckBoxStateChanged = &QCheckBox::stateChanged;
+#endif
+

YUViewLib/src/ffmpeg/AVPixFmtDescriptorWrapper.cpp

@@ -380,7 +380,7 @@ bool AVPixFmtDescriptorWrapper::Flags::operator==(
          this->floatValues == other.floatValues;
 }
 
-bool AVPixFmtDescriptorWrapper::operator==(const AVPixFmtDescriptorWrapper &other)
+bool AVPixFmtDescriptorWrapper::operator==(const AVPixFmtDescriptorWrapper &other) const
 {
   if (this->nb_components != other.nb_components)
     return false;

YUViewLib/src/ffmpeg/AVPixFmtDescriptorWrapper.h

@@ -103,7 +103,7 @@ class AVPixFmtDescriptorWrapper
   QString               aliases{};
   AVComponentDescriptor comp[4];
 
-  bool operator==(const AVPixFmtDescriptorWrapper &a);
+  bool operator==(const AVPixFmtDescriptorWrapper &a) const;
 };
 
 } // namespace FFmpeg

YUViewLib/src/playlistitem/playlistItemStatisticsFile.cpp

@@ -103,15 +103,15 @@ InfoData playlistItemStatisticsFile::getInfo() const
 }
 
 playlistItemStatisticsFile *playlistItemStatisticsFile::newplaylistItemStatisticsFile(
-    const YUViewDomElement &root, const QString &playlistFilePath, OpenMode openMode)
+  const YUViewDomElement &root, const QString &playlistFilePath, OpenMode openMode)
 {
   // Parse the DOM element. It should have all values of a playlistItemStatisticsFile
   auto absolutePath = root.findChildValue("absolutePath");
   auto relativePath = root.findChildValue("relativePath");
 
   // check if file with absolute path exists, otherwise check relative path
   const auto filePath =
-      functions::getAbsPathFromAbsAndRel(playlistFilePath, absolutePath, relativePath);
+    functions::getAbsPathFromAbsAndRel(playlistFilePath, absolutePath, relativePath);
   if (filePath.isEmpty())
     return nullptr;
 
@@ -299,12 +299,12 @@ void playlistItemStatisticsFile::openStatisticsFile()
   this->timer.start(1000, this);
   this->breakBackgroundAtomic.store(false);
   this->backgroundParserFuture = QtConcurrent::run(
-      [=](stats::StatisticsFileBase *file)
-      { file->readFrameAndTypePositionsFromFile(std::ref(this->breakBackgroundAtomic)); },
-      this->file.get());
+    [this](stats::StatisticsFileBase *file)
+    { file->readFrameAndTypePositionsFromFile(std::ref(this->breakBackgroundAtomic)); },
+    this->file.get());
 
   DEBUG_STAT(
-      "playlistItemStatisticsFile::openStatisticsFile File opened. Background parsing started.");
+    "playlistItemStatisticsFile::openStatisticsFile File opened. Background parsing started.");
 }
 
 // This timer event is called regularly when the background loading process is running.

YUViewLib/src/statistics/StatisticUIHandler.cpp

@@ -40,9 +40,10 @@
 #endif
 #include <QtMath>
 
+#include <common/FunctionsGui.h>
+#include <common/TypedefQtDeprecated.h>
 #include <statistics/StatisticsData.h>
 #include <statistics/StatisticsType.h>
-#include <common/FunctionsGui.h>
 
 namespace stats
 {
@@ -64,15 +65,18 @@ StatisticUIHandler::StatisticUIHandler()
           Qt::QueuedConnection);
 }
 
-void StatisticUIHandler::setStatisticsData(StatisticsData *data) { this->statisticsData = data; }
+void StatisticUIHandler::setStatisticsData(StatisticsData *data)
+{
+  this->statisticsData = data;
+}
 
 QLayout *StatisticUIHandler::createStatisticsHandlerControls(bool recreateControlsOnly)
 {
   if (!recreateControlsOnly)
   {
     // Absolutely always only do this once
     Q_ASSERT_X(
-        !ui.created(), Q_FUNC_INFO, "The primary statistics controls must only be created once.");
+      !ui.created(), Q_FUNC_INFO, "The primary statistics controls must only be created once.");
     ui.setupUi();
   }
 
@@ -93,10 +97,8 @@ QLayout *StatisticUIHandler::createStatisticsHandlerControls(bool recreateContro
     itemNameCheck->setChecked(statType.render);
     itemNameCheck->setToolTip(statType.description);
     ui.gridLayout->addWidget(itemNameCheck, int(row + 2), 0);
-    connect(itemNameCheck,
-            &QCheckBox::stateChanged,
-            this,
-            &StatisticUIHandler::onStatisticsControlChanged);
+    connect(
+      itemNameCheck, QCheckBoxStateChanged, this, &StatisticUIHandler::onStatisticsControlChanged);
     itemNameCheckBoxes[0].push_back(itemNameCheck);
 
     // Append the opacity slider
@@ -105,17 +107,16 @@ QLayout *StatisticUIHandler::createStatisticsHandlerControls(bool recreateContro
     opacitySlider->setMaximum(100);
     opacitySlider->setValue(statType.alphaFactor);
     ui.gridLayout->addWidget(opacitySlider, int(row + 2), 1);
-    connect(opacitySlider,
-            &QSlider::valueChanged,
-            this,
-            &StatisticUIHandler::onStatisticsControlChanged);
+    connect(
+      opacitySlider, &QSlider::valueChanged, this, &StatisticUIHandler::onStatisticsControlChanged);
     itemOpacitySliders[0].push_back(opacitySlider);
 
     // Append the change style buttons
     QPushButton *pushButton = new QPushButton(
-        functionsGui::convertIcon(":img_edit.png"), QString(), ui.scrollAreaWidgetContents);
+      functionsGui::convertIcon(":img_edit.png"), QString(), ui.scrollAreaWidgetContents);
     ui.gridLayout->addWidget(pushButton, int(row + 2), 2);
-    connect(pushButton, &QPushButton::released, this, [=] { onStyleButtonClicked(row); });
+    connect(
+      pushButton, &QPushButton::released, this, [this, row] { this->onStyleButtonClicked(row); });
     itemStyleButtons[0].push_back(pushButton);
   }
 
@@ -144,7 +145,7 @@ QWidget *StatisticUIHandler::getSecondaryStatisticsHandlerControls(bool recreate
     if (!this->statisticsData)
     {
       DEBUG_STATUI(
-          "StatisticUIHandler::getSecondaryStatisticsHandlerControls statisticsData not set");
+        "StatisticUIHandler::getSecondaryStatisticsHandlerControls statisticsData not set");
       return {};
     }
 
@@ -159,7 +160,7 @@ QWidget *StatisticUIHandler::getSecondaryStatisticsHandlerControls(bool recreate
       itemNameCheck->setChecked(statType.render);
       ui2.gridLayout->addWidget(itemNameCheck, int(row + 2), 0);
       connect(itemNameCheck,
-              &QCheckBox::stateChanged,
+              QCheckBoxStateChanged,
               this,
               &StatisticUIHandler::onSecondaryStatisticsControlChanged);
       itemNameCheckBoxes[1].push_back(itemNameCheck);
@@ -178,9 +179,10 @@ QWidget *StatisticUIHandler::getSecondaryStatisticsHandlerControls(bool recreate
 
       // Append the change style buttons
       QPushButton *pushButton = new QPushButton(
-          functionsGui::convertIcon(":img_edit.png"), QString(), ui2.scrollAreaWidgetContents);
+        functionsGui::convertIcon(":img_edit.png"), QString(), ui2.scrollAreaWidgetContents);
       ui2.gridLayout->addWidget(pushButton, int(row + 2), 2);
-      connect(pushButton, &QPushButton::released, this, [=] { onStyleButtonClicked(row); });
+      connect(
+        pushButton, &QPushButton::released, this, [this, row] { this->onStyleButtonClicked(row); });
       itemStyleButtons[1].push_back(pushButton);
     }
 
@@ -190,7 +192,7 @@ QWidget *StatisticUIHandler::getSecondaryStatisticsHandlerControls(bool recreate
     if (true || ui2.created())
     {
       QSpacerItem *verticalSpacer =
-          new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
+        new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
       ui2.gridLayout->addItem(verticalSpacer, int(statTypes.size() + 2), 0, 1, 1);
       spacerItems[1] = verticalSpacer;
     }
@@ -321,8 +323,8 @@ void StatisticUIHandler::updateStatisticsHandlerControls()
   }
 
   // First run a check if all statisticsTypes are identical
-  bool controlsStillValid = true;
-  auto &statTypes = this->statisticsData->getStatisticsTypes();
+  bool  controlsStillValid = true;
+  auto &statTypes          = this->statisticsData->getStatisticsTypes();
   if (statTypes.size() != itemNameCheckBoxes[0].size())
     // There are more or less statistics types as before
     controlsStillValid = false;