Mercurial Repositories > eric / file diff

--- a/eric7/ViewManager/ViewManager.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/ViewManager/ViewManager.py	Sun May 16 20:07:24 2021 +0200
@@ -11,15 +11,15 @@
 import os
 import contextlib
 
-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     pyqtSignal, pyqtSlot, Qt, QSignalMapper, QTimer, QFileInfo, QPoint,
     QCoreApplication
 )
-from PyQt5.QtGui import QKeySequence, QPixmap
-from PyQt5.QtWidgets import (
+from PyQt6.QtGui import QKeySequence, QPixmap
+from PyQt6.QtWidgets import (
     QToolBar, QDialog, QApplication, QMenu, QWidget
 )
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.Qsci import QsciScintilla
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox
@@ -1447,11 +1447,7 @@
         ####################################################################
         
         self.esm = QSignalMapper(self)
-        try:
-            self.alignMapper.mappedInt.connect(self.__editorCommand)
-        except AttributeError:
-            # pre Qt 5.15
-            self.esm.mapped[int].connect(self.__editorCommand)
+        self.esm.mappedInt.connect(self.__editorCommand)
         
         self.editorActGrp = createActionGroup(self.editActGrp)
         
@@ -3315,8 +3311,9 @@
         tb.addAction(self.gotoLastEditAct)
         
         tb.setAllowedAreas(
-            Qt.ToolBarAreas(Qt.ToolBarArea.TopToolBarArea |
-                            Qt.ToolBarArea.BottomToolBarArea))
+            Qt.ToolBarArea.TopToolBarArea |
+            Qt.ToolBarArea.BottomToolBarArea
+        )
         
         toolbarManager.addToolBar(tb, tb.windowTitle())
         toolbarManager.addAction(self.gotoAct, tb.windowTitle())