Removing QT4 support (following EFICAS), corrections

diff --git a/src/daEficas/configuration_ADAO.py b/src/daEficas/configuration_ADAO.py
index c24669a3567fd0a704ff0552e54186490d0db0fb..7d6862db2bec09b2635ab7618b528eb900ea1489 100644 (file)
--- a/src/daEficas/configuration_ADAO.py
+++ b/src/daEficas/configuration_ADAO.py
@@ -29,11 +29,7 @@
 # print "passage dans la surcharge de configuration pour Adao"
 import os, sys, string, types, re
 import traceback
-from daUtils.qtversion import useQT5
-if useQT5:
-    from PyQt5.QtGui  import *
-else:
-    from PyQt4.QtGui  import *
+from PyQt5.QtGui  import *
 
 # Modules Eficas
 from InterfaceQT4 import configuration

diff --git a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
index 52bae9429a1e1371c1cfaa9276b4d52a419bef02..3ae14f12acfa54dd702f0cbe206ee25ec4e3e929 100644 (file)
--- a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
+++ b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py
@@ -26,14 +26,8 @@ import os
 
 import eficasSalome               # Import from EFICAS_SRC
 from InterfaceQT4 import qtEficas # Import from Eficas
-from daUtils.qtversion import useQT5
-if useQT5:
-    from PyQt5.QtGui  import *        # Import from PyQT
-    from PyQt5.QtCore import *        # Import from PyQT
-else:
-    from PyQt4.QtGui  import *        # Import from PyQT
-    from PyQt4.QtCore import *        # Import from PyQT
-    # from PyQt5.QtAssistant import *   # Import from PyQT
+from PyQt5.QtGui  import *        # Import from PyQT
+from PyQt5.QtCore import *        # Import from PyQT
 
 from daUtils.adaoEficasEvent import *
 from daUtils.adaoLogger import *
@@ -59,14 +53,10 @@ class AdaoEficasWrapper(eficasSalome.MyEficas):
       import salome ; salome.salome_init()
 
       eficasSalome.MyEficas.__init__(self, None, code="ADAO", module="ADAO")
-      if useQT5:
-          self.viewmanager.myQtab.currentChanged.connect(self.tabChanged)
-      else:
-          self.connect(self.viewmanager.myQtab, SIGNAL('currentChanged(int)'), self.tabChanged)
+      self.viewmanager.myQtab.currentChanged.connect(self.tabChanged)
       # self.menubar.hide()
       # self.toolBar.hide()
-      # if useQT5:
-      #     self.frameEntete.close()
+      # self.frameEntete.close()
       self.closeEntete()
 
     def addJdcInSalome(self, jdcPath):

diff --git a/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py b/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py
index 77d0a0f25d88ec690b473966dcb7bbe149eeac10..1cd951a8c7262bdd2aba089c3eb92d9c46bdef13 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py
+++ b/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py
@@ -22,14 +22,9 @@
 
 __author__="aribes/gboulant"
 
-from daUtils.qtversion import useQT5
-if useQT5:
-    from PyQt5.QtGui import *
-    from PyQt5.QtCore import *
-    from PyQt5.QtWidgets import QApplication
-else:
-    from PyQt4.QtGui import *
-    from PyQt4.QtCore import *
+from PyQt5.QtGui import *
+from PyQt5.QtCore import *
+from PyQt5.QtWidgets import QApplication
 
 import SalomePyQt
 sgPyQt = SalomePyQt.SalomePyQt()

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py
index 6a4abf4925c7d305b6702bcce361b75711099080..76ff31f8f0f7e849703715ba652bd9b318bc41f4 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py
@@ -28,13 +28,8 @@ import SalomePyQt
 __sgPyQt = SalomePyQt.SalomePyQt()
 
 from . import adaoModuleHelper
-from daUtils.qtversion import useQT5
-if useQT5:
-    from PyQt5 import QtGui, QtCore
-    from PyQt5.QtWidgets import QApplication, QMessageBox
-else:
-    from PyQt4 import QtGui, QtCore
-    from PyQt4.QtGui import QApplication, QMessageBox
+from PyQt5 import QtGui, QtCore
+from PyQt5.QtWidgets import QApplication, QMessageBox
 
 def waitCursor():
     QtGui.QApplication.setOverrideCursor(QtGui.QCursor(QtCore.Qt.WaitCursor))

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
index 4210c9e3521960c918d6e8e331d34bed2fddeedf..ebebae392997023f45328514c835895622abc6a9 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
@@ -28,15 +28,8 @@ in the GUI part of the module.
 __author__ = "aribes/gboulant"
 
 import traceback
-from daUtils.qtversion import useQT5
-if useQT5:
-    from PyQt5.QtCore import QObject
-    from PyQt5.QtWidgets import QScrollArea
-else:
-    from PyQt4.QtCore import QObject
-    from PyQt4.QtCore import *        # Import from PyQT
-    from PyQt4 import QtCore
-    from PyQt4.QtGui import QScrollArea
+from PyQt5.QtCore import QObject
+from PyQt5.QtWidgets import QScrollArea
 import SalomePyQt
 sgPyQt = SalomePyQt.SalomePyQt()
 
@@ -121,10 +114,7 @@ class AdaoCaseManager(EficasObserver):
 
     # On s'abonne au gestionnaire de selection
     self.selection_manager = sgPyQt.getSelection()
-    if useQT5:
-        self.selection_manager.currentSelectionChanged.connect(self.currentSelectionChanged)
-    else:
-        QtCore.QObject.connect(self.selection_manager, QtCore.SIGNAL('currentSelectionChanged()'), self.currentSelectionChanged)
+    self.selection_manager.currentSelectionChanged.connect(self.currentSelectionChanged)
 
 ######
 #

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py b/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py
index 54a6dbf00590d93aaeadc13c27b1e2d8cf41040d..97b7caf6418a7b0f0ed619cce69d901d45b10615 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py
@@ -79,11 +79,7 @@ def componentName():
 # _MEM_ we use here the tr() translation methode to manage constant parameters
 # in the application. We could have specified instead constant values directly
 # in the code below. It's a matter of convenience.
-from daUtils.qtversion import useQT5
-if useQT5:
-    from PyQt5.QtCore import QObject
-else:
-    from PyQt4.QtCore import QObject
+from PyQt5.QtCore import QObject
 QObjectTR=QObject()
 
 def componentUserName():

diff --git a/src/daSalome/daGUI/daUtils/Makefile.am b/src/daSalome/daGUI/daUtils/Makefile.am
index 042871359b001fcb45f5bef2a08e7b80cc2888c4..4607ba8493d54e09b7da40d6f1b65d8ebb7c7a39 100644 (file)
--- a/src/daSalome/daGUI/daUtils/Makefile.am
+++ b/src/daSalome/daGUI/daUtils/Makefile.am
@@ -27,6 +27,5 @@ mypkgpython_PYTHON = \
                     __init__.py \
                     adaoEficasEvent.py \
                     adaoLogger.py \
-                    qtversion.py \
                     enumerate.py
 

diff --git a/src/daSalome/daGUI/daUtils/qtversion.py b/src/daSalome/daGUI/daUtils/qtversion.py
deleted file mode 100644 (file)
index efa1818..0000000
--- a/src/daSalome/daGUI/daUtils/qtversion.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#-*- coding: utf-8 -*-
-#
-# Copyright (C) 2008-2017 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.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
-
-import eficasSalome               # Import from EFICAS_SRC
-from InterfaceQT4.determine import monEnvQT5
-
-useQT5 = bool(monEnvQT5)