[Gui] Quarter: remove few unused includes

- mainly sorting
2022-03-06 21:47:17 +01:00
parent 8eea478832
commit f9b2489ae2
13 changed files with 59 additions and 60 deletions
--- 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 {

--- 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)
--- 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;

 /*!
--- 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
--- 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;

--- 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>
--- 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;
--- 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 {

--- 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;

--- 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;

--- 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;

--- 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 }, // !
--- 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 {