X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSUITApp%2FSUITApp_Application.cxx;h=f1590699562b1e2bd2c6740e517b1aeacc903116;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=44d62b2f0410a942706d1e0dc80022af15067d76;hpb=bb8609caf7881d966fbb88dec0a7822736da93f5;p=modules%2Fgui.git

diff --git a/src/SUITApp/SUITApp_Application.cxx b/src/SUITApp/SUITApp_Application.cxx
index 44d62b2f0..f15906995 100644
--- a/src/SUITApp/SUITApp_Application.cxx
+++ b/src/SUITApp/SUITApp_Application.cxx
@@ -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
@@ -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;
 }
 
 /*!