From 891f36091c46be6e61df98560f2e96a49df123e1 Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Thu, 26 Mar 2026 12:07:39 +0100
Subject: [PATCH] avmedia qt: Include <sal/config.h>, arrange includes more
 consistently

This is the equivalent to vcl commit

    Change-Id: Ia52f5cfb8360e3b0de19404879d59131c63756b0
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Thu Mar 26 10:59:25 2026 +0100

        qt: Include <sal/config.h>, arrange includes more consistently

in Qt-specific avmedia code. See the above commit for more
details/background.

Change-Id: I64c043b75e41fd89c02dfc6caf1359b003cd07ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202729
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
 avmedia/source/qt6/QtFrameGrabber.cxx | 10 +++++----
 avmedia/source/qt6/QtFrameGrabber.hxx | 13 ++++++-----
 avmedia/source/qt6/QtManager.cxx      |  9 +++++---
 avmedia/source/qt6/QtManager.hxx      |  5 ++++-
 avmedia/source/qt6/QtPlayer.cxx       | 32 +++++++++++++--------------
 avmedia/source/qt6/QtPlayer.hxx       | 11 ++++-----
 6 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/avmedia/source/qt6/QtFrameGrabber.cxx b/avmedia/source/qt6/QtFrameGrabber.cxx
index 2f1d0bc69e66..287116944186 100644
--- a/avmedia/source/qt6/QtFrameGrabber.cxx
+++ b/avmedia/source/qt6/QtFrameGrabber.cxx
@@ -7,8 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <QtCore/QBuffer>
-#include <QtCore/QByteArray>
+#include <sal/config.h>
+
+#include "QtFrameGrabber.hxx"
+#include <QtFrameGrabber.moc>
 
 #include <sal/log.hxx>
 #include <vcl/filter/PngImageReader.hxx>
@@ -17,8 +19,8 @@
 #include <vcl/scheduler.hxx>
 #include <vcl/svapp.hxx>
 
-#include "QtFrameGrabber.hxx"
-#include <QtFrameGrabber.moc>
+#include <QtCore/QBuffer>
+#include <QtCore/QByteArray>
 
 using namespace ::com::sun::star;
 
diff --git a/avmedia/source/qt6/QtFrameGrabber.hxx b/avmedia/source/qt6/QtFrameGrabber.hxx
index 15098d7373f2..d197636ba734 100644
--- a/avmedia/source/qt6/QtFrameGrabber.hxx
+++ b/avmedia/source/qt6/QtFrameGrabber.hxx
@@ -9,20 +9,21 @@
 
 #pragma once
 
-#include <mutex>
+#include <sal/config.h>
+
+#include <comphelper/compbase.hxx>
+
+#include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/media/XFrameGrabber.hpp>
 
 #include <QtCore/QObject>
 #include <QtCore/QThread>
-
 #include <QtMultimedia/QMediaPlayer>
 #include <QtMultimedia/QVideoFrame>
 #include <QtMultimedia/QVideoSink>
 
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/media/XFrameGrabber.hpp>
-#include <comphelper/compbase.hxx>
-
 #include <condition_variable>
+#include <mutex>
 
 namespace avmedia::qt
 {
diff --git a/avmedia/source/qt6/QtManager.cxx b/avmedia/source/qt6/QtManager.cxx
index b4a8d523bd7a..1e67b778015e 100644
--- a/avmedia/source/qt6/QtManager.cxx
+++ b/avmedia/source/qt6/QtManager.cxx
@@ -7,13 +7,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <sal/config.h>
+
+#include "QtManager.hxx"
+#include "QtPlayer.hxx"
+
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ref.hxx>
 #include <tools/urlobj.hxx>
 
-#include "QtManager.hxx"
-#include "QtPlayer.hxx"
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 namespace avmedia::qt
 {
diff --git a/avmedia/source/qt6/QtManager.hxx b/avmedia/source/qt6/QtManager.hxx
index 830c1ed0c671..2d135c13928f 100644
--- a/avmedia/source/qt6/QtManager.hxx
+++ b/avmedia/source/qt6/QtManager.hxx
@@ -9,9 +9,12 @@
 
 #pragma once
 
+#include <sal/config.h>
+
+#include <cppuhelper/implbase.hxx>
+
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/media/XManager.hpp>
-#include <cppuhelper/implbase.hxx>
 
 namespace avmedia::qt
 {
diff --git a/avmedia/source/qt6/QtPlayer.cxx b/avmedia/source/qt6/QtPlayer.cxx
index 5118e9bc3e42..177edabdd971 100644
--- a/avmedia/source/qt6/QtPlayer.cxx
+++ b/avmedia/source/qt6/QtPlayer.cxx
@@ -9,7 +9,23 @@
 
 #include <sal/config.h>
 
+#include "QtFrameGrabber.hxx"
+#include "QtPlayer.hxx"
+#include <QtPlayer.moc>
+
+#include <gstwindow.hxx>
+#include <mediamisc.hxx>
+
+#include <comphelper/processfactory.hxx>
+#include <cppuhelper/supportsservice.hxx>
+#include <sal/log.hxx>
 #include <sal/types.h>
+#include <vcl/qt/QtUtils.hxx>
+#include <vcl/syschild.hxx>
+#include <vcl/sysdata.hxx>
+
+#include <com/sun/star/media/XManager.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 #include <QtCore/QCoreApplication>
@@ -21,22 +37,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLayout>
 
-#include <com/sun/star/media/XManager.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <comphelper/processfactory.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <sal/log.hxx>
-#include <vcl/qt/QtUtils.hxx>
-#include <vcl/syschild.hxx>
-#include <vcl/sysdata.hxx>
-
-#include <gstwindow.hxx>
-#include <mediamisc.hxx>
-#include "QtFrameGrabber.hxx"
-#include "QtPlayer.hxx"
-
-#include <QtPlayer.moc>
-
 using namespace ::com::sun::star;
 
 namespace avmedia::qt
diff --git a/avmedia/source/qt6/QtPlayer.hxx b/avmedia/source/qt6/QtPlayer.hxx
index bb35701f100f..02f9cf015bf2 100644
--- a/avmedia/source/qt6/QtPlayer.hxx
+++ b/avmedia/source/qt6/QtPlayer.hxx
@@ -11,15 +11,16 @@
 
 #include <sal/config.h>
 
-#include <QtMultimedia/QMediaPlayer>
-#include <QtWidgets/QWidget>
+#include <comphelper/multicontainer2.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/basemutex.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/media/XPlayer.hpp>
 #include <com/sun/star/media/XPlayerNotifier.hpp>
-#include <comphelper/multicontainer2.hxx>
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+
+#include <QtMultimedia/QMediaPlayer>
+#include <QtWidgets/QWidget>
 
 namespace avmedia::qt
 {