fixup! UI: reorder includes correctly

UI/scene-tree.cpp

@@ -1,19 +1,13 @@
-#include "obs-frontend-api.h"
-#include "obs-source.h"
-#include "obs.h"
 #include "scene-tree.hpp"
-#include <obs-module.h>
+#include "obs.h"
 
-#include <QDropEvent>
-#include <QMimeData>
-#include <QPushButton>
-#include <QScrollBar>
 #include <QSizePolicy>
+#include <QScrollBar>
+#include <QDropEvent>
+#include <QPushButton>
 #include <QTimer>
 #include <cmath>
-
-
-OBS_DECLARE_MODULE()
+#include <QMimeData>
 
 SceneTree::SceneTree(QWidget *parent_) : QListWidget(parent_)
 {
@@ -113,9 +107,9 @@ void SceneTree::startDrag(Qt::DropActions supportedActions)
 
 void SceneTree::dropEvent(QDropEvent *event)
 {
-	 if (event->mimeData()->hasFormat("application/indexes")) {
-		QByteArray encodedData = event->mimeData()->data(
-			"application/indexes");
+	if (event->mimeData()->hasFormat("application/indexes")) {
+		QByteArray encodedData =
+			event->mimeData()->data("application/indexes");
 		QDataStream stream(&encodedData, QIODevice::ReadOnly);
 
 		QStringList sourceNames;
@@ -138,7 +132,7 @@ void SceneTree::dropEvent(QDropEvent *event)
 
 		event->setDropAction(Qt::MoveAction);
 		event->accept();
-	 }
+	}
 
 	if (gridMode) {
 		int scrollWid = verticalScrollBar()->sizeHint().width();
@@ -195,7 +189,7 @@ void SceneTree::addSourceToScene(const QString &sourceName,
 
 	obs_scene_t *scene = obs_scene_from_source(sceneSource);
 	if (!scene) {
-		obs_source_release(source);      
+		obs_source_release(source);
 		obs_source_release(sceneSource);
 		return;
 	}
@@ -206,7 +200,6 @@ void SceneTree::addSourceToScene(const QString &sourceName,
 	obs_source_release(sceneSource);
 }
 
-
 void SceneTree::RepositionGrid(QDragMoveEvent *event)
 {
 	int scrollWid = verticalScrollBar()->sizeHint().width();

UI/scene-tree.hpp

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

UI/source-tree.cpp

@@ -1,29 +1,28 @@
-#include "obs-app.hpp"
-#include "platform.hpp"
-#include "qt-wrappers.hpp"
-#include "source-tree.hpp"
 #include "window-basic-main.hpp"
+#include "obs-app.hpp"
+#include "source-tree.hpp"
+#include "qt-wrappers.hpp"
+#include "platform.hpp"
+#include "source-label.hpp"
 
 #include <obs-frontend-api.h>
 #include <obs.h>
-#include <obs.hpp>
 
 #include <string>
 
-#include <QAccessible>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QMouseEvent>
-#include <QPushButton>
 #include <QSpacerItem>
+#include <QPushButton>
 #include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QMouseEvent>
+#include <QAccessible>
 
-#include <QDrag>
-#include <QMimeData>
 #include <QStylePainter>
 #include <QStyleOptionFocusRect>
-
+#include <QDrag>
+#include <QMimeData>
 
 static inline OBSScene GetCurrentScene()
 {
@@ -1186,11 +1185,10 @@ void SourceTree::startDrag(Qt::DropActions supportedActions)
 	drag->setPixmap(blueBox);
 	drag->setHotSpot(dragStartPosition - boundingRect.topLeft());
 
-	Qt::DropAction dropAction = drag->exec(supportedActions);
+	drag->exec(supportedActions);
 }
 
-
-bool SourceTree::get_selected_source_names(obs_scene_t *scene,
+bool SourceTree::get_selected_source_names(obs_scene_t * /*scene*/,
 					   obs_sceneitem_t *sceneitem,
 					   void *param)
 {
@@ -1209,6 +1207,7 @@ bool SourceTree::get_selected_source_names(obs_scene_t *scene,
 	return true;
 }
 
+
 void SourceTree::SetIconsVisible(bool visible)
 {
 	SourceTreeModel *stm = GetStm();
@@ -1761,7 +1760,6 @@ void SourceTree::Remove(OBSSceneItem item, OBSScene scene)
 	QString sceneName = QString::fromUtf8(obs_source_get_name(sceneSource));
 
 	removeSourceFromScene(sourceName, sceneName);
-
 }
 
 void SourceTree::removeSourceFromScene(const QString &sourceName,
@@ -1804,7 +1802,6 @@ void SourceTree::removeSourceFromScene(const QString &sourceName,
 	obs_source_release(sceneSource);
 }
 
-
 void SourceTree::GroupSelectedItems()
 {
 	QModelIndexList indices = selectedIndexes();

UI/source-tree.hpp

@@ -1,18 +1,16 @@
 #pragma once
 
+#include <QList>
+#include <QVector>
+#include <QPointer>
+#include <QListView>
+#include <QCheckBox>
+#include <QStaticText>
+#include <QSvgRenderer>
+#include <QAbstractListModel>
+#include <QStyledItemDelegate>
 #include <obs.hpp>
 #include <obs-frontend-api.h>
-#include <obs.h>
-
-#include <QAbstractListModel>
-#include <QCheckBox>
-#include <QList>
-#include <QListView>
-#include <QPointer>
-#include <QStaticText>
-#include <QStyledItemDelegate>
-#include <QSvgRenderer>
-#include <QVector>
 
 class QLabel;
 class QCheckBox;
@@ -142,6 +140,7 @@ class SourceTree : public QListView {
 	QSvgRenderer iconNoSources;
 
 	OBSData undoSceneData;
+	QPoint dragStartPosition;
 
 	bool iconsVisible = true;
 
@@ -177,10 +176,10 @@ public:
 	static bool get_selected_source_names(obs_scene_t *scene,
 					      obs_sceneitem_t *sceneitem,
 					      void *param);
+
 	void removeSourceFromScene(const QString &sourceName,
 				   const QString &sceneName);
 
-
 	bool MultipleBaseSelected() const;
 	bool GroupsSelected() const;
 	bool GroupedItemsSelected() const;
@@ -210,9 +209,6 @@ protected:
 			 const QItemSelection &deselected) override;
 	virtual void dragMoveEvent(QDragMoveEvent *event) override;
 	virtual void dragEnterEvent(QDragEnterEvent *event) override;
-
-private:
-	QPoint dragStartPosition;
 };
 
 class SourceTreeDelegate : public QStyledItemDelegate {