-// Copyright (C) 2007-2008 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
+// 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.
+// 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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#include "SUITApp_Application.h"
#include <SUIT_Tools.h>
#include <SUIT_ExceptionHandler.h>
+#include <Qtx.h>
+
#include <QDir>
-#include <QTranslator>
#ifdef WIN32
#include <windows.h>
Constructor
*/
SUITApp_Application::SUITApp_Application( int& argc, char** argv, SUIT_ExceptionHandler* hand )
-#ifdef ENABLE_TESTRECORDER
- : TestApplication( 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 ),
+ : QApplication( argc, argv ),
#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
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
}
/*!
*/
void SUITApp_Application::setHandler( SUIT_ExceptionHandler* hand )
{
- myExceptHandler = hand;
+ myExceptHandler = hand;
}
/*!