Update copyrights

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

diff --git a/src/SUITApp/SUITApp_Application.cxx b/src/SUITApp/SUITApp_Application.cxx
index c210ae2c81b678d965fcb499b2c8ed01757be650..6e89be1fefccba71e3d36adeffc502f6f504a095 100644 (file)
--- a/src/SUITApp/SUITApp_Application.cxx
+++ b/src/SUITApp/SUITApp_Application.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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
@@ -28,7 +28,6 @@
 #include <Qtx.h>
 
 #include <QDir>
-#include <QTranslator>
 
 #ifdef WIN32
 #include <windows.h>
@@ -41,45 +40,29 @@
   Constructor
 */
 SUITApp_Application::SUITApp_Application( int& argc, char** argv, SUIT_ExceptionHandler* hand )
-#ifdef ENABLE_TESTRECORDER
-  : TestApplication( argc, argv ),
-#else
-#ifndef WIN32
+// TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5
+#if !defined(WIN32) && !defined(__APPLE__) && (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
   // san: Opening an X display and choosing a visual most suitable for 3D visualization
   // in order to make SALOME viewers work with non-native X servers
   : QApplication( (Display*)Qtx::getDisplay(), argc, argv, Qtx::getVisual() ),
 #else
   : QApplication( argc, argv ), 
 #endif
-#endif
 myExceptHandler( hand )
 {
-  QString path = SUIT_Tools::dir( argv[0] ) + QDir::separator() + "../../resources";
-  path = QDir::convertSeparators( QDir( path ).canonicalPath() );
-
-  QTranslator* strTbl = new QTranslator( 0 );
-  if ( strTbl->load( "SUITApp_msg_en.po", path  ) )
-    installTranslator( strTbl );
-  else
-    delete strTbl;
 }
 
 /*!
   Constructor
 */
+// 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::SUITApp_Application( int& argc, char** argv, Type type, SUIT_ExceptionHandler* hand )
-#ifdef ENABLE_TESTRECORDER
-  : TestApplication( argc, argv ),
-#else
   : QApplication( argc, argv, type ),
-#endif
 myExceptHandler( hand )
 {
-    QTranslator* strTbl = new QTranslator( 0 );
-    strTbl->load( "resources\\SUITApp_msg_en.po" );
-    installTranslator( strTbl );
 }
-
+#endif
 /*!
   Sends event to receiver
   \return the value that is returned from the receiver's event handler
@@ -89,11 +72,7 @@ myExceptHandler( hand )
 bool SUITApp_Application::notify( QObject* receiver, QEvent* e )
 {
   return myExceptHandler ? myExceptHandler->handle( receiver, e ) :
-#ifdef ENABLE_TESTRECORDER
-                           TestApplication::notify( receiver, e );
-#else
                            QApplication::notify( receiver, e );
-#endif
 }
 
 /*!
@@ -102,7 +81,7 @@ bool SUITApp_Application::notify( QObject* receiver, QEvent* e )
 */
 void SUITApp_Application::setHandler( SUIT_ExceptionHandler* hand )
 {
-        myExceptHandler = hand;
+  myExceptHandler = hand;
 }
 
 /*!