Upgrade to paraview 5.4

[modules/gui.git] / src / SUITApp / SUITApp_Application.h

diff --git a/src/SUITApp/SUITApp_Application.h b/src/SUITApp/SUITApp_Application.h
index 562673a06c67f3ef330770c970ddb37b81c7f567..2941f9cdc1552a191ed04437141830e0512923be 100644 (file)
--- a/src/SUITApp/SUITApp_Application.h
+++ b/src/SUITApp/SUITApp_Application.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,15 +23,11 @@
 #ifndef SUITAPP_APPLICATION_H
 #define SUITAPP_APPLICATION_H
 
-#ifdef ENABLE_TESTRECORDER
-  #include <TestApplication.h>
-#else
-  #include <QApplication>
-#endif
+#include <QApplication>
 
 class SUIT_ExceptionHandler;
 
-#ifdef WNT
+#ifdef WIN32
 #  if defined SUITAPP_EXPORTS || defined SUITApp_EXPORTS
 #    define SUITAPP_EXPORT __declspec(dllexport)
 #  else
@@ -41,22 +37,20 @@ class SUIT_ExceptionHandler;
 #  define SUITAPP_EXPORT
 #endif
 
-#ifdef ENABLE_TESTRECORDER
-  class SUITAPP_EXPORT SUITApp_Application : public TestApplication
-#else
-  class SUITAPP_EXPORT SUITApp_Application : public QApplication
-#endif
+class SUITAPP_EXPORT SUITApp_Application : public QApplication
 {
   Q_OBJECT
 
 public:
-  SUITApp_Application( int& argc, char** argv, SUIT_ExceptionHandler* = 0 );
-  SUITApp_Application( int& argc, char** argv, Type type, SUIT_ExceptionHandler* = 0 );
-
+  SUITApp_Application( int&, char**, SUIT_ExceptionHandler* = 0 );
+// TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+  SUITApp_Application( int&, char**, Type, SUIT_ExceptionHandler* = 0 );
+#endif
   virtual bool notify( QObject* receiver, QEvent* e );
 
-        SUIT_ExceptionHandler* handler() const;
-        void                   setHandler( SUIT_ExceptionHandler* );
+  SUIT_ExceptionHandler* handler() const;
+  void                   setHandler( SUIT_ExceptionHandler* );
 
 private:
   SUIT_ExceptionHandler* myExceptHandler;