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=2477837ad662608b50231de6bee741c6be1b34ec;hpb=2e750f9ded92337bc3c44e9d7388180974cc4a43;p=modules%2Fgui.git

diff --git a/src/SUITApp/SUITApp_Application.cxx b/src/SUITApp/SUITApp_Application.cxx
index 2477837ad..f15906995 100644
--- a/src/SUITApp/SUITApp_Application.cxx
+++ b/src/SUITApp/SUITApp_Application.cxx
@@ -1,10 +1,33 @@
+// 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
+//
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 #include "SUITApp_Application.h"
 
-#include "SUIT_MessageBox.h"
-#include "SUIT_ExceptionHandler.h"
+#include <SUIT_Tools.h>
+#include <SUIT_ExceptionHandler.h>
+
+#include <Qtx.h>
 
-#include <qdir.h>
-#include <qfileinfo.h>
+#include <QDir>
 
 #ifdef WIN32
 #include <windows.h>
@@ -13,40 +36,57 @@
 #include <unistd.h>
 #endif
 
+/*!
+  Constructor
+*/
 SUITApp_Application::SUITApp_Application( int& argc, char** argv, SUIT_ExceptionHandler* hand )
-: QApplication( argc, argv ),
+// 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
 myExceptHandler( hand )
 {
-  QString path = QFileInfo( argv[0] ).dirPath() + 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 )
-: QApplication( argc, argv, type ),
+  : QApplication( argc, argv, type ),
 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
+  \param e - event
+  \param receiver - receiver
+*/
 bool SUITApp_Application::notify( QObject* receiver, QEvent* e )
 {
   return myExceptHandler ? myExceptHandler->handle( receiver, e ) :
                            QApplication::notify( receiver, e );
 }
 
+/*!
+  Changes exception handler
+  \param hand - new handler
+*/
 void SUITApp_Application::setHandler( SUIT_ExceptionHandler* hand )
 {
-	myExceptHandler = hand;
+  myExceptHandler = hand;
 }
 
+/*!
+  \return exception handler
+*/
 SUIT_ExceptionHandler* SUITApp_Application::handler() const
 {
   return myExceptHandler;