Consolidate stdafx headers into Qt3DSCommonPrecompile.h

Task-number: QT3DS-256
Change-Id: I1ab44e93bf505f68690114f2a2c5f1a012e02af1
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

10 files changed, 15 insertions, 54 deletions

diff --git a/src/Authoring/Studio/UI/EditCameraBar.cpp b/src/Authoring/Studio/UI/EditCameraBar.cpp
index d4b2a099..eeefbbdc 100644
--- a/src/Authoring/Studio/UI/EditCameraBar.cpp
+++ b/src/Authoring/Studio/UI/EditCameraBar.cpp
@@ -27,14 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "EditCameraBar.h"
 #include "MainFrm.h"
 #include "SceneView.h"
@@ -161,7 +154,7 @@ void CEditCameraBar::HandleCameraChanged(int inIndex)
         m_SceneView->onEditCameraChanged();
 
     CMainFrame *theMainFrame = g_StudioApp.m_pMainWnd;
-    ASSERT(theMainFrame != nullptr);
+    Q_ASSERT(theMainFrame != nullptr);
 
     // if the current tool is camera rotate and has been switch to 2d camera
     // set the tool to camera pan
diff --git a/src/Authoring/Studio/UI/EditorPane.cpp b/src/Authoring/Studio/UI/EditorPane.cpp
index ef274392..4b87300d 100644
--- a/src/Authoring/Studio/UI/EditorPane.cpp
+++ b/src/Authoring/Studio/UI/EditorPane.cpp
@@ -27,14 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-#include "stdafx.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
+#include "Qt3DSCommonPrecompile.h"
 #include "EditorPane.h"
 
 //==============================================================================
@@ -87,4 +80,4 @@ CAsset *CEditorPane::GetEditObject()
 bool CEditorPane::CloseEditor()
 {
     return false;
-}
\ No newline at end of file
+}
diff --git a/src/Authoring/Studio/UI/GLVersionDlg.cpp b/src/Authoring/Studio/UI/GLVersionDlg.cpp
index e7cc3b92..6ecce324 100644
--- a/src/Authoring/Studio/UI/GLVersionDlg.cpp
+++ b/src/Authoring/Studio/UI/GLVersionDlg.cpp
@@ -27,10 +27,7 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Includes
-//==============================================================================
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "GLVersionDlg.h"
 #include "ui_GLVersionDlg.h"
 
diff --git a/src/Authoring/Studio/UI/InterpolationDlg.cpp b/src/Authoring/Studio/UI/InterpolationDlg.cpp
index 57d6ae1d..f1c0070e 100644
--- a/src/Authoring/Studio/UI/InterpolationDlg.cpp
+++ b/src/Authoring/Studio/UI/InterpolationDlg.cpp
@@ -27,15 +27,10 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix / Includes
-//==============================================================================
-
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "InterpolationDlg.h"
 #include "ui_InterpolationDlg.h"
 
-//==============================================================================
 /**
  *  Constructor: Creates a CInterpolationDlg.
  *
diff --git a/src/Authoring/Studio/UI/PlayerContainerWnd.cpp b/src/Authoring/Studio/UI/PlayerContainerWnd.cpp
index a5ae75b0..231738de 100644
--- a/src/Authoring/Studio/UI/PlayerContainerWnd.cpp
+++ b/src/Authoring/Studio/UI/PlayerContainerWnd.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "SceneView.h"
 #include "Doc.h"
 #include "StudioProjectSettings.h"
diff --git a/src/Authoring/Studio/UI/PlayerWnd.cpp b/src/Authoring/Studio/UI/PlayerWnd.cpp
index ba8c25d6..dfa174fe 100644
--- a/src/Authoring/Studio/UI/PlayerWnd.cpp
+++ b/src/Authoring/Studio/UI/PlayerWnd.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "PlayerWnd.h"
 #include "MainFrm.h"
 #include "SceneView.h"
diff --git a/src/Authoring/Studio/UI/RecentItems.cpp b/src/Authoring/Studio/UI/RecentItems.cpp
index e7497d40..9b7acd7e 100644
--- a/src/Authoring/Studio/UI/RecentItems.cpp
+++ b/src/Authoring/Studio/UI/RecentItems.cpp
@@ -27,12 +27,12 @@
 **
 ****************************************************************************/
 
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 
 #include "RecentItems.h"
 #include "Preferences.h"
 
-#include <QMenu>
+#include <QtWidgets/qmenu.h>
 
 // using namespace Q3DStudio;  <-- Do not do this here because it will conflict with CList and make
 // the template generator go blah
diff --git a/src/Authoring/Studio/UI/ResetKeyframeValuesDlg.cpp b/src/Authoring/Studio/UI/ResetKeyframeValuesDlg.cpp
index 26204474..74345832 100644
--- a/src/Authoring/Studio/UI/ResetKeyframeValuesDlg.cpp
+++ b/src/Authoring/Studio/UI/ResetKeyframeValuesDlg.cpp
@@ -30,12 +30,12 @@
 //==============================================================================
 //	Includes
 //==============================================================================
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "ResetKeyframeValuesDlg.h"
 #include "ui_ResetKeyframeValuesDlg.h"
 
-#include <QPushButton>
-#include <QStyle>
+#include <QtWidgets/qpushbutton.h>
+#include <QtWidgets/qstyle.h>
 
 CResetKeyframeValuesDlg::CResetKeyframeValuesDlg(QWidget *pParent)
     : QDialog(pParent)
diff --git a/src/Authoring/Studio/UI/StartupDlg.cpp b/src/Authoring/Studio/UI/StartupDlg.cpp
index 59b29a1b..b607a59b 100644
--- a/src/Authoring/Studio/UI/StartupDlg.cpp
+++ b/src/Authoring/Studio/UI/StartupDlg.cpp
@@ -27,16 +27,8 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-// Prefix
-//==============================================================================
-#include "stdafx.h"
+#include "Qt3DSCommonPrecompile.h"
 #include "StudioDefs.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
-
 #include "StartupDlg.h"
 #include "StudioPreferences.h"
 #include "ui_StartupDlg.h"
diff --git a/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp b/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp
index 9dcb616c..f90fd8fe 100644
--- a/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp
+++ b/src/Authoring/Studio/UI/StudioProjectSettingsPage.cpp
@@ -27,17 +27,8 @@
 **
 ****************************************************************************/
 
-//==============================================================================
-//	Prefix
-//==============================================================================
-
-#include "stdafx.h"
-
+#include "Qt3DSCommonPrecompile.h"
 #include "ui_StudioProjectSettingsPage.h"
-
-//==============================================================================
-//	Includes
-//==============================================================================
 #include "StudioProjectSettingsPage.h"
 #include "StudioProjectSettings.h"
 #include "StudioApp.h"