X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSUITApp%2FSUITApp_Application.h;h=2941f9cdc1552a191ed04437141830e0512923be;hb=dd427383559132dd5c0add8f0b1ab2f71d8514c3;hp=27b04dd3f4404ac38302c052979bd3578991aab2;hpb=cac0b4571c951b557e1956d4777cf1e5199637c3;p=modules%2Fgui.git diff --git a/src/SUITApp/SUITApp_Application.h b/src/SUITApp/SUITApp_Application.h index 27b04dd3f..2941f9cdc 100644 --- a/src/SUITApp/SUITApp_Application.h +++ b/src/SUITApp/SUITApp_Application.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 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 @@ -23,11 +23,7 @@ #ifndef SUITAPP_APPLICATION_H #define SUITAPP_APPLICATION_H -#ifdef ENABLE_TESTRECORDER - #include -#else - #include -#endif +#include class SUIT_ExceptionHandler; @@ -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;