Merge branch 'V9_2_2_BR'

[modules/jobmanager.git] / src / salomegui / BL_SalomeGui.hxx

diff --git a/src/salomegui/BL_SalomeGui.hxx b/src/salomegui/BL_SalomeGui.hxx
index a1f24af02c791681913d1b92586db5efbf190777..41a5cf9940cf9df9436818b793bceb7b930e2078 100644 (file)
--- a/src/salomegui/BL_SalomeGui.hxx
+++ b/src/salomegui/BL_SalomeGui.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2009-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2019  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// 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
@@ -41,7 +41,7 @@
 
 namespace BL
 {
-  class SalomeGui: virtual public MainWindows_SALOME
+  class SalomeGui: public MainWindows_SALOME
   {
     Q_OBJECT