Re-run IWYU, again with lots of manual cleanup.

diff --git a/flags.cpp b/flags.cpp
index e0c638b708469a854cedfd6f869bb7de5e181a1f..56ca799cea36967d95a55bb79086659c8870c602 100644 (file)
--- a/flags.cpp
+++ b/flags.cpp
@@ -1,9 +1,8 @@
-#include <stdio.h>
+#include "flags.h"
+
 #include <getopt.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-
-#include "flags.h"
 
 Flags global_flags;
 

diff --git a/glwidget.cpp b/glwidget.cpp
index da5be6f88221373eedaddf8860291a2ad95f5ab2..a309240e342dd45488d19ba959fb66c0701b205b 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -9,20 +9,21 @@
 #include <QSurfaceFormat>
 
 #include "glwidget.h"
-#include "mainwindow.h"
 
 #include <movit/resource_pool.h>
 #include <stdio.h>
+#include <functional>
 #include <mutex>
 
 #include "context.h"
+#include "effect_chain.h"
 #include "flags.h"
+#include "mainwindow.h"
 #include "mixer.h"
+#include "qnamespace.h"
 #include "ref_counted_gl_sync.h"
-#include "vumeter.h"
 
-class MainWindow;
-class QSurface;
+class QMouseEvent;
 class QWidget;
 
 #undef Success

diff --git a/glwidget.h b/glwidget.h
index 3641f66a75f5fecfa317e1363c937c4dbce14bb3..25a8ad7b7a7b99483dd59e5799a17c7b80ea4102 100644 (file)
--- a/glwidget.h
+++ b/glwidget.h
@@ -3,9 +3,14 @@
 
 #include <epoxy/gl.h>
 #include <QGLWidget>
+#include <string>
+#include <vector>
 
 #include "mixer.h"
+#include "qgl.h"
+#include "qobjectdefs.h"
 
