From f9b2489ae20f14c11d89ac8b2db830ac46fe8932 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 6 Mar 2022 21:47:17 +0100
Subject: [PATCH] [Gui] Quarter: remove few unused includes

- mainly sorting
---
 src/Gui/Quarter/DragDropHandler.cpp      | 18 ++++++++----------
 src/Gui/Quarter/FocusHandler.cpp         |  8 +++++---
 src/Gui/Quarter/InputDevice.cpp          |  6 ++++--
 src/Gui/Quarter/KeyboardP.cpp            |  7 ++++---
 src/Gui/Quarter/KeyboardP.h              |  3 ++-
 src/Gui/Quarter/NativeEvent.h            |  3 +--
 src/Gui/Quarter/Quarter.cpp              |  6 +++---
 src/Gui/Quarter/Quarter.h                |  2 +-
 src/Gui/Quarter/QuarterWidgetP.cpp       | 21 +++++++++------------
 src/Gui/Quarter/SensorManager.h          |  2 +-
 src/Gui/Quarter/SignalThread.h           |  7 ++++---
 src/Gui/Quarter/SoQTQuarterAdaptor.cpp   | 24 +++++++++++++-----------
 src/Gui/Quarter/SpaceNavigatorDevice.cpp | 12 ++++--------
 13 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/src/Gui/Quarter/DragDropHandler.cpp b/src/Gui/Quarter/DragDropHandler.cpp
index 796295cde8..da02a2952e 100644
--- a/src/Gui/Quarter/DragDropHandler.cpp
+++ b/src/Gui/Quarter/DragDropHandler.cpp
@@ -37,20 +37,18 @@
   functionality to the QuarterWidget.
 */
 
-#include <Quarter/eventhandlers/DragDropHandler.h>
-
-#include <QtCore/QUrl>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStringList>
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QDropEvent>
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QFileInfo>
 #include <QMimeData>
-
+#include <QStringList>
+#include <QUrl>
 #include <Inventor/SoInput.h>
 #include <Inventor/nodes/SoSeparator.h>
 
