From: vsr Date: Wed, 9 Mar 2016 15:14:50 +0000 (+0300) Subject: Qt 5 compatibility X-Git-Tag: V8_1_0a1~18 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9f61473bdfba3f6fde994c0fca87b751803449e7;p=modules%2Fmed.git Qt 5 compatibility --- diff --git a/src/MEDCalc/gui/PresentationController.hxx b/src/MEDCalc/gui/PresentationController.hxx index 3d8ada96b..53c0272ad 100644 --- a/src/MEDCalc/gui/PresentationController.hxx +++ b/src/MEDCalc/gui/PresentationController.hxx @@ -20,8 +20,7 @@ #ifndef PRESENTATION_CONTROLLER_HXX #define PRESENTATION_CONTROLLER_HXX -#include -#include +#include #include "MEDCALCGUI.hxx" #include "MEDEventListener_i.hxx" @@ -47,6 +46,7 @@ typedef struct { } PresentationEvent; class MEDModule; +class QDockWidget; class MEDCALCGUI_EXPORT PresentationController : public QObject { Q_OBJECT diff --git a/src/MEDCalc/gui/ProcessingController.cxx b/src/MEDCalc/gui/ProcessingController.cxx index e2a257224..35cdb7395 100644 --- a/src/MEDCalc/gui/ProcessingController.cxx +++ b/src/MEDCalc/gui/ProcessingController.cxx @@ -25,6 +25,7 @@ #include "Basics_Utils.hxx" #include +#include ProcessingController::ProcessingController(MEDModule* salomeModule) { diff --git a/src/MEDCalc/gui/ProcessingController.hxx b/src/MEDCalc/gui/ProcessingController.hxx index f3bffe195..0dd9478c2 100644 --- a/src/MEDCalc/gui/ProcessingController.hxx +++ b/src/MEDCalc/gui/ProcessingController.hxx @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(MEDDataManager) -#include +#include #include #include