[vlc-commits] [Git][videolan/vlc][master] qt: remove unused includes in X11 compositor

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
32b04e93 by Pierre Lamot at 2021-10-30T07:57:13+00:00
qt: remove unused includes in X11 compositor

fix: #26236

- - - - -


8 changed files:

- modules/gui/qt/maininterface/compositor_x11.cpp
- modules/gui/qt/maininterface/compositor_x11.hpp
- modules/gui/qt/maininterface/compositor_x11_renderclient.cpp
- modules/gui/qt/maininterface/compositor_x11_renderwindow.cpp
- modules/gui/qt/maininterface/compositor_x11_renderwindow.hpp
- modules/gui/qt/maininterface/compositor_x11_uisurface.cpp
- modules/gui/qt/maininterface/compositor_x11_uisurface.hpp
- modules/gui/qt/maininterface/compositor_x11_utils.cpp


Changes:

=====================================
modules/gui/qt/maininterface/compositor_x11.cpp
=====================================
@@ -16,10 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #include <QX11Info>
-#include <QByteArray>
-#include <QHBoxLayout>
 #include <QWidget>
 #include <QScreen>
+
 #include "compositor_x11.hpp"
 #include "compositor_x11_renderwindow.hpp"
 #include "compositor_x11_uisurface.hpp"


=====================================
modules/gui/qt/maininterface/compositor_x11.hpp
=====================================
@@ -19,7 +19,6 @@
 #define COMPOSITORX11_HPP
 
 #include <QObject>
-#include <QWidget>
 #include "compositor.hpp"
 #include "videosurface.hpp"
 #include <memory>
@@ -27,6 +26,7 @@
 #include <xcb/xcb.h>
 
 class QMainWindow;
+class QWidget;
 class MainUI;
 class InterfaceWindowHandler;
 class VideoWindowHandler;


=====================================
modules/gui/qt/maininterface/compositor_x11_renderclient.cpp
=====================================
@@ -17,7 +17,6 @@
  *****************************************************************************/
 #include <vlc_cxx_helpers.hpp>
 #include "compositor_x11_renderclient.hpp"
-#include <X11/extensions/Xdamage.h>
 
 #define _NET_WM_BYPASS_COMPOSITOR_NAME "_NET_WM_BYPASS_COMPOSITOR"
 


=====================================
modules/gui/qt/maininterface/compositor_x11_renderwindow.cpp
=====================================
@@ -16,14 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #include <math.h>
+
 #include <QtEvents>
 #include <QCoreApplication>
 #include <QWindow>
 #include <QQuickItem>
 #include <QX11Info>
 #include <QMainWindow>
-#include <QApplication>
-#include <QTimer>
 #include <QThread>
 #include <QSocketNotifier>
 
@@ -35,7 +34,6 @@
 
 #include <vlc_cxx_helpers.hpp>
 
-#include "util/qvlcapp.hpp"
 #include "qt.hpp"
 
 //blur behind for KDE


=====================================
modules/gui/qt/maininterface/compositor_x11_renderwindow.hpp
=====================================
@@ -23,10 +23,8 @@
 #endif
 
 #include <memory>
-#include <set>
 
 #include <QObject>
-#include <QWidget>
 #include <QMutex>
 
 #include <xcb/xcb.h>
@@ -40,6 +38,7 @@
 
 #include "compositor_x11_utils.hpp"
 
+class QWidget;
 class QMainWindow;
 class QSocketNotifier;
 


=====================================
modules/gui/qt/maininterface/compositor_x11_uisurface.cpp
=====================================
@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #include <QOpenGLContext>
-#include <QPainter>
-#include <QOpenGLPaintDevice>
+#include <QOpenGLFunctions>
 #include <QQmlEngine>
 #include <QQuickWindow>
 #include <QQuickItem>


=====================================
modules/gui/qt/maininterface/compositor_x11_uisurface.hpp
=====================================
@@ -18,9 +18,7 @@
 #ifndef COMPOSITOR_X11_UISURFACE_HPP
 #define COMPOSITOR_X11_UISURFACE_HPP
 
-#include <QObject>
 #include <QWindow>
-#include <QOpenGLFunctions>
 #include <QQuickRenderControl>
 #include "compositor.hpp"
 


=====================================
modules/gui/qt/maininterface/compositor_x11_utils.cpp
=====================================
@@ -17,8 +17,6 @@
  *****************************************************************************/
 #include <vlc_cxx_helpers.hpp>
 #include "compositor_x11_utils.hpp"
-#include <cstring>
-#include <QDebug>
 
 namespace vlc {
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/32b04e93bc43e1b4a75f6fa5d52fb70613dc9507

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/32b04e93bc43e1b4a75f6fa5d52fb70613dc9507
You're receiving this email because of your account on code.videolan.org.