-#include <Quarter/QuarterWidget.h>
-#include <cstdlib>
+#include "QuarterWidget.h"
+#include "eventhandlers/DragDropHandler.h"
+
 
 namespace SIM { namespace Coin3D { namespace Quarter {
 
diff --git a/src/Gui/Quarter/FocusHandler.cpp b/src/Gui/Quarter/FocusHandler.cpp
index 053ee3a75c..e7d12f3299 100644
--- a/src/Gui/Quarter/FocusHandler.cpp
+++ b/src/Gui/Quarter/FocusHandler.cpp
@@ -37,12 +37,14 @@
   focus out events, if installed on QuarterWidget.
 */
 
-#include <Quarter/eventhandlers/FocusHandler.h>
-#include <Quarter/QuarterWidget.h>
-#include <QtCore/QEvent>
+#include <QEvent>
 #include <Inventor/SoEventManager.h>
 #include <Inventor/scxml/SoScXMLStateMachine.h>
 
+#include "QuarterWidget.h"
+#include "eventhandlers/FocusHandler.h"
+
+
 using namespace SIM::Coin3D::Quarter;
 
 FocusHandler::FocusHandler(QObject * parent)
diff --git a/src/Gui/Quarter/InputDevice.cpp b/src/Gui/Quarter/InputDevice.cpp
index b2cc008b6a..9ae479a9fa 100644
--- a/src/Gui/Quarter/InputDevice.cpp
+++ b/src/Gui/Quarter/InputDevice.cpp
@@ -34,10 +34,12 @@
 #pragma warning(disable : 4267)
 #endif
 
-#include <Quarter/devices/InputDevice.h>
-#include <QtGui/QInputEvent>
+#include <QInputEvent>
 #include <Inventor/events/SoEvents.h>
 
+#include "devices/InputDevice.h"
+
+
 using namespace SIM::Coin3D::Quarter;
 
 /*!
diff --git a/src/Gui/Quarter/KeyboardP.cpp b/src/Gui/Quarter/KeyboardP.cpp
index 1cbc87907c..4a8c028c8c 100644
--- a/src/Gui/Quarter/KeyboardP.cpp
+++ b/src/Gui/Quarter/KeyboardP.cpp
@@ -30,11 +30,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include "KeyboardP.h"
-#include <Quarter/devices/Keyboard.h>
-#include <QtCore/QMap>
 #include <Inventor/errors/SoDebugError.h>
 
+#include "KeyboardP.h"
+#include "devices/Keyboard.h"
+
+
 using namespace SIM::Coin3D::Quarter;
 
 #define PUBLIC(obj) obj->publ
diff --git a/src/Gui/Quarter/KeyboardP.h b/src/Gui/Quarter/KeyboardP.h
index fb0e5d2cbd..654bc9f009 100644
--- a/src/Gui/Quarter/KeyboardP.h
+++ b/src/Gui/Quarter/KeyboardP.h
@@ -33,9 +33,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 #include <Inventor/events/SoKeyboardEvent.h>
 
+
 class SoEvent;
 template <class Key, class T> class QMap;
 
diff --git a/src/Gui/Quarter/NativeEvent.h b/src/Gui/Quarter/NativeEvent.h
index e6d20d6918..92e59bb03e 100644
--- a/src/Gui/Quarter/NativeEvent.h
+++ b/src/Gui/Quarter/NativeEvent.h
@@ -33,8 +33,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include <QtCore/QObject>
-#include <QtCore/QEvent>
+#include <QEvent>
 
 #ifdef HAVE_SPACENAV_LIB
 #include <X11/Xlib.h>
diff --git a/src/Gui/Quarter/Quarter.cpp b/src/Gui/Quarter/Quarter.cpp
index 976b02e478..78d10672d1 100644
--- a/src/Gui/Quarter/Quarter.cpp
+++ b/src/Gui/Quarter/Quarter.cpp
@@ -140,16 +140,16 @@
 //  \subpage examiner
 //*/
 
-#include <cstdio>
 #include <Inventor/SoDB.h>
-#include <Inventor/nodekits/SoNodeKit.h>
 #include <Inventor/SoInteraction.h>
+#include <Inventor/nodekits/SoNodeKit.h>
 
-#include <Quarter/Quarter.h>
 #include "SensorManager.h"
 
+#include "Quarter.h"
 #include "QuarterP.h"
 
+
 using namespace SIM::Coin3D::Quarter;
 
 static QuarterP * self = nullptr;
diff --git a/src/Gui/Quarter/Quarter.h b/src/Gui/Quarter/Quarter.h
index 22e538e7c2..4c4d827aa7 100644
--- a/src/Gui/Quarter/Quarter.h
+++ b/src/Gui/Quarter/Quarter.h
@@ -33,7 +33,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include <Gui/Quarter/Basic.h>
+#include "Basic.h"
 
 namespace SIM { namespace Coin3D { namespace Quarter {
 
diff --git a/src/Gui/Quarter/QuarterWidgetP.cpp b/src/Gui/Quarter/QuarterWidgetP.cpp
index 8c5a84c84f..37547504c4 100644
--- a/src/Gui/Quarter/QuarterWidgetP.cpp
+++ b/src/Gui/Quarter/QuarterWidgetP.cpp
@@ -30,34 +30,31 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include "QuarterWidgetP.h"
-#include <Quarter/QuarterWidget.h>
-#include <Quarter/eventhandlers/EventFilter.h>
-
 #ifdef _MSC_VER
 #pragma warning(disable : 4267)
 #endif
 
 #include <QApplication>
-#include <QtGui/QCursor>
+#include <QCursor>
 #include <QMenu>
-#include <QtCore/QMap>
 
-#include <Inventor/nodes/SoCamera.h>
-#include <Inventor/nodes/SoNode.h>
+#include <Inventor/SoEventManager.h>
 #include <Inventor/actions/SoSearchAction.h>
 #include <Inventor/elements/SoGLCacheContextElement.h>
 #include <Inventor/lists/SbList.h>
-#include <Inventor/SoEventManager.h>
-#include <Inventor/scxml/SoScXMLStateMachine.h>
 #include <Inventor/misc/SoContextHandler.h>
+#include <Inventor/nodes/SoCamera.h>
+#include <Inventor/nodes/SoNode.h>
+#include <Inventor/scxml/SoScXMLStateMachine.h>
 #include <Inventor/C/glue/gl.h>
 
-#include "NativeEvent.h"
+#include "QuarterWidgetP.h"
 #include "ContextMenu.h"
+#include "NativeEvent.h"
 #include "QuarterP.h"
+#include "QuarterWidget.h"
+#include "eventhandlers/EventFilter.h"
 
-#include <cstdlib>
 
 using namespace SIM::Coin3D::Quarter;
 
diff --git a/src/Gui/Quarter/SensorManager.h b/src/Gui/Quarter/SensorManager.h
index 6628ba9e3a..4b8043b3a8 100644
--- a/src/Gui/Quarter/SensorManager.h
+++ b/src/Gui/Quarter/SensorManager.h
@@ -33,7 +33,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class QTimer;
 
diff --git a/src/Gui/Quarter/SignalThread.h b/src/Gui/Quarter/SignalThread.h
index 718383991b..2b350c7719 100644
--- a/src/Gui/Quarter/SignalThread.h
+++ b/src/Gui/Quarter/SignalThread.h
@@ -33,9 +33,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include <QtCore/QThread>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QMutex>
+#include <QMutex>
+#include <QThread>
+#include <QWaitCondition>
+
 
 class SoQtP;
 
diff --git a/src/Gui/Quarter/SoQTQuarterAdaptor.cpp b/src/Gui/Quarter/SoQTQuarterAdaptor.cpp
index 9d787b3694..4f24e2d70a 100644
--- a/src/Gui/Quarter/SoQTQuarterAdaptor.cpp
+++ b/src/Gui/Quarter/SoQTQuarterAdaptor.cpp
@@ -19,20 +19,19 @@
  */
 
 #include "PreCompiled.h"
-#include "SoQTQuarterAdaptor.h"
+
 #include <Base/Console.h>
-#include <Inventor/nodes/SoPerspectiveCamera.h>
-#include <Inventor/nodes/SoOrthographicCamera.h>
-#include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoLocateHighlight.h>
-#include <Inventor/SoEventManager.h>
-#include <Inventor/actions/SoSearchAction.h>
-#include <Inventor/actions/SoRayPickAction.h>
-#include <Inventor/actions/SoGetBoundingBoxAction.h>
-#include <Inventor/actions/SoHandleEventAction.h>
-#include <Inventor/SoPickedPoint.h>
 #include <Inventor/SbLine.h>
 #include <Inventor/SbPlane.h>
+#include <Inventor/SoEventManager.h>
+#include <Inventor/SoPickedPoint.h>
+#include <Inventor/actions/SoHandleEventAction.h>
+#include <Inventor/actions/SoRayPickAction.h>
+#include <Inventor/actions/SoSearchAction.h>
+#include <Inventor/nodes/SoLocateHighlight.h>
+#include <Inventor/nodes/SoOrthographicCamera.h>
+#include <Inventor/nodes/SoPerspectiveCamera.h>
+#include <Inventor/nodes/SoSeparator.h>
 
 #if !defined(FC_OS_MACOSX)
 # include <GL/gl.h>
@@ -40,6 +39,9 @@
 # include <GL/glext.h>
 #endif
 
+#include "SoQTQuarterAdaptor.h"
+
+
 static unsigned char fps2dfont[][12] = {
     {  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }, //
     {  0,  0, 12, 12,  0,  8, 12, 12, 12, 12, 12,  0 }, // !
diff --git a/src/Gui/Quarter/SpaceNavigatorDevice.cpp b/src/Gui/Quarter/SpaceNavigatorDevice.cpp
index 5726845439..38c85f0390 100644
--- a/src/Gui/Quarter/SpaceNavigatorDevice.cpp
+++ b/src/Gui/Quarter/SpaceNavigatorDevice.cpp
@@ -34,24 +34,20 @@
 #pragma warning(disable : 4267)
 #endif
 
-#include <Quarter/devices/SpaceNavigatorDevice.h>
-
-#include <QApplication>
+#include <QEvent>
 #include <QWidget>
-#include <QtCore/QEvent>
 
 #include <Inventor/events/SoEvent.h>
 #include <Inventor/events/SoMotion3Event.h>
 #include <Inventor/events/SoSpaceballButtonEvent.h>
 
-#include "NativeEvent.h"
-
 #ifdef HAVE_SPACENAV_LIB
 #include <QX11Info>
 #include <spnav.h>
-#endif //HAVE_SPACENAV_LIB
+#endif
 
-#include <cstdio>
+#include "NativeEvent.h"
+#include "devices/SpaceNavigatorDevice.h"
 
 
 namespace SIM { namespace Coin3D { namespace Quarter {