+class QMouseEvent;
 class QWidget;
 
 namespace movit {

diff --git a/h264encode.cpp b/h264encode.cpp
index 74b51910856b86aacea8999bdda45ec978ea3662..51ad5178704922c56dd474db247405077e45aae3 100644 (file)
--- a/h264encode.cpp
+++ b/h264encode.cpp
@@ -7,11 +7,11 @@
 #include <assert.h>
 #include <epoxy/egl.h>
 #include <libavcodec/avcodec.h>
-#include <libavformat/avio.h>
-#include <libavutil/mathematics.h>
+#include <libavutil/channel_layout.h>
+#include <libavutil/frame.h>
 #include <libavutil/rational.h>
+#include <libavutil/samplefmt.h>
 #include <libdrm/drm_fourcc.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -20,10 +20,13 @@
 #include <va/va_enc_h264.h>
 #include <va/va_x11.h>
 #include <condition_variable>
+#include <cstdint>
+#include <memory>
 #include <mutex>
 #include <queue>
 #include <string>
 #include <thread>
+#include <utility>
 
 #include "context.h"
 #include "httpd.h"

diff --git a/h264encode.h b/h264encode.h
index 7a10d927ca84f94a7f8abc74fb7c6c7910b2e8d0..2bbbed50f57069dfe4249eb0c31713d3d2d38cdc 100644 (file)
--- a/h264encode.h
+++ b/h264encode.h
@@ -27,9 +27,12 @@
 #define _H264ENCODE_H
 
 extern "C" {
+#include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
 #include <epoxy/gl.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <atomic>
 #include <condition_variable>
 #include <map>

diff --git a/httpd.cpp b/httpd.cpp
index f266c63656d17cb14cce47c4886573159d61e5da..db3cb61eafa4fdf554ca9de966e625ce6bd7d429 100644 (file)
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -1,14 +1,26 @@
-#include <string.h>
-#include <microhttpd.h>
 #include <assert.h>
+#include <microhttpd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
+#include <libavutil/channel_layout.h>
+#include <libavutil/mathematics.h>
+#include <libavutil/mem.h>
+#include <libavutil/pixfmt.h>
+#include <libavutil/rational.h>
+#include <libavutil/samplefmt.h>
 }
 
 #include "httpd.h"
+
 #include "timebase.h"
 
+struct MHD_Connection;
+struct MHD_Response;
+
 using namespace std;
 
 HTTPD::HTTPD(const char *output_filename, int width, int height)

diff --git a/httpd.h b/httpd.h
index 524c8d61637e41fd059732271dc0d5d5938f82cd..6c746c085d929840925db5cea1240656db1df2ad 100644 (file)
--- a/httpd.h
+++ b/httpd.h
@@ -9,14 +9,22 @@
 // way, namely having one ffmpeg mux per output.
 
 #include <microhttpd.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <condition_variable>
 #include <deque>
-#include <string>
+#include <memory>
 #include <mutex>
-#include <condition_variable>
+#include <string>
 #include <vector>
 
+struct MHD_Connection;
+
 extern "C" {
+#include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavformat/avio.h>
 }
 
 class HTTPD {

diff --git a/lrameter.cpp b/lrameter.cpp
index cd87a6c0f14e2dd52d3b155d4d994b630db79473..6e9fed429a5862563c79144424acd2d0a70e2ff7 100644 (file)
--- a/lrameter.cpp
+++ b/lrameter.cpp
@@ -1,8 +1,12 @@
-#include <QPainter>
-
 #include "lrameter.h"
+
+#include <QPainter>
+#include <QPalette>
+#include <QPen>
 #include "vu_common.h"
 
+class QPaintEvent;
+
 using namespace std;
 
 LRAMeter::LRAMeter(QWidget *parent)

diff --git a/lrameter.h b/lrameter.h
index 50497be5fa23f753e7a57b02849e11f7bb894685..bcd8377036b7915f7dd858b260f4d19adc8b03de 100644 (file)
--- a/lrameter.h
+++ b/lrameter.h
@@ -3,10 +3,10 @@
 #ifndef LRAMETER_H
 #define LRAMETER_H
 
-#include <QWidget>
+#include <math.h>
 #include <QLabel>
 #include <QPaintEvent>
-
+#include <QWidget>
 #include <mutex>
 
 class LRAMeter : public QWidget

diff --git a/main.cpp b/main.cpp
index 5917c7efa9838521132bb8d035fb8e41d3157e3f..fd41e0bd67bafdd710935d119a11a42b9d355e94 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,3 +1,8 @@
+extern "C" {
+#include <libavformat/avformat.h>
+}
+#include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <epoxy/gl.h>
 

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ecdb131028f6a1ef691d190d4edc9f0ef2a1ddea..3f0098be7a07d385e3326f1de0dbc184cf0e4dc6 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,16 +1,28 @@
 #include "mainwindow.h"
-#include <thread>
-#include <vector>
+
+#include <math.h>
+#include <stdio.h>
+#include <algorithm>
 #include <string>
-#include <QSignalMapper>
+#include <vector>
+#include <QBoxLayout>
+#include <QKeySequence>
+#include <QLabel>
 #include <QMetaType>
-#include <QShortcut>
+#include <QPushButton>
 #include <QResizeEvent>
+#include <QShortcut>
+#include <QSignalMapper>
+#include <QSize>
+#include <QString>
 
-#include "context.h"
+#include "glwidget.h"
+#include "lrameter.h"
 #include "mixer.h"
-
 #include "ui_mainwindow.h"
+#include "vumeter.h"
+
+class QResizeEvent;
 
 using namespace std;
 

diff --git a/mainwindow.h b/mainwindow.h
index 6f2666869443a433a9ce658b1d95e607e312c1a7..ef0b04ffec04b06d25d7b9cbfec5136eec4bc191 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -2,8 +2,10 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include <vector>
 #include <string>
+#include <vector>
+
+class QResizeEvent;
 
 namespace Ui {
 class MainWindow;

diff --git a/mixer.cpp b/mixer.cpp
index cf2ed8311a001080641fabb2afc2ae077e7409cb..981c0cb4e38b699b7d6628b07d72ba58873aa2c0 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -7,27 +7,20 @@
 #include "mixer.h"
 
 #include <assert.h>
-#include <effect.h>
-#include <effect_chain.h>
-#include <effect_util.h>
 #include <epoxy/egl.h>
-#include <features.h>
-#include <image_format.h>
 #include <init.h>
-#include <overlay_effect.h>
-#include <padding_effect.h>
-#include <resample_effect.h>
-#include <resource_pool.h>
-#include <saturation_effect.h>
+#include <movit/effect_chain.h>
+#include <movit/effect_util.h>
+#include <movit/flat_input.h>
+#include <movit/image_format.h>
+#include <movit/resource_pool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <time.h>
 #include <util.h>
-#include <white_balance_effect.h>
-#include <ycbcr.h>
-#include <ycbcr_input.h>
+#include <algorithm>
 #include <cmath>
 #include <condition_variable>
 #include <cstddef>
@@ -35,6 +28,7 @@
 #include <mutex>
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include "bmusb/bmusb.h"

diff --git a/mixer.h b/mixer.h
index 82a3ccab8a899e9637a17a5b122b48c6c1fb6286..bf53c2482e23362e0cba1ff589cbf72d76d78dd0 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -5,20 +5,39 @@
 
 #include <epoxy/gl.h>
 #undef Success
+#include <stdbool.h>
+#include <stdint.h>
+
 #include <movit/effect_chain.h>
 #include <movit/flat_input.h>
+#include <condition_variable>
+#include <cstddef>
 #include <functional>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <vector>
 
 #include "bmusb/bmusb.h"
+#include "ebu_r128_proc.h"
 #include "h264encode.h"
+#include "httpd.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
-#include "theme.h"
 #include "resampler.h"
+#include "theme.h"
 #include "timebase.h"
-#include "httpd.h"
-#include "ebu_r128_proc.h"
+
+class H264Encoder;
+class QSurface;
+namespace movit {
+class Effect;
+class EffectChain;
+class FlatInput;
+class ResourcePool;
+}  // namespace movit
 
 namespace movit {
 class YCbCrInput;

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index 204bb94b933c18b3c41501387ecc9f180bb99ad0..1c370b4266d4f09609a8d657d1f8bda86fa1d85b 100644 (file)
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -1,5 +1,6 @@
 #include "pbo_frame_allocator.h"
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <cstddef>

diff --git a/pbo_frame_allocator.h b/pbo_frame_allocator.h
index 1fb6a072a1ecfc112c99d1c0a4fc8d9aa10f61e9..452c006bd2d36c290de9cd456b4c4edbf4b87b85 100644 (file)
--- a/pbo_frame_allocator.h
+++ b/pbo_frame_allocator.h
@@ -2,6 +2,8 @@
 #define _PBO_FRAME_ALLOCATOR 1
 
 #include <epoxy/gl.h>
+#include <stddef.h>
+#include <memory>
 #include <mutex>
 #include <queue>
 

diff --git a/ref_counted_frame.h b/ref_counted_frame.h
index 6d66a769f59044079055cf5c7d0484e200ef2e2c..67787ef3cbb7289b2929cfe33f83fa7ac7f71765 100644 (file)
--- a/ref_counted_frame.h
+++ b/ref_counted_frame.h
@@ -7,6 +7,8 @@
 // Note that the important point isn't really the pointer to the Frame itself,
 // it's the resources it's representing that need to go back to the allocator.
 
+#include <memory>
+
 #include "bmusb/bmusb.h"
 
 void release_refcounted_frame(FrameAllocator::Frame *frame);

diff --git a/resampler.cpp b/resampler.cpp
index ddcc229b6d984c74cbcb8d5b72726da54fc918a9..138f837250f154c35b42031654cdc15e8e19b3b0 100644 (file)
--- a/resampler.cpp
+++ b/resampler.cpp
@@ -18,9 +18,10 @@
 
 #include "resampler.h"
 
+#include <math.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
-#include <math.h>
 #include <zita-resampler/vresampler.h>
 
 Resampler::Resampler(unsigned freq_in, unsigned freq_out, unsigned num_channels)

diff --git a/resampler.h b/resampler.h
index 85fea837a8d1cf5aae3a8861506919017184f1ca..7d3b6025eb7b490655bcf2327e6c3db280195888 100644 (file)
--- a/resampler.h
+++ b/resampler.h
@@ -40,9 +40,10 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <sys/types.h>
 #include <zita-resampler/vresampler.h>
-
 #include <deque>
+#include <memory>
 
 class Resampler {
 public:

diff --git a/theme.cpp b/theme.cpp
index 2a84093cd6f37e915a5489e56ee6424d156ce70d..f32f637c03cb0aa683cece7d1fbaa4ed1cf60433 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -1,20 +1,29 @@
-#include <stdio.h>
+#include "theme.h"
+
+#include <assert.h>
+#include <lauxlib.h>
 #include <lua.h>
 #include <lualib.h>
-#include <lauxlib.h>
-#include <new>
-#include <utility>
-
+#include <movit/effect.h>
 #include <movit/effect_chain.h>
-#include <movit/ycbcr_input.h>
-#include <movit/white_balance_effect.h>
-#include <movit/resample_effect.h>
-#include <movit/padding_effect.h>
+#include <movit/image_format.h>
+#include <movit/mix_effect.h>
 #include <movit/overlay_effect.h>
+#include <movit/padding_effect.h>
+#include <movit/resample_effect.h>
 #include <movit/resize_effect.h>
-#include <movit/mix_effect.h>
+#include <movit/white_balance_effect.h>
+#include <movit/ycbcr.h>
+#include <movit/ycbcr_input.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <cstddef>
+#include <new>
+#include <utility>
 
-#include "theme.h"
+namespace movit {
+class ResourcePool;
+}  // namespace movit
 
 #define WIDTH 1280  // FIXME
 #define HEIGHT 720  // FIXME

diff --git a/theme.h b/theme.h
index b17dbbd00de85764d866a02f22db8562636855b3..2b75aa157c2870665739715a52beee9bf7bc015b 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -1,16 +1,24 @@
 #ifndef _THEME_H
 #define _THEME_H 1
 
-#include <stdio.h>
-#include <lua.h>
+#include <epoxy/gl.h>
 #include <lauxlib.h>
-
+#include <lua.h>
+#include <movit/effect_chain.h>
+#include <movit/ycbcr_input.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <functional>
 #include <mutex>
+#include <string>
 #include <utility>
+#include <vector>
 
-#include <movit/effect_chain.h>
-#include <movit/ycbcr_input.h>
+namespace movit {
+class ResourcePool;
+struct ImageFormat;
+struct YCbCrFormat;
+}  // namespace movit
 
 #define MAX_CARDS 16
 

diff --git a/vu_common.cpp b/vu_common.cpp
index 9fc3553eeb2fc907f21a1f7feea158b3c4236b20..7b14f2f196a8683b29fb00f07e7f758c533e2dff 100644 (file)
--- a/vu_common.cpp
+++ b/vu_common.cpp
@@ -1,7 +1,12 @@
 #include "vu_common.h"
+
 #include <math.h>
 #include <algorithm>
 
+#include <QBrush>
+#include <QColor>
+#include <QPainter>
+
 using namespace std;
 
 int lufs_to_pos(float level_lu, int height)

diff --git a/vumeter.h b/vumeter.h
index 720a12e5217b2225d3f0f022b45b8e2b79c40c32..12afdc6398dfd2ec42128dd7272bab92b6c33533 100644 (file)
--- a/vumeter.h
+++ b/vumeter.h
@@ -1,10 +1,10 @@
 #ifndef VUMETER_H
 #define VUMETER_H
 
-#include <QWidget>
+#include <math.h>
 #include <QLabel>
 #include <QPaintEvent>
-
+#include <QWidget>
 #include <mutex>
 
 class VUMeter : public QWidget