Merge branch 'master' into omu/workloadmanager

[modules/yacs.git] / src / genericgui / EditionScript.hxx

diff --git a/src/genericgui/EditionScript.hxx b/src/genericgui/EditionScript.hxx
old mode 100755 (executable)
new mode 100644 (file)
index 0055f28..0827623
--- a/src/genericgui/EditionScript.hxx
+++ b/src/genericgui/EditionScript.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2020  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,13 +22,14 @@
 
 #include "yacsconfig.h"
 #include "EditionElementaryNode.hxx"
+#include "FormContainerDecorator.hxx"
 #include "FormComponent.hxx"
 #include <QRadioButton>
 
 class FormContainer;
 
-#if HAS_QSCI4>0
-class QsciScintilla;
+#ifdef HAS_PYEDITOR
+class PyEditor_Editor;
 #endif
 
 namespace YACS
@@ -60,8 +61,8 @@ namespace YACS
     protected:
       SubjectInlineNode *_subInlineNode;
 
-#if HAS_QSCI4>0
-      QsciScintilla* _sci;
+#ifdef HAS_PYEDITOR
+      PyEditor_Editor* _sci;
 #else
       QTextEdit* _sci;
 #endif
@@ -75,7 +76,7 @@ namespace YACS
       ComboBox* cb_container;
       QRadioButton* radiolocal;
       QRadioButton* radioremote;
-      FormContainer* formcontainer;
+      FormContainerDecorator* formcontainer;
     };
   }
 }