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>
This commit is contained in:
Michael Weghorn
2026-03-27 04:35:41 +01:00
parent 603f5a3066
commit 891f36091c
6 changed files with 45 additions and 35 deletions
+6 -4
View File
@@ -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;
+7 -6
View File
@@ -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
{
+6 -3
View File
@@ -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
{
+4 -1
View File
@@ -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
{
+16 -16
View File
@@ -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
+6 -5
View File
@@ -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
{