Cleanup includes

Author: oktomus

src/appleseed.studio/mainwindow/rendering/finalrenderviewporttab.cpp

@@ -40,6 +40,7 @@
 
 // appleseed.qtcommon headers.
 #include "utility/miscellaneous.h"
+#include "widgets/mousecoordinatestracker.h"
 
 // Qt headers.
 #include <QComboBox>
@@ -540,4 +541,3 @@ void FinalRenderViewportTab::set_light_paths_toggle_enabled(const bool enabled)
 }   // namespace studio
 }   // namespace appleseed
 
-#include "mainwindow/rendering/moc_cpp_finalrenderviewporttab.cxx"

src/appleseed.studio/mainwindow/rendering/finalrenderviewporttab.h

@@ -29,14 +29,22 @@
 #pragma once
 
 // appleseed.studio headers.
+#include "mainwindow/rendering/cameracontroller.h"
 #include "mainwindow/rendering/lightpathsmanager.h"
+#include "mainwindow/rendering/lightpathsviewporttoolbar.h"
+#include "mainwindow/rendering/materialdrophandler.h"
+#include "mainwindow/rendering/pixelcolortracker.h"
+#include "mainwindow/rendering/pixelinspectorhandler.h"
+#include "mainwindow/rendering/scenepickinghandler.h"
 #include "mainwindow/rendering/viewporttab.h"
+#include "mainwindow/rendering/viewportregionselectionhandler.h"
 
 // OpenColorIO headers.
 #include <OpenColorIO/OpenColorIO.h>
 namespace OCIO = OCIO_NAMESPACE;
 
 // Forward declarations.
+namespace appleseed { namespace qtcommon { class MouseCoordinatesTracker; } }
 namespace appleseed { namespace studio { class LightPathsPickingHandler; } }
 namespace appleseed { namespace studio { class ProjectExplorer; } }
 namespace appleseed { namespace studio { class RenderingManager; } }

src/appleseed.studio/mainwindow/rendering/openglviewporttab.h

@@ -32,20 +32,11 @@
 #include "mainwindow/rendering/cameracontroller.h"
 #include "mainwindow/rendering/lightpathsmanager.h"
 #include "mainwindow/rendering/lightpathsviewporttoolbar.h"
-#include "mainwindow/rendering/materialdrophandler.h"
-#include "mainwindow/rendering/pixelcolortracker.h"
-#include "mainwindow/rendering/pixelinspectorhandler.h"
 #include "mainwindow/rendering/renderclipboardhandler.h"
-#include "mainwindow/rendering/scenepickinghandler.h"
 #include "mainwindow/rendering/viewportcanvas.h"
 #include "mainwindow/rendering/viewportregionselectionhandler.h"
 #include "mainwindow/rendering/viewporttab.h"
 
-// appleseed.qtcommon headers.
-#include "widgets/mousecoordinatestracker.h"
-#include "widgets/scrollareapanhandler.h"
-#include "widgets/widgetzoomhandler.h"
-
 // OpenColorIO headers.
 #include <OpenColorIO/OpenColorIO.h>
 namespace OCIO = OCIO_NAMESPACE;
@@ -119,3 +110,4 @@ class OpenGLViewportTab
 
 }   // namespace studio
 }   // namespace appleseed
+

src/appleseed.studio/mainwindow/rendering/viewporttab.cpp

@@ -30,31 +30,12 @@
 // Interface header.
 #include "viewporttab.h"
 
-// appleseed.qtcommon headers.
-#include "utility/miscellaneous.h"
-
 // appleseed.renderer headers.
 #include "renderer/api/frame.h"
 #include "renderer/api/project.h"
 
 // appleseed.foundation headers.
 #include "foundation/image/canvasproperties.h"
-#include "foundation/image/image.h"
-
-// Qt headers.
-#include <QComboBox>
-#include <QGridLayout>
-#include <QLabel>
-#include <QLayout>
-#include <QScrollArea>
-#include <QSize>
-#include <QString>
-#include <Qt>
-#include <QToolBar>
-#include <QToolButton>
-
-// Standard headers.
-#include <string>
 
 using namespace appleseed::qtcommon;
 using namespace foundation;
@@ -126,8 +107,6 @@ void ViewportTab::load_state(const State& state)
     m_pan_handler->load_state(state.m_pan_handler_state);
 }
 
-
 }   // namespace studio
 }   // namespace appleseed
 
-#include "mainwindow/rendering/moc_cpp_viewporttab.cxx"

src/appleseed.studio/mainwindow/rendering/viewporttab.h

@@ -30,18 +30,9 @@
 #pragma once
 
 // appleseed.studio headers.
-#include "mainwindow/rendering/cameracontroller.h"
-#include "mainwindow/rendering/lightpathsviewporttoolbar.h"
-#include "mainwindow/rendering/materialdrophandler.h"
-#include "mainwindow/rendering/pixelcolortracker.h"
-#include "mainwindow/rendering/pixelinspectorhandler.h"
-#include "mainwindow/rendering/renderclipboardhandler.h"
-#include "mainwindow/rendering/scenepickinghandler.h"
 #include "mainwindow/rendering/viewportcanvas.h"
-#include "mainwindow/rendering/viewportregionselectionhandler.h"
 
 // appleseed.qtcommon headers.
-#include "widgets/mousecoordinatestracker.h"
 #include "widgets/scrollareapanhandler.h"
 #include "widgets/widgetzoomhandler.h"
 
@@ -53,15 +44,7 @@
 #include <memory>
 
 // Forward declarations.
-namespace renderer  { class Entity; }
 namespace renderer  { class Project; }
-class QComboBox;
-class QLabel;
-class QPoint;
-class QRect;
-class QScrollArea;
-class QToolBar;
-class QToolButton;
 
 namespace appleseed {
 namespace studio {