Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
SUITApp
/
SUITApp_Application.h
diff --git
a/src/SUITApp/SUITApp_Application.h
b/src/SUITApp/SUITApp_Application.h
index f9507e8f94a87f0efe5d6b16aab34e14859d6dcd..2941f9cdc1552a191ed04437141830e0512923be 100644
(file)
--- a/
src/SUITApp/SUITApp_Application.h
+++ b/
src/SUITApp/SUITApp_Application.h
@@
-23,11
+23,7
@@
#ifndef SUITAPP_APPLICATION_H
#define SUITAPP_APPLICATION_H
#ifndef SUITAPP_APPLICATION_H
#define SUITAPP_APPLICATION_H
-#ifdef ENABLE_TESTRECORDER
- #include <TestApplication.h>
-#else
- #include <QApplication>
-#endif
+#include <QApplication>
class SUIT_ExceptionHandler;
class SUIT_ExceptionHandler;
@@
-41,24
+37,20
@@
class SUIT_ExceptionHandler;
# define SUITAPP_EXPORT
#endif
# 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:
{
Q_OBJECT
public:
- SUITApp_Application( int&
argc, char** argv
, 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)
// 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&
argc, char** argv, Type t
ype, SUIT_ExceptionHandler* = 0 );
+ SUITApp_Application( int&
, char**, T
ype, SUIT_ExceptionHandler* = 0 );
#endif
virtual bool notify( QObject* receiver, QEvent* e );
#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;
private:
SUIT_ExceptionHandler* myExceptHandler;