Mercurial Repositories > eric / file diff

--- a/eric6/E5Gui/E5MapWidget.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/E5Gui/E5MapWidget.py	Tue Mar 02 17:17:09 2021 +0100
@@ -23,7 +23,7 @@
         @param parent reference to the parent widget (QWidget)
         """
         super(E5MapWidget, self).__init__(parent)
-        self.setAttribute(Qt.WA_OpaquePaintEvent)
+        self.setAttribute(Qt.WidgetAttribute.WA_OpaquePaintEvent)
         
         self.__width = 14
         self.__lineBorder = 1
@@ -45,10 +45,10 @@
         """
         if self.__backgroundColor.toHsv().value() < 128:
             # dark background, use white slider
-            self.__sliderColor = Qt.white
+            self.__sliderColor = Qt.GlobalColor.white
         else:
             # light background, use black slider
-            self.__sliderColor = Qt.black
+            self.__sliderColor = Qt.GlobalColor.black
     
     def __updateMasterViewportWidth(self):
         """
@@ -71,7 +71,8 @@
         @param master map master widget (QAbstractScrollArea)
         """
         self._master = master
-        self._master.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOn)
+        self._master.setVerticalScrollBarPolicy(
+            Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
         self._master.verticalScrollBar().valueChanged.connect(self.update)
         self._master.verticalScrollBar().rangeChanged.connect(self.update)
         self.__updateMasterViewportWidth()
@@ -203,7 +204,7 @@
         if self._master:
             penColor = self.__sliderColor
             painter.setPen(penColor)
-            brushColor = Qt.transparent
+            brushColor = Qt.GlobalColor.transparent
             painter.setBrush(QBrush(brushColor))
             painter.drawRect(self.__generateSliderRange(
                 self._master.verticalScrollBar()))
@@ -224,7 +225,7 @@
         
         @param event reference to the mouse event (QMouseEvent)
         """
-        if event.button() == Qt.LeftButton and self._master:
+        if event.button() == Qt.MouseButton.LeftButton and self._master:
             vsb = self._master.verticalScrollBar()
             value = self.position2Value(event.pos().y() - 1)
             vsb.setValue(value - 0.5 * vsb.pageStep())  # center on page
@@ -236,7 +237,7 @@
         
         @param event reference to the mouse event (QMouseEvent)
         """
-        if event.buttons() & Qt.LeftButton and self._master:
+        if event.buttons() & Qt.MouseButton.LeftButton and self._master:
             vsb = self._master.verticalScrollBar()
             value = self.position2Value(event.pos().y() - 1)
             vsb.setValue(value - 0.5 * vsb.pageStep())  # center on page
@@ -250,7 +251,7 @@
         isVertical = event.angleDelta().x() == 0
         if (
             self._master and
-            event.modifiers() == Qt.NoModifier and
+            event.modifiers() == Qt.KeyboardModifier.NoModifier and
             isVertical
         ):
             QCoreApplication.sendEvent(self._master.verticalScrollBar(), event)