Mercurial Repositories > eric / file diff

--- a/eric6/UI/LogView.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/UI/LogView.py	Tue Mar 02 17:17:09 2021 +0100
@@ -41,7 +41,7 @@
         from .SearchWidget import SearchWidget
         self.__searchWidget = SearchWidget(self.__logViewer, self)
         self.__searchWidget.setSizePolicy(
-            QSizePolicy.Fixed, QSizePolicy.Preferred)
+            QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
         self.__searchWidget.hide()
         
         self.__layout = QHBoxLayout(self)
@@ -106,7 +106,7 @@
         """
         super(LogViewerEdit, self).__init__(parent)
         self.setAcceptRichText(False)
-        self.setLineWrapMode(QTextEdit.NoWrap)
+        self.setLineWrapMode(QTextEdit.LineWrapMode.NoWrap)
         self.setReadOnly(True)
         
         self.__mainWindow = parent
@@ -123,7 +123,7 @@
         self.__menu.addSeparator()
         self.__menu.addAction(self.tr("Configure..."), self.__configure)
         
-        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         self.customContextMenuRequested.connect(self.__handleShowContextMenu)
         
         self.cNormalFormat = self.currentCharFormat()
@@ -152,7 +152,7 @@
         @param isErrorMessage flag indicating to insert error text (boolean)
         """
         tc = self.textCursor()
-        tc.movePosition(QTextCursor.End)
+        tc.movePosition(QTextCursor.MoveOperation.End)
         self.setTextCursor(tc)
         if isErrorMessage:
             self.setCurrentCharFormat(self.cErrorFormat)
@@ -253,15 +253,15 @@
         self.__lastSearch = (txt, caseSensitive, wholeWord, regexp)
         flags = QTextDocument.FindFlags()
         if caseSensitive:
-            flags |= QTextDocument.FindCaseSensitively
+            flags |= QTextDocument.FindFlag.FindCaseSensitively
         if wholeWord:
-            flags |= QTextDocument.FindWholeWords
+            flags |= QTextDocument.FindFlag.FindWholeWords
         if regexp:
             ok = self.find(QRegularExpression(
                 txt,
-                QRegularExpression.NoPatternOption
+                QRegularExpression.PatternOption.NoPatternOption
                 if caseSensitive
-                else QRegularExpression.CaseInsensitiveOption),
+                else QRegularExpression.PatternOption.CaseInsensitiveOption),
                 flags
             )
         else:
@@ -284,17 +284,17 @@
         @type bool
         """
         self.__lastSearch = (txt, caseSensitive, wholeWord, regexp)
-        flags = QTextDocument.FindFlags(QTextDocument.FindBackward)
+        flags = QTextDocument.FindFlags(QTextDocument.FindFlag.FindBackward)
         if caseSensitive:
-            flags |= QTextDocument.FindCaseSensitively
+            flags |= QTextDocument.FindFlag.FindCaseSensitively
         if wholeWord:
-            flags |= QTextDocument.FindWholeWords
+            flags |= QTextDocument.FindFlag.FindWholeWords
         if regexp:
             ok = self.find(QRegularExpression(
                 txt,
-                QRegularExpression.NoPatternOption
+                QRegularExpression.PatternOption.NoPatternOption
                 if caseSensitive
-                else QRegularExpression.CaseInsensitiveOption),
+                else QRegularExpression.PatternOption.CaseInsensitiveOption),
                 flags
             )
         else:
@@ -307,26 +307,29 @@
         
         @param evt key press event (QKeyEvent)
         """
-        if evt.modifiers() == Qt.ControlModifier:
-            if evt.key() == Qt.Key_F:
+        if evt.modifiers() == Qt.KeyboardModifier.ControlModifier:
+            if evt.key() == Qt.Key.Key_F:
                 self.__find()
                 evt.accept()
                 return
-            elif evt.key() == Qt.Key_C:
+            elif evt.key() == Qt.Key.Key_C:
                 self.copy()
                 evt.accept()
                 return
-            elif evt.key() == Qt.Key_A:
+            elif evt.key() == Qt.Key.Key_A:
                 self.selectAll()
                 evt.accept()
                 return
-        elif evt.modifiers() == Qt.NoModifier:
-            if evt.key() == Qt.Key_F3 and self.__lastSearch:
+        elif evt.modifiers() == Qt.KeyboardModifier.NoModifier:
+            if evt.key() == Qt.Key.Key_F3 and self.__lastSearch:
                 self.searchNext(*self.__lastSearch)
                 evt.accept()
                 return
-        elif evt.modifiers() == Qt.ShiftModifier and self.__lastSearch:
-            if evt.key() == Qt.Key_F3 and self.__lastSearch:
+        elif (
+            evt.modifiers() == Qt.KeyboardModifier.ShiftModifier and
+            self.__lastSearch
+        ):
+            if evt.key() == Qt.Key.Key_F3 and self.__lastSearch:
                 self.searchPrev(*self.__lastSearch)
                 evt.accept()
                 return