frontend: Add renamed Qt UI components

This commit only contains Qt UI components that are self-contained,
i.e. the translation units only contain code for a single class or
interface and don't mix implementations.

UI/absolute-slider.cpp → frontend/components/AbsoluteSlider.cpp

@@ -1,4 +1,5 @@
-#include "moc_absolute-slider.cpp"
+#include "AbsoluteSlider.hpp"
+#include "moc_AbsoluteSlider.cpp"
 
 AbsoluteSlider::AbsoluteSlider(QWidget *parent) : SliderIgnoreScroll(parent)
 {

UI/absolute-slider.hpp → frontend/components/AbsoluteSlider.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QMouseEvent>
 #include <slider-ignorewheel.hpp>
 
 class AbsoluteSlider : public SliderIgnoreScroll {

UI/balance-slider.hpp → frontend/components/BalanceSlider.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QSlider>
 #include <QMouseEvent>
+#include <QSlider>
 
 class BalanceSlider : public QSlider {
 	Q_OBJECT

UI/focus-list.cpp → frontend/components/FocusList.cpp

@@ -1,6 +1,9 @@
-#include "moc_focus-list.cpp"
+#include "FocusList.hpp"
+
 #include <QDragMoveEvent>
 
+#include "moc_FocusList.cpp"
+
 FocusList::FocusList(QWidget *parent) : QListWidget(parent) {}
 
 void FocusList::focusInEvent(QFocusEvent *event)

UI/focus-list.hpp → frontend/components/FocusList.hpp

@@ -2,8 +2,6 @@
 
 #include <QListWidget>
 
-class QDragMoveEvent;
-
 class FocusList : public QListWidget {
 	Q_OBJECT
 

UI/horizontal-scroll-area.cpp → frontend/components/HScrollArea.cpp

@@ -1,5 +1,8 @@
+#include "HScrollArea.hpp"
+
 #include <QResizeEvent>
-#include "moc_horizontal-scroll-area.cpp"
+
+#include "moc_HScrollArea.cpp"
 
 void HScrollArea::resizeEvent(QResizeEvent *event)
 {

UI/media-controls.cpp → frontend/components/MediaControls.cpp

@@ -1,11 +1,11 @@
-#include "window-basic-main.hpp"
-#include "moc_media-controls.cpp"
-#include "obs-app.hpp"
+#include "MediaControls.hpp"
+#include "ui_media-controls.h"
+
+#include <OBSApp.hpp>
+
 #include <QToolTip>
-#include <QStyle>
-#include <QMenu>
 
-#include "ui_media-controls.h"
+#include "moc_MediaControls.cpp"
 
 void MediaControls::OBSMediaStopped(void *data, calldata_t *)
 {

UI/media-controls.hpp → frontend/components/MediaControls.hpp

@@ -1,10 +1,9 @@
 #pragma once
 
-#include <QWidget>
-#include <QTimer>
-#include <vector>
 #include <obs.hpp>
-#include <qt-wrappers.hpp>
+
+#include <QTimer>
+#include <QWidget>
 
 class Ui_MediaControls;
 

UI/menu-button.cpp → frontend/components/MenuButton.cpp

@@ -1,7 +1,9 @@
-#include <QMenu>
+#include "MenuButton.hpp"
+
 #include <QKeyEvent>
 #include <QMouseEvent>
-#include "moc_menu-button.cpp"
+
+#include "moc_MenuButton.cpp"
 
 void MenuButton::keyPressEvent(QKeyEvent *event)
 {

UI/multiview.cpp → frontend/components/Multiview.cpp

@@ -1,8 +1,9 @@
-#include "multiview.hpp"
-#include "window-basic-main.hpp"
-#include "obs-app.hpp"
-#include "platform.hpp"
-#include "display-helpers.hpp"
+#include "Multiview.hpp"
+
+#include <utility/display-helpers.hpp>
+#include <widgets/OBSBasic.hpp>
+
+#include <obs-frontend-api.h>
 
 Multiview::Multiview()
 {

UI/multiview.hpp → frontend/components/Multiview.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <obs.hpp>
+
 #include <vector>
 
 enum class MultiviewLayout : uint8_t {

UI/noncheckable-button.hpp → frontend/components/NonCheckableButton.hpp

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <QPushButton>
+#include <QString>
+#include <QWidget>
 
 /* Button with its checked property not changed when clicked.
  * Meant to be used in situations where manually changing the property

UI/adv-audio-control.cpp → frontend/components/OBSAdvAudioCtrl.cpp

@@ -1,14 +1,13 @@
-#include <QHBoxLayout>
-#include <QGridLayout>
-#include <QLabel>
-#include <QSpinBox>
-#include <QComboBox>
-#include <QCheckBox>
-#include <cmath>
+#include "OBSAdvAudioCtrl.hpp"
+
+#include <components/BalanceSlider.hpp>
+#include <widgets/OBSBasic.hpp>
+
 #include <qt-wrappers.hpp>
-#include "obs-app.hpp"
-#include "moc_adv-audio-control.cpp"
-#include "window-basic-main.hpp"
+
+#include <QCheckBox>
+
+#include "moc_OBSAdvAudioCtrl.cpp"
 
 #ifndef NSEC_PER_MSEC
 #define NSEC_PER_MSEC 1000000
@@ -16,6 +15,7 @@
 
 #define MIN_DB -96.0
 #define MAX_DB 26.0
+
 static inline void setMixer(obs_source_t *source, const int mixerIdx, const bool checked);
 
 OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *, obs_source_t *source_) : source(source_)

UI/adv-audio-control.hpp → frontend/components/OBSAdvAudioCtrl.hpp

@@ -1,17 +1,19 @@
 #pragma once
 
 #include <obs.hpp>
-#include <QWidget>
+
+#include <QObject>
 #include <QPointer>
-#include <QDoubleSpinBox>
-#include <QStackedWidget>
-#include "balance-slider.hpp"
 
+class BalanceSlider;
+class QCheckBox;
+class QComboBox;
+class QDoubleSpinBox;
 class QGridLayout;
 class QLabel;
 class QSpinBox;
-class QCheckBox;
-class QComboBox;
+class QStackedWidget;
+class QWidget;
 
 enum class VolumeType {
 	dB,

UI/source-label.cpp → frontend/components/OBSSourceLabel.cpp

@@ -15,7 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
-#include "moc_source-label.cpp"
+#include "OBSSourceLabel.hpp"
+#include "moc_OBSSourceLabel.cpp"
 
 void OBSSourceLabel::SourceRenamed(void *data, calldata_t *params)
 {

UI/source-label.hpp → frontend/components/OBSSourceLabel.hpp

@@ -17,9 +17,10 @@
 
 #pragma once
 
-#include <QLabel>
 #include <obs.hpp>
 
+#include <QLabel>
+
 class OBSSourceLabel : public QLabel {
 	Q_OBJECT;
 

UI/scene-tree.cpp → frontend/components/SceneTree.cpp

@@ -1,11 +1,9 @@
-#include "moc_scene-tree.cpp"
+#include "SceneTree.hpp"
 
-#include <QSizePolicy>
 #include <QScrollBar>
-#include <QDropEvent>
-#include <QPushButton>
 #include <QTimer>
-#include <cmath>
+
+#include "moc_SceneTree.cpp"
 
 SceneTree::SceneTree(QWidget *parent_) : QListWidget(parent_)
 {

UI/scene-tree.hpp → frontend/components/SceneTree.hpp

@@ -1,8 +1,9 @@
 #pragma once
 
 #include <QListWidget>
-#include <QEvent>
-#include <QItemDelegate>
+#include <QObject>
+#include <QResizeEvent>
+#include <QWidget>
 
 class SceneTree : public QListWidget {
 	Q_OBJECT

UI/ui-validation.cpp → frontend/components/UIValidation.cpp

@@ -1,12 +1,11 @@
-#include "moc_ui-validation.cpp"
+#include "UIValidation.hpp"
+
+#include <OBSApp.hpp>
 
-#include <obs.hpp>
-#include <QString>
 #include <QMessageBox>
 #include <QPushButton>
 
-#include <obs-app.hpp>
-#include <obs-service.h>
+#include "moc_UIValidation.cpp"
 
 static int CountVideoSources()
 {

UI/ui-validation.hpp → frontend/components/UIValidation.hpp

@@ -1,10 +1,9 @@
 #pragma once
 
-#include <QObject>
-#include <QWidget>
-
 #include <obs.hpp>
 
+#include <QObject>
+
 enum class StreamSettingsAction {
 	OpenSettings,
 	Cancel,

UI/url-push-button.cpp → frontend/components/UrlPushButton.cpp

@@ -1,9 +1,9 @@
-#include "moc_url-push-button.cpp"
+#include "UrlPushButton.hpp"
 
-#include <QUrl>
-#include <QMouseEvent>
 #include <QDesktopServices>
 
+#include "moc_UrlPushButton.cpp"
+
 void UrlPushButton::setTargetUrl(QUrl url)
 {
 	setToolTip(url.toString());

UI/url-push-button.hpp → frontend/components/UrlPushButton.hpp

@@ -1,7 +1,9 @@
 #pragma once
 
+#include <QMouseEvent>
 #include <QPushButton>
 #include <QUrl>
+#include <QWidget>
 
 class UrlPushButton : public QPushButton {
 	Q_OBJECT