Second integration of PV3D viewer:

[modules/gui.git] / src / SVTK / SVTK_RenderWindowInteractor.h

diff --git a/src/SVTK/SVTK_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h
index 521794f67f0a40a2fc4bd820269057240f509d8b..e1c47c828e3ab7d43845a422e8436ac9c59e6e3b 100644 (file)
--- a/src/SVTK/SVTK_RenderWindowInteractor.h
+++ b/src/SVTK/SVTK_RenderWindowInteractor.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -63,7 +63,7 @@ class SVTK_Renderer;
 */
 class SVTK_EXPORT QVTK_RenderWindowInteractor: public QWidget
 {
-  Q_OBJECT;
+  Q_OBJECT
 
  public:
   QVTK_RenderWindowInteractor(QWidget* theParent, 
@@ -122,16 +122,7 @@ class SVTK_EXPORT QVTK_RenderWindowInteractor: public QWidget
   virtual void focusOutEvent( QFocusEvent* );
 
   //! To handle native events (from such devices as SpaceMouse)
-// TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-#ifdef WIN32
-  virtual bool winEvent( MSG*, long* );
-#else
-  virtual bool x11Event( XEvent *e );
-#endif
-#else
   virtual bool nativeEvent( const QByteArray&, void*, long* );
-#endif
   vtkSmartPointer<vtkRenderWindow> myRenderWindow;
   vtkSmartPointer<vtkGenericRenderWindowInteractor> myDevice;
 };
@@ -148,7 +139,7 @@ class SVTK_EXPORT QVTK_RenderWindowInteractor: public QWidget
 */
 class SVTK_EXPORT SVTK_RenderWindowInteractor: public QVTK_RenderWindowInteractor
 {
-  Q_OBJECT;
+  Q_OBJECT
 
  public:
   SVTK_RenderWindowInteractor(QWidget* theParent,