Mercurial Repositories > eric / changeset

--- a/eric6/APIs/Python3/eric6.api	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/APIs/Python3/eric6.api	Sun Oct 11 17:56:02 2020 +0200
@@ -1211,6 +1211,9 @@
 eric6.E5Gui.E5ModelToolBar.E5ModelToolBar.setRootIndex?4(idx)
 eric6.E5Gui.E5ModelToolBar.E5ModelToolBar.showEvent?4(evt)
 eric6.E5Gui.E5ModelToolBar.E5ModelToolBar?1(title=None, parent=None)
+eric6.E5Gui.E5OverrideCursor.E5OverrideCursor?1(cursorShape=Qt.WaitCursor)
+eric6.E5Gui.E5OverrideCursor.E5OverrideCursorProcess?1(parent=None, cursorShape=Qt.WaitCursor)
+eric6.E5Gui.E5OverrideCursor.E5OverridenCursor?1()
 eric6.E5Gui.E5PassivePopup.DEFAULT_POPUP_TIME?7
 eric6.E5Gui.E5PassivePopup.DEFAULT_POPUP_TYPE?7
 eric6.E5Gui.E5PassivePopup.E5PassivePopup.Boxed?7
@@ -1712,6 +1715,7 @@
 eric6.E5Utilities.E5Cache.E5Cache.setMaximumCacheTime?4(time)
 eric6.E5Utilities.E5Cache.E5Cache.setSize?4(newSize)
 eric6.E5Utilities.E5Cache.E5Cache?1(size=100)
+eric6.E5Utilities.E5MutexLocker.E5MutexLocker?1(mutex)
 eric6.E5XML.Config.debuggerPropertiesFileFormatVersion?7
 eric6.E5XML.Config.dictionariesListFileFormatVersion?7
 eric6.E5XML.Config.highlightingStylesFileFormatVersion?7
@@ -3904,20 +3908,6 @@
 eric6.Plugins.PluginWizardQMessageBox.pyqtApi?7
 eric6.Plugins.PluginWizardQMessageBox.shortDescription?7
 eric6.Plugins.PluginWizardQMessageBox.version?7
-eric6.Plugins.PluginWizardQRegExp.QRegExpWizard.activate?4()
-eric6.Plugins.PluginWizardQRegExp.QRegExpWizard.deactivate?4()
-eric6.Plugins.PluginWizardQRegExp.QRegExpWizard?1(ui)
-eric6.Plugins.PluginWizardQRegExp.author?7
-eric6.Plugins.PluginWizardQRegExp.autoactivate?7
-eric6.Plugins.PluginWizardQRegExp.className?7
-eric6.Plugins.PluginWizardQRegExp.deactivateable?7
-eric6.Plugins.PluginWizardQRegExp.error?7
-eric6.Plugins.PluginWizardQRegExp.longDescription?7
-eric6.Plugins.PluginWizardQRegExp.name?7
-eric6.Plugins.PluginWizardQRegExp.packageName?7
-eric6.Plugins.PluginWizardQRegExp.pyqtApi?7
-eric6.Plugins.PluginWizardQRegExp.shortDescription?7
-eric6.Plugins.PluginWizardQRegExp.version?7
 eric6.Plugins.PluginWizardQRegularExpression.QRegularExpressionWizard.activate?4()
 eric6.Plugins.PluginWizardQRegularExpression.QRegularExpressionWizard.deactivate?4()
 eric6.Plugins.PluginWizardQRegularExpression.QRegularExpressionWizard?1(ui)
@@ -5993,49 +5983,6 @@
 eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.PyRegExpWizardRepeatDialog.on_lowerSpin_valueChanged?4(value)
 eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.PyRegExpWizardRepeatDialog.on_upperSpin_valueChanged?4(value)
 eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.PyRegExpWizardRepeatDialog?1(parent=None)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.QRegExpWizardCharactersDialog.RegExpMode?7
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.QRegExpWizardCharactersDialog.W3CMode?7
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.QRegExpWizardCharactersDialog.WildcardMode?7
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.QRegExpWizardCharactersDialog.getCharacters?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.QRegExpWizardCharactersDialog?1(mode=RegExpMode, parent=None)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardDialog.getCode?4(indLevel, indString)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardDialog?1(parent=None, fromEric=True)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.getCode?4(indLevel, indString)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_altnButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_anycharButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_beglineButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_buttonBox_clicked?4(button)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_charButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_copyButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_endlineButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_executeButton_clicked?4(startpos=0)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_groupButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_loadButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_neglookaheadButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_nextButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_nonGroupButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_nonwordboundButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_poslookaheadButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_regexpLineEdit_textChanged?4(txt)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_repeatButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_saveButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_syntaxCombo_currentIndexChanged?4(index)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_validateButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_w3cAltnButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_w3cAnycharButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_w3cCharButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_w3cGroupButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_w3cRepeatButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_wildcardAnycharButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_wildcardCharButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_wildcardRepeatButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_wordboundButton_clicked?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget?1(parent=None, fromEric=True)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWindow?1(parent=None)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.QRegExpWizardRepeatDialog.getRepeat?4()
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.QRegExpWizardRepeatDialog.on_lowerSpin_valueChanged?4(value)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.QRegExpWizardRepeatDialog.on_upperSpin_valueChanged?4(value)
-eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.QRegExpWizardRepeatDialog?1(parent=None)
 eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardCharactersDialog.QRegularExpressionWizardCharactersDialog.getCharacters?4()
 eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardCharactersDialog.QRegularExpressionWizardCharactersDialog?1(parent=None)
 eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardDialog.QRegularExpressionWizardDialog.accept?4()
@@ -8852,8 +8799,6 @@
 eric6.UI.DiffDialog.DiffDialog?1(parent=None)
 eric6.UI.DiffDialog.DiffWindow.eventFilter?4(obj, event)
 eric6.UI.DiffDialog.DiffWindow?1(parent=None)
-eric6.UI.DiffDialog.context_diff?4(a, b, fromfile='', tofile='', fromfiledate='', tofiledate='', n=3, lineterm='\n')
-eric6.UI.DiffDialog.unified_diff?4(a, b, fromfile='', tofile='', fromfiledate='', tofiledate='', n=3, lineterm='\n')
 eric6.UI.DiffHighlighter.DiffHighlighter.generateRules?4()
 eric6.UI.DiffHighlighter.DiffHighlighter?1(doc)
 eric6.UI.EmailDialog.EmailDialog.attachFile?4(fname, deleteFile)
@@ -9450,6 +9395,7 @@
 eric6.Utilities.relativePath?4(path, start)
 eric6.Utilities.relativeUniversalPath?4(path, start)
 eric6.Utilities.relpath?4(path, start=os.path.curdir)
+eric6.Utilities.rxIndex?4(rx, txt)
 eric6.Utilities.samefilepath?4(f1, f2)
 eric6.Utilities.samepath?4(f1, f2)
 eric6.Utilities.splitPath?4(name)
@@ -10495,7 +10441,7 @@
 eric6.WebBrowser.History.HistoryCompleter.HistoryCompletionModel.isValid?4()
 eric6.WebBrowser.History.HistoryCompleter.HistoryCompletionModel.lessThan?4(left, right)
 eric6.WebBrowser.History.HistoryCompleter.HistoryCompletionModel.searchString?4()
-eric6.WebBrowser.History.HistoryCompleter.HistoryCompletionModel.setSearchString?4(string)
+eric6.WebBrowser.History.HistoryCompleter.HistoryCompletionModel.setSearchString?4(sstring)
 eric6.WebBrowser.History.HistoryCompleter.HistoryCompletionModel.setValid?4(valid)
 eric6.WebBrowser.History.HistoryCompleter.HistoryCompletionModel?1(parent=None)
 eric6.WebBrowser.History.HistoryCompleter.HistoryCompletionView.resizeEvent?4(evt)

--- a/eric6/APIs/Python3/eric6.bas	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/APIs/Python3/eric6.bas	Sun Oct 11 17:56:02 2020 +0200
@@ -195,9 +195,13 @@
 E5MessageBoxWizardDialog QDialog Ui_E5MessageBoxWizardDialog
 E5ModelMenu QMenu
 E5ModelToolBar QToolBar
+E5MutexLocker contextlib.AbstractContextManager
 E5NetworkHeaderDetailsDialog QDialog Ui_E5NetworkHeaderDetailsDialog
 E5NetworkIcon QLabel
 E5NetworkProxyFactory QNetworkProxyFactory
+E5OverrideCursor contextlib.AbstractContextManager
+E5OverrideCursorProcess QProcess
+E5OverridenCursor contextlib.AbstractContextManager
 E5PassivePopup QFrame
 E5PasswordMeter QProgressBar
 E5PathPicker E5PathPickerBase
@@ -737,12 +741,6 @@
 PythonDisViewer QWidget Ui_PythonDisViewer
 PythonDisViewerModes enum.Enum
 PythonPage ConfigurationPageBase Ui_PythonPage
-QRegExpWizard QObject
-QRegExpWizardCharactersDialog QDialog Ui_QRegExpWizardCharactersDialog
-QRegExpWizardDialog QDialog
-QRegExpWizardRepeatDialog QDialog Ui_QRegExpWizardRepeatDialog
-QRegExpWizardWidget QWidget Ui_QRegExpWizardWidget
-QRegExpWizardWindow E5MainWindow
 QRegularExpressionWizard QObject
 QRegularExpressionWizardCharactersDialog QDialog Ui_QRegularExpressionWizardCharactersDialog
 QRegularExpressionWizardDialog QDialog

Binary file eric6/Documentation/Help/source.qch has changed

--- a/eric6/Documentation/Help/source.qhp	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Help/source.qhp	Sun Oct 11 17:56:02 2020 +0200
@@ -113,6 +113,7 @@
             <section title="eric6.E5Gui.E5MessageBox" ref="eric6.E5Gui.E5MessageBox.html" />
             <section title="eric6.E5Gui.E5ModelMenu" ref="eric6.E5Gui.E5ModelMenu.html" />
             <section title="eric6.E5Gui.E5ModelToolBar" ref="eric6.E5Gui.E5ModelToolBar.html" />
+            <section title="eric6.E5Gui.E5OverrideCursor" ref="eric6.E5Gui.E5OverrideCursor.html" />
             <section title="eric6.E5Gui.E5PassivePopup" ref="eric6.E5Gui.E5PassivePopup.html" />
             <section title="eric6.E5Gui.E5PasswordMeter" ref="eric6.E5Gui.E5PasswordMeter.html" />
             <section title="eric6.E5Gui.E5PathPicker" ref="eric6.E5Gui.E5PathPicker.html" />
@@ -162,6 +163,7 @@
           </section>
           <section title="eric6.E5Utilities" ref="index-eric6.E5Utilities.html">
             <section title="eric6.E5Utilities.E5Cache" ref="eric6.E5Utilities.E5Cache.html" />
+            <section title="eric6.E5Utilities.E5MutexLocker" ref="eric6.E5Utilities.E5MutexLocker.html" />
           </section>
           <section title="eric6.E5XML" ref="index-eric6.E5XML.html">
             <section title="eric6.E5XML.Config" ref="eric6.E5XML.Config.html" />
@@ -678,11 +680,6 @@
                 <section title="eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog" ref="eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.html" />
                 <section title="eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog" ref="eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.html" />
               </section>
-              <section title="eric6.Plugins.WizardPlugins.QRegExpWizard" ref="index-eric6.Plugins.WizardPlugins.QRegExpWizard.html">
-                <section title="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html" />
-                <section title="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html" />
-                <section title="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.html" />
-              </section>
               <section title="eric6.Plugins.WizardPlugins.QRegularExpressionWizard" ref="index-eric6.Plugins.WizardPlugins.QRegularExpressionWizard.html">
                 <section title="eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardCharactersDialog" ref="eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardCharactersDialog.html" />
                 <section title="eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardDialog" ref="eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardDialog.html" />
@@ -714,7 +711,6 @@
             <section title="eric6.Plugins.PluginWizardQFontDialog" ref="eric6.Plugins.PluginWizardQFontDialog.html" />
             <section title="eric6.Plugins.PluginWizardQInputDialog" ref="eric6.Plugins.PluginWizardQInputDialog.html" />
             <section title="eric6.Plugins.PluginWizardQMessageBox" ref="eric6.Plugins.PluginWizardQMessageBox.html" />
-            <section title="eric6.Plugins.PluginWizardQRegExp" ref="eric6.Plugins.PluginWizardQRegExp.html" />
             <section title="eric6.Plugins.PluginWizardQRegularExpression" ref="eric6.Plugins.PluginWizardQRegularExpression.html" />
             <section title="eric6.Plugins.PluginWizardSetup" ref="eric6.Plugins.PluginWizardSetup.html" />
           </section>
@@ -4166,6 +4162,11 @@
       <keyword name="E5ModelToolBar.setModel" id="E5ModelToolBar.setModel" ref="eric6.E5Gui.E5ModelToolBar.html#E5ModelToolBar.setModel" />
       <keyword name="E5ModelToolBar.setRootIndex" id="E5ModelToolBar.setRootIndex" ref="eric6.E5Gui.E5ModelToolBar.html#E5ModelToolBar.setRootIndex" />
       <keyword name="E5ModelToolBar.showEvent" id="E5ModelToolBar.showEvent" ref="eric6.E5Gui.E5ModelToolBar.html#E5ModelToolBar.showEvent" />
+      <keyword name="E5MutexLocker" id="E5MutexLocker" ref="eric6.E5Utilities.E5MutexLocker.html#E5MutexLocker" />
+      <keyword name="E5MutexLocker (Constructor)" id="E5MutexLocker (Constructor)" ref="eric6.E5Utilities.E5MutexLocker.html#E5MutexLocker.__init__" />
+      <keyword name="E5MutexLocker (Module)" id="E5MutexLocker (Module)" ref="eric6.E5Utilities.E5MutexLocker.html" />
+      <keyword name="E5MutexLocker.__enter__" id="E5MutexLocker.__enter__" ref="eric6.E5Utilities.E5MutexLocker.html#E5MutexLocker.__enter__" />
+      <keyword name="E5MutexLocker.__exit__" id="E5MutexLocker.__exit__" ref="eric6.E5Utilities.E5MutexLocker.html#E5MutexLocker.__exit__" />
       <keyword name="E5Network (Package)" id="E5Network (Package)" ref="index-eric6.E5Network.html" />
       <keyword name="E5NetworkHeaderDetailsDialog" id="E5NetworkHeaderDetailsDialog" ref="eric6.E5Network.E5NetworkHeaderDetailsDialog.html#E5NetworkHeaderDetailsDialog" />
       <keyword name="E5NetworkHeaderDetailsDialog (Constructor)" id="E5NetworkHeaderDetailsDialog (Constructor)" ref="eric6.E5Network.E5NetworkHeaderDetailsDialog.html#E5NetworkHeaderDetailsDialog.__init__" />
@@ -4181,6 +4182,19 @@
       <keyword name="E5NetworkProxyFactory (Module)" id="E5NetworkProxyFactory (Module)" ref="eric6.E5Network.E5NetworkProxyFactory.html" />
       <keyword name="E5NetworkProxyFactory.__setExceptions" id="E5NetworkProxyFactory.__setExceptions" ref="eric6.E5Network.E5NetworkProxyFactory.html#E5NetworkProxyFactory.__setExceptions" />
       <keyword name="E5NetworkProxyFactory.queryProxy" id="E5NetworkProxyFactory.queryProxy" ref="eric6.E5Network.E5NetworkProxyFactory.html#E5NetworkProxyFactory.queryProxy" />
+      <keyword name="E5OverrideCursor" id="E5OverrideCursor" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverrideCursor" />
+      <keyword name="E5OverrideCursor (Constructor)" id="E5OverrideCursor (Constructor)" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverrideCursor.__init__" />
+      <keyword name="E5OverrideCursor (Module)" id="E5OverrideCursor (Module)" ref="eric6.E5Gui.E5OverrideCursor.html" />
+      <keyword name="E5OverrideCursor.__enter__" id="E5OverrideCursor.__enter__" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverrideCursor.__enter__" />
+      <keyword name="E5OverrideCursor.__exit__" id="E5OverrideCursor.__exit__" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverrideCursor.__exit__" />
+      <keyword name="E5OverrideCursorProcess" id="E5OverrideCursorProcess" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverrideCursorProcess" />
+      <keyword name="E5OverrideCursorProcess (Constructor)" id="E5OverrideCursorProcess (Constructor)" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverrideCursorProcess.__init__" />
+      <keyword name="E5OverrideCursorProcess.__processFinished" id="E5OverrideCursorProcess.__processFinished" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverrideCursorProcess.__processFinished" />
+      <keyword name="E5OverrideCursorProcess.__processStarted" id="E5OverrideCursorProcess.__processStarted" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverrideCursorProcess.__processStarted" />
+      <keyword name="E5OverridenCursor" id="E5OverridenCursor" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverridenCursor" />
+      <keyword name="E5OverridenCursor (Constructor)" id="E5OverridenCursor (Constructor)" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverridenCursor.__init__" />
+      <keyword name="E5OverridenCursor.__enter__" id="E5OverridenCursor.__enter__" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverridenCursor.__enter__" />
+      <keyword name="E5OverridenCursor.__exit__" id="E5OverridenCursor.__exit__" ref="eric6.E5Gui.E5OverrideCursor.html#E5OverridenCursor.__exit__" />
       <keyword name="E5PassivePopup" id="E5PassivePopup" ref="eric6.E5Gui.E5PassivePopup.html#E5PassivePopup" />
       <keyword name="E5PassivePopup (Constructor)" id="E5PassivePopup (Constructor)" ref="eric6.E5Gui.E5PassivePopup.html#E5PassivePopup.__init__" />
       <keyword name="E5PassivePopup (Module)" id="E5PassivePopup (Module)" ref="eric6.E5Gui.E5PassivePopup.html" />
@@ -10979,7 +10993,6 @@
       <keyword name="PluginWizardQFontDialog (Module)" id="PluginWizardQFontDialog (Module)" ref="eric6.Plugins.PluginWizardQFontDialog.html" />
       <keyword name="PluginWizardQInputDialog (Module)" id="PluginWizardQInputDialog (Module)" ref="eric6.Plugins.PluginWizardQInputDialog.html" />
       <keyword name="PluginWizardQMessageBox (Module)" id="PluginWizardQMessageBox (Module)" ref="eric6.Plugins.PluginWizardQMessageBox.html" />
-      <keyword name="PluginWizardQRegExp (Module)" id="PluginWizardQRegExp (Module)" ref="eric6.Plugins.PluginWizardQRegExp.html" />
       <keyword name="PluginWizardQRegularExpression (Module)" id="PluginWizardQRegularExpression (Module)" ref="eric6.Plugins.PluginWizardQRegularExpression.html" />
       <keyword name="PluginWizardSetup (Module)" id="PluginWizardSetup (Module)" ref="eric6.Plugins.PluginWizardSetup.html" />
       <keyword name="Plugins (Package)" id="Plugins (Package)" ref="index-eric6.Plugins.html" />
@@ -11955,74 +11968,6 @@
       <keyword name="PythonPage (Module)" id="PythonPage (Module)" ref="eric6.Preferences.ConfigurationPages.PythonPage.html" />
       <keyword name="PythonPage.on_refreshButton_clicked" id="PythonPage.on_refreshButton_clicked" ref="eric6.Preferences.ConfigurationPages.PythonPage.html#PythonPage.on_refreshButton_clicked" />
       <keyword name="PythonPage.save" id="PythonPage.save" ref="eric6.Preferences.ConfigurationPages.PythonPage.html#PythonPage.save" />
-      <keyword name="QRegExpWizard" id="QRegExpWizard" ref="eric6.Plugins.PluginWizardQRegExp.html#QRegExpWizard" />
-      <keyword name="QRegExpWizard (Constructor)" id="QRegExpWizard (Constructor)" ref="eric6.Plugins.PluginWizardQRegExp.html#QRegExpWizard.__init__" />
-      <keyword name="QRegExpWizard (Package)" id="QRegExpWizard (Package)" ref="index-eric6.Plugins.WizardPlugins.QRegExpWizard.html" />
-      <keyword name="QRegExpWizard.__callForm" id="QRegExpWizard.__callForm" ref="eric6.Plugins.PluginWizardQRegExp.html#QRegExpWizard.__callForm" />
-      <keyword name="QRegExpWizard.__handle" id="QRegExpWizard.__handle" ref="eric6.Plugins.PluginWizardQRegExp.html#QRegExpWizard.__handle" />
-      <keyword name="QRegExpWizard.__initAction" id="QRegExpWizard.__initAction" ref="eric6.Plugins.PluginWizardQRegExp.html#QRegExpWizard.__initAction" />
-      <keyword name="QRegExpWizard.__initMenu" id="QRegExpWizard.__initMenu" ref="eric6.Plugins.PluginWizardQRegExp.html#QRegExpWizard.__initMenu" />
-      <keyword name="QRegExpWizard.activate" id="QRegExpWizard.activate" ref="eric6.Plugins.PluginWizardQRegExp.html#QRegExpWizard.activate" />
-      <keyword name="QRegExpWizard.deactivate" id="QRegExpWizard.deactivate" ref="eric6.Plugins.PluginWizardQRegExp.html#QRegExpWizard.deactivate" />
-      <keyword name="QRegExpWizardCharactersDialog" id="QRegExpWizardCharactersDialog" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog" />
-      <keyword name="QRegExpWizardCharactersDialog (Constructor)" id="QRegExpWizardCharactersDialog (Constructor)" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog.__init__" />
-      <keyword name="QRegExpWizardCharactersDialog (Module)" id="QRegExpWizardCharactersDialog (Module)" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html" />
-      <keyword name="QRegExpWizardCharactersDialog.__addRangesLine" id="QRegExpWizardCharactersDialog.__addRangesLine" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog.__addRangesLine" />
-      <keyword name="QRegExpWizardCharactersDialog.__addSinglesLine" id="QRegExpWizardCharactersDialog.__addSinglesLine" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog.__addSinglesLine" />
-      <keyword name="QRegExpWizardCharactersDialog.__formatCharacter" id="QRegExpWizardCharactersDialog.__formatCharacter" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog.__formatCharacter" />
-      <keyword name="QRegExpWizardCharactersDialog.__initCharacterSelectors" id="QRegExpWizardCharactersDialog.__initCharacterSelectors" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog.__initCharacterSelectors" />
-      <keyword name="QRegExpWizardCharactersDialog.__performSelectedAction" id="QRegExpWizardCharactersDialog.__performSelectedAction" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog.__performSelectedAction" />
-      <keyword name="QRegExpWizardCharactersDialog.__populateCharTypeCombo" id="QRegExpWizardCharactersDialog.__populateCharTypeCombo" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog.__populateCharTypeCombo" />
-      <keyword name="QRegExpWizardCharactersDialog.__populateW3cCharacterCombo" id="QRegExpWizardCharactersDialog.__populateW3cCharacterCombo" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog.__populateW3cCharacterCombo" />
-      <keyword name="QRegExpWizardCharactersDialog.__rangesCharTypeSelected" id="QRegExpWizardCharactersDialog.__rangesCharTypeSelected" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog.__rangesCharTypeSelected" />
-      <keyword name="QRegExpWizardCharactersDialog.__singlesCharTypeSelected" id="QRegExpWizardCharactersDialog.__singlesCharTypeSelected" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog.__singlesCharTypeSelected" />
-      <keyword name="QRegExpWizardCharactersDialog.getCharacters" id="QRegExpWizardCharactersDialog.getCharacters" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html#QRegExpWizardCharactersDialog.getCharacters" />
-      <keyword name="QRegExpWizardDialog" id="QRegExpWizardDialog" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardDialog" />
-      <keyword name="QRegExpWizardDialog (Constructor)" id="QRegExpWizardDialog (Constructor)" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardDialog.__init__" />
-      <keyword name="QRegExpWizardDialog (Module)" id="QRegExpWizardDialog (Module)" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html" />
-      <keyword name="QRegExpWizardDialog.getCode" id="QRegExpWizardDialog.getCode" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardDialog.getCode" />
-      <keyword name="QRegExpWizardRepeatDialog" id="QRegExpWizardRepeatDialog" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.html#QRegExpWizardRepeatDialog" />
-      <keyword name="QRegExpWizardRepeatDialog (Constructor)" id="QRegExpWizardRepeatDialog (Constructor)" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.html#QRegExpWizardRepeatDialog.__init__" />
-      <keyword name="QRegExpWizardRepeatDialog (Module)" id="QRegExpWizardRepeatDialog (Module)" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.html" />
-      <keyword name="QRegExpWizardRepeatDialog.getRepeat" id="QRegExpWizardRepeatDialog.getRepeat" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.html#QRegExpWizardRepeatDialog.getRepeat" />
-      <keyword name="QRegExpWizardRepeatDialog.on_lowerSpin_valueChanged" id="QRegExpWizardRepeatDialog.on_lowerSpin_valueChanged" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.html#QRegExpWizardRepeatDialog.on_lowerSpin_valueChanged" />
-      <keyword name="QRegExpWizardRepeatDialog.on_upperSpin_valueChanged" id="QRegExpWizardRepeatDialog.on_upperSpin_valueChanged" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.html#QRegExpWizardRepeatDialog.on_upperSpin_valueChanged" />
-      <keyword name="QRegExpWizardWidget" id="QRegExpWizardWidget" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget" />
-      <keyword name="QRegExpWizardWidget (Constructor)" id="QRegExpWizardWidget (Constructor)" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.__init__" />
-      <keyword name="QRegExpWizardWidget.__getPatternSyntaxCode" id="QRegExpWizardWidget.__getPatternSyntaxCode" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.__getPatternSyntaxCode" />
-      <keyword name="QRegExpWizardWidget.__insertString" id="QRegExpWizardWidget.__insertString" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.__insertString" />
-      <keyword name="QRegExpWizardWidget.getCode" id="QRegExpWizardWidget.getCode" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.getCode" />
-      <keyword name="QRegExpWizardWidget.on_altnButton_clicked" id="QRegExpWizardWidget.on_altnButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_altnButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_anycharButton_clicked" id="QRegExpWizardWidget.on_anycharButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_anycharButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_beglineButton_clicked" id="QRegExpWizardWidget.on_beglineButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_beglineButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_buttonBox_clicked" id="QRegExpWizardWidget.on_buttonBox_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_buttonBox_clicked" />
-      <keyword name="QRegExpWizardWidget.on_charButton_clicked" id="QRegExpWizardWidget.on_charButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_charButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_copyButton_clicked" id="QRegExpWizardWidget.on_copyButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_copyButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_endlineButton_clicked" id="QRegExpWizardWidget.on_endlineButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_endlineButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_executeButton_clicked" id="QRegExpWizardWidget.on_executeButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_executeButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_groupButton_clicked" id="QRegExpWizardWidget.on_groupButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_groupButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_loadButton_clicked" id="QRegExpWizardWidget.on_loadButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_loadButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_neglookaheadButton_clicked" id="QRegExpWizardWidget.on_neglookaheadButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_neglookaheadButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_nextButton_clicked" id="QRegExpWizardWidget.on_nextButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_nextButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_nonGroupButton_clicked" id="QRegExpWizardWidget.on_nonGroupButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_nonGroupButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_nonwordboundButton_clicked" id="QRegExpWizardWidget.on_nonwordboundButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_nonwordboundButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_poslookaheadButton_clicked" id="QRegExpWizardWidget.on_poslookaheadButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_poslookaheadButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_regexpLineEdit_textChanged" id="QRegExpWizardWidget.on_regexpLineEdit_textChanged" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_regexpLineEdit_textChanged" />
-      <keyword name="QRegExpWizardWidget.on_repeatButton_clicked" id="QRegExpWizardWidget.on_repeatButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_repeatButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_saveButton_clicked" id="QRegExpWizardWidget.on_saveButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_saveButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_syntaxCombo_currentIndexChanged" id="QRegExpWizardWidget.on_syntaxCombo_currentIndexChanged" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_syntaxCombo_currentIndexChanged" />
-      <keyword name="QRegExpWizardWidget.on_validateButton_clicked" id="QRegExpWizardWidget.on_validateButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_validateButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_w3cAltnButton_clicked" id="QRegExpWizardWidget.on_w3cAltnButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_w3cAltnButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_w3cAnycharButton_clicked" id="QRegExpWizardWidget.on_w3cAnycharButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_w3cAnycharButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_w3cCharButton_clicked" id="QRegExpWizardWidget.on_w3cCharButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_w3cCharButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_w3cGroupButton_clicked" id="QRegExpWizardWidget.on_w3cGroupButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_w3cGroupButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_w3cRepeatButton_clicked" id="QRegExpWizardWidget.on_w3cRepeatButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_w3cRepeatButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_wildcardAnycharButton_clicked" id="QRegExpWizardWidget.on_wildcardAnycharButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_wildcardAnycharButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_wildcardCharButton_clicked" id="QRegExpWizardWidget.on_wildcardCharButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_wildcardCharButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_wildcardRepeatButton_clicked" id="QRegExpWizardWidget.on_wildcardRepeatButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_wildcardRepeatButton_clicked" />
-      <keyword name="QRegExpWizardWidget.on_wordboundButton_clicked" id="QRegExpWizardWidget.on_wordboundButton_clicked" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWidget.on_wordboundButton_clicked" />
-      <keyword name="QRegExpWizardWindow" id="QRegExpWizardWindow" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWindow" />
-      <keyword name="QRegExpWizardWindow (Constructor)" id="QRegExpWizardWindow (Constructor)" ref="eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html#QRegExpWizardWindow.__init__" />
       <keyword name="QRegularExpressionWizard" id="QRegularExpressionWizard" ref="eric6.Plugins.PluginWizardQRegularExpression.html#QRegularExpressionWizard" />
       <keyword name="QRegularExpressionWizard (Constructor)" id="QRegularExpressionWizard (Constructor)" ref="eric6.Plugins.PluginWizardQRegularExpression.html#QRegularExpressionWizard.__init__" />
       <keyword name="QRegularExpressionWizard (Package)" id="QRegularExpressionWizard (Package)" ref="index-eric6.Plugins.WizardPlugins.QRegularExpressionWizard.html" />
@@ -15045,7 +14990,7 @@
       <keyword name="TrayStarter.__startPreferences" id="TrayStarter.__startPreferences" ref="eric6.Tools.TrayStarter.html#TrayStarter.__startPreferences" />
       <keyword name="TrayStarter.__startProc" id="TrayStarter.__startProc" ref="eric6.Tools.TrayStarter.html#TrayStarter.__startProc" />
       <keyword name="TrayStarter.__startPyRe" id="TrayStarter.__startPyRe" ref="eric6.Tools.TrayStarter.html#TrayStarter.__startPyRe" />
-      <keyword name="TrayStarter.__startQRegExp" id="TrayStarter.__startQRegExp" ref="eric6.Tools.TrayStarter.html#TrayStarter.__startQRegExp" />
+      <keyword name="TrayStarter.__startQRegularExpression" id="TrayStarter.__startQRegularExpression" ref="eric6.Tools.TrayStarter.html#TrayStarter.__startQRegularExpression" />
       <keyword name="TrayStarter.__startShell" id="TrayStarter.__startShell" ref="eric6.Tools.TrayStarter.html#TrayStarter.__startShell" />
       <keyword name="TrayStarter.__startSnapshot" id="TrayStarter.__startSnapshot" ref="eric6.Tools.TrayStarter.html#TrayStarter.__startSnapshot" />
       <keyword name="TrayStarter.__startSqlBrowser" id="TrayStarter.__startSqlBrowser" ref="eric6.Tools.TrayStarter.html#TrayStarter.__startSqlBrowser" />
@@ -17134,7 +17079,6 @@
       <keyword name="condaVersionStr" id="condaVersionStr" ref="eric6.CondaInterface.__init__.html#condaVersionStr" />
       <keyword name="confirmOverwrite" id="confirmOverwrite" ref="eric6.E5Gui.E5FileSaveConfirmDialog.html#confirmOverwrite" />
       <keyword name="containsSpace" id="containsSpace" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#containsSpace" />
-      <keyword name="context_diff" id="context_diff" ref="eric6.UI.DiffDialog.html#context_diff" />
       <keyword name="continued_indentation" id="continued_indentation" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#continued_indentation" />
       <keyword name="convertLineEnds" id="convertLineEnds" ref="eric6.Utilities.__init__.html#convertLineEnds" />
       <keyword name="convertPasswords" id="convertPasswords" ref="eric6.Preferences.__init__.html#convertPasswords" />
@@ -17845,6 +17789,7 @@
       <keyword name="rootPrefix" id="rootPrefix" ref="eric6.CondaInterface.__init__.html#rootPrefix" />
       <keyword name="runcall" id="runcall" ref="eric6.DebugClients.Python.eric6dbgstub.html#runcall" />
       <keyword name="rxExecute" id="rxExecute" ref="eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardServer.html#rxExecute" />
+      <keyword name="rxIndex" id="rxIndex" ref="eric6.Utilities.__init__.html#rxIndex" />
       <keyword name="rxValidate" id="rxValidate" ref="eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardServer.html#rxValidate" />
       <keyword name="s2qTranslate" id="s2qTranslate" ref="eric6.QScintilla.KeySequenceTranslator.html#s2qTranslate" />
       <keyword name="samefilepath" id="samefilepath" ref="eric6.Utilities.__init__.html#samefilepath" />
@@ -17971,7 +17916,6 @@
       <keyword name="uiStartUp" id="uiStartUp" ref="eric6.eric6.html#uiStartUp" />
       <keyword name="uic (Module)" id="uic (Module)" ref="eric6.Utilities.uic.html" />
       <keyword name="unescape_uentities" id="unescape_uentities" ref="eric6.Utilities.__init__.html#unescape_uentities" />
-      <keyword name="unified_diff" id="unified_diff" ref="eric6.UI.DiffDialog.html#unified_diff" />
       <keyword name="uninstall (Module)" id="uninstall (Module)" ref="uninstall.html" />
       <keyword name="uninstall-debugclients (Module)" id="uninstall-debugclients (Module)" ref="uninstall-debugclients.html" />
       <keyword name="uninstallEric" id="uninstallEric" ref="uninstall.html#uninstallEric" />
@@ -18127,6 +18071,7 @@
       <file>eric6.E5Gui.E5MessageBox.html</file>
       <file>eric6.E5Gui.E5ModelMenu.html</file>
       <file>eric6.E5Gui.E5ModelToolBar.html</file>
+      <file>eric6.E5Gui.E5OverrideCursor.html</file>
       <file>eric6.E5Gui.E5PassivePopup.html</file>
       <file>eric6.E5Gui.E5PasswordMeter.html</file>
       <file>eric6.E5Gui.E5PathPicker.html</file>
@@ -18170,6 +18115,7 @@
       <file>eric6.E5Network.E5XmlRpcClient.html</file>
       <file>eric6.E5Network.__init__.html</file>
       <file>eric6.E5Utilities.E5Cache.html</file>
+      <file>eric6.E5Utilities.E5MutexLocker.html</file>
       <file>eric6.E5XML.Config.html</file>
       <file>eric6.E5XML.DebuggerPropertiesReader.html</file>
       <file>eric6.E5XML.DebuggerPropertiesWriter.html</file>
@@ -18348,7 +18294,6 @@
       <file>eric6.Plugins.PluginWizardQFontDialog.html</file>
       <file>eric6.Plugins.PluginWizardQInputDialog.html</file>
       <file>eric6.Plugins.PluginWizardQMessageBox.html</file>
-      <file>eric6.Plugins.PluginWizardQRegExp.html</file>
       <file>eric6.Plugins.PluginWizardQRegularExpression.html</file>
       <file>eric6.Plugins.PluginWizardSetup.html</file>
       <file>eric6.Plugins.UiExtensionPlugins.Translator.ConfigurationPage.TranslatorPage.html</file>
@@ -18597,9 +18542,6 @@
       <file>eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardCharactersDialog.html</file>
       <file>eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.html</file>
       <file>eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.html</file>
-      <file>eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html</file>
-      <file>eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html</file>
-      <file>eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.html</file>
       <file>eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardCharactersDialog.html</file>
       <file>eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardDialog.html</file>
       <file>eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardRepeatDialog.html</file>
@@ -19183,7 +19125,6 @@
       <file>index-eric6.Plugins.WizardPlugins.InputDialogWizard.html</file>
       <file>index-eric6.Plugins.WizardPlugins.MessageBoxWizard.html</file>
       <file>index-eric6.Plugins.WizardPlugins.PyRegExpWizard.html</file>
-      <file>index-eric6.Plugins.WizardPlugins.QRegExpWizard.html</file>
       <file>index-eric6.Plugins.WizardPlugins.QRegularExpressionWizard.html</file>
       <file>index-eric6.Plugins.WizardPlugins.SetupWizard.html</file>
       <file>index-eric6.Plugins.WizardPlugins.html</file>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Documentation/Source/eric6.E5Gui.E5OverrideCursor.html	Sun Oct 11 17:56:02 2020 +0200
@@ -0,0 +1,354 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.E5Gui.E5OverrideCursor</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body>
+<a NAME="top" ID="top"></a>
+<h1>eric6.E5Gui.E5OverrideCursor</h1>
+
+<p>
+Module implementing a context manager class for an override cursor and a
+QProcess class controlling an override cursor.
+</p>
+<h3>Global Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+
+<table>
+
+<tr>
+<td><a href="#E5OverrideCursor">E5OverrideCursor</a></td>
+<td>Class implementing a context manager class for an override cursor.</td>
+</tr>
+<tr>
+<td><a href="#E5OverrideCursorProcess">E5OverrideCursorProcess</a></td>
+<td>Class implementing a QProcess subclass controlling an override cursor.</td>
+</tr>
+<tr>
+<td><a href="#E5OverridenCursor">E5OverridenCursor</a></td>
+<td>Class implementing a context manager class for an overriden cursor.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr />
+<hr />
+<a NAME="E5OverrideCursor" ID="E5OverrideCursor"></a>
+<h2>E5OverrideCursor</h2>
+
+<p>
+    Class implementing a context manager class for an override cursor.
+</p>
+<h3>Derived from</h3>
+contextlib.AbstractContextManager
+<h3>Class Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+
+<table>
+
+<tr>
+<td><a href="#E5OverrideCursor.__init__">E5OverrideCursor</a></td>
+<td>Constructor</td>
+</tr>
+<tr>
+<td><a href="#E5OverrideCursor.__enter__">__enter__</a></td>
+<td>Special method called when entering the runtime ccontext.</td>
+</tr>
+<tr>
+<td><a href="#E5OverrideCursor.__exit__">__exit__</a></td>
+<td>Special method called when exiting the runtime ccontext.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="E5OverrideCursor.__init__" ID="E5OverrideCursor.__init__"></a>
+<h4>E5OverrideCursor (Constructor)</h4>
+<b>E5OverrideCursor</b>(<i>cursorShape=Qt.WaitCursor</i>)
+
+<p>
+        Constructor
+</p>
+<dl>
+
+<dt><i>cursorShape</i> (Qt.CursorShape)</dt>
+<dd>
+shape of the override cursor
+</dd>
+</dl>
+<a NAME="E5OverrideCursor.__enter__" ID="E5OverrideCursor.__enter__"></a>
+<h4>E5OverrideCursor.__enter__</h4>
+<b>__enter__</b>(<i></i>)
+
+<p>
+        Special method called when entering the runtime ccontext.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+reference to the context manager object
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+E5OverrideCursor
+</dd>
+</dl>
+<a NAME="E5OverrideCursor.__exit__" ID="E5OverrideCursor.__exit__"></a>
+<h4>E5OverrideCursor.__exit__</h4>
+<b>__exit__</b>(<i>exc_type, exc_value, traceback</i>)
+
+<p>
+        Special method called when exiting the runtime ccontext.
+</p>
+<dl>
+
+<dt><i>exc_type</i></dt>
+<dd>
+type of an exception raised in the runtime context
+</dd>
+<dt><i>exc_value</i></dt>
+<dd>
+value of an exception raised in the runtime context
+</dd>
+<dt><i>traceback</i></dt>
+<dd>
+traceback of an exception raised in the runtime
+            context
+</dd>
+</dl>
+<dl>
+<dt>Returns:</dt>
+<dd>
+always returns None to not suppress any exception
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+None
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+<hr />
+<a NAME="E5OverrideCursorProcess" ID="E5OverrideCursorProcess"></a>
+<h2>E5OverrideCursorProcess</h2>
+
+<p>
+    Class implementing a QProcess subclass controlling an override cursor.
+</p>
+<h3>Derived from</h3>
+QProcess
+<h3>Class Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+
+<table>
+
+<tr>
+<td><a href="#E5OverrideCursorProcess.__init__">E5OverrideCursorProcess</a></td>
+<td>Constructor</td>
+</tr>
+<tr>
+<td><a href="#E5OverrideCursorProcess.__processFinished">__processFinished</a></td>
+<td>Private slot resetting the cursor when the process finished.</td>
+</tr>
+<tr>
+<td><a href="#E5OverrideCursorProcess.__processStarted">__processStarted</a></td>
+<td>Private slot setting the cursor after the process has started.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="E5OverrideCursorProcess.__init__" ID="E5OverrideCursorProcess.__init__"></a>
+<h4>E5OverrideCursorProcess (Constructor)</h4>
+<b>E5OverrideCursorProcess</b>(<i>parent=None, cursorShape=Qt.WaitCursor</i>)
+
+<p>
+        Constructor
+</p>
+<dl>
+
+<dt><i>parent</i> (QObject)</dt>
+<dd>
+reference to the parent object
+</dd>
+<dt><i>cursorShape</i> (Qt.CursorShape)</dt>
+<dd>
+shape of the override cursor
+</dd>
+</dl>
+<a NAME="E5OverrideCursorProcess.__processFinished" ID="E5OverrideCursorProcess.__processFinished"></a>
+<h4>E5OverrideCursorProcess.__processFinished</h4>
+<b>__processFinished</b>(<i></i>)
+
+<p>
+        Private slot resetting the cursor when the process finished.
+</p>
+<a NAME="E5OverrideCursorProcess.__processStarted" ID="E5OverrideCursorProcess.__processStarted"></a>
+<h4>E5OverrideCursorProcess.__processStarted</h4>
+<b>__processStarted</b>(<i></i>)
+
+<p>
+        Private slot setting the cursor after the process has started.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+<hr />
+<a NAME="E5OverridenCursor" ID="E5OverridenCursor"></a>
+<h2>E5OverridenCursor</h2>
+
+<p>
+    Class implementing a context manager class for an overriden cursor.
+</p>
+<p>
+    The cursor is reset upon entering the runtime context and restored
+    upon exiting it.
+</p>
+<h3>Derived from</h3>
+contextlib.AbstractContextManager
+<h3>Class Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+
+<table>
+
+<tr>
+<td><a href="#E5OverridenCursor.__init__">E5OverridenCursor</a></td>
+<td>Constructor</td>
+</tr>
+<tr>
+<td><a href="#E5OverridenCursor.__enter__">__enter__</a></td>
+<td>Special method called when entering the runtime ccontext.</td>
+</tr>
+<tr>
+<td><a href="#E5OverridenCursor.__exit__">__exit__</a></td>
+<td>Special method called when exiting the runtime ccontext.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="E5OverridenCursor.__init__" ID="E5OverridenCursor.__init__"></a>
+<h4>E5OverridenCursor (Constructor)</h4>
+<b>E5OverridenCursor</b>(<i></i>)
+
+<p>
+        Constructor
+</p>
+<a NAME="E5OverridenCursor.__enter__" ID="E5OverridenCursor.__enter__"></a>
+<h4>E5OverridenCursor.__enter__</h4>
+<b>__enter__</b>(<i></i>)
+
+<p>
+        Special method called when entering the runtime ccontext.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+reference to the context manager object
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+E5OverrideCursor
+</dd>
+</dl>
+<a NAME="E5OverridenCursor.__exit__" ID="E5OverridenCursor.__exit__"></a>
+<h4>E5OverridenCursor.__exit__</h4>
+<b>__exit__</b>(<i>exc_type, exc_value, traceback</i>)
+
+<p>
+        Special method called when exiting the runtime ccontext.
+</p>
+<dl>
+
+<dt><i>exc_type</i></dt>
+<dd>
+type of an exception raised in the runtime context
+</dd>
+<dt><i>exc_value</i></dt>
+<dd>
+value of an exception raised in the runtime context
+</dd>
+<dt><i>traceback</i></dt>
+<dd>
+traceback of an exception raised in the runtime
+            context
+</dd>
+</dl>
+<dl>
+<dt>Returns:</dt>
+<dd>
+always returns None to not suppress any exception
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+None
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Documentation/Source/eric6.E5Utilities.E5MutexLocker.html	Sun Oct 11 17:56:02 2020 +0200
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.E5Utilities.E5MutexLocker</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body>
+<a NAME="top" ID="top"></a>
+<h1>eric6.E5Utilities.E5MutexLocker</h1>
+
+<p>
+Module implementing a context manager locking and unlocking a mutex.
+</p>
+<h3>Global Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+
+<table>
+
+<tr>
+<td><a href="#E5MutexLocker">E5MutexLocker</a></td>
+<td>Class implementing a context manager locking and unlocking a mutex.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr />
+<hr />
+<a NAME="E5MutexLocker" ID="E5MutexLocker"></a>
+<h2>E5MutexLocker</h2>
+
+<p>
+    Class implementing a context manager locking and unlocking a mutex.
+</p>
+<h3>Derived from</h3>
+contextlib.AbstractContextManager
+<h3>Class Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+
+<table>
+
+<tr>
+<td><a href="#E5MutexLocker.__init__">E5MutexLocker</a></td>
+<td>Constructor</td>
+</tr>
+<tr>
+<td><a href="#E5MutexLocker.__enter__">__enter__</a></td>
+<td>Special method called when entering the runtime ccontext.</td>
+</tr>
+<tr>
+<td><a href="#E5MutexLocker.__exit__">__exit__</a></td>
+<td>Special method called when exiting the runtime ccontext.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="E5MutexLocker.__init__" ID="E5MutexLocker.__init__"></a>
+<h4>E5MutexLocker (Constructor)</h4>
+<b>E5MutexLocker</b>(<i>mutex</i>)
+
+<p>
+        Constructor
+</p>
+<dl>
+
+<dt><i>mutex</i> (QMutex or QRecursiveMutex)</dt>
+<dd>
+reference to the mutex to be locked
+</dd>
+</dl>
+<a NAME="E5MutexLocker.__enter__" ID="E5MutexLocker.__enter__"></a>
+<h4>E5MutexLocker.__enter__</h4>
+<b>__enter__</b>(<i></i>)
+
+<p>
+        Special method called when entering the runtime ccontext.
+</p>
+<dl>
+<dt>Returns:</dt>
+<dd>
+reference to the context manager object
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+E5OverrideCursor
+</dd>
+</dl>
+<a NAME="E5MutexLocker.__exit__" ID="E5MutexLocker.__exit__"></a>
+<h4>E5MutexLocker.__exit__</h4>
+<b>__exit__</b>(<i>exc_type, exc_value, traceback</i>)
+
+<p>
+        Special method called when exiting the runtime ccontext.
+</p>
+<dl>
+
+<dt><i>exc_type</i></dt>
+<dd>
+type of an exception raised in the runtime context
+</dd>
+<dt><i>exc_value</i></dt>
+<dd>
+value of an exception raised in the runtime context
+</dd>
+<dt><i>traceback</i></dt>
+<dd>
+traceback of an exception raised in the runtime
+            context
+</dd>
+</dl>
+<dl>
+<dt>Returns:</dt>
+<dd>
+always returns None to not suppress any exception
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+None
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- a/eric6/Documentation/Source/eric6.QScintilla.MiniEditor.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/eric6.QScintilla.MiniEditor.html	Sun Oct 11 17:56:02 2020 +0200
@@ -23,7 +23,7 @@
 <h1>eric6.QScintilla.MiniEditor</h1>
 
 <p>
-Module implementing a minimalistic editor for simple editing tasks.
+Module implementing an editor for simple editing tasks.
 </p>
 <h3>Global Attributes</h3>
 
@@ -36,7 +36,7 @@
 
 <tr>
 <td><a href="#MiniEditor">MiniEditor</a></td>
-<td>Class implementing a minimalistic editor for simple editing tasks.</td>
+<td>Class implementing an editor for simple editing tasks.</td>
 </tr>
 <tr>
 <td><a href="#MiniScintilla">MiniScintilla</a></td>
@@ -54,7 +54,7 @@
 <h2>MiniEditor</h2>
 
 <p>
-    Class implementing a minimalistic editor for simple editing tasks.
+    Class implementing an editor for simple editing tasks.
 </p>
 <h3>Signals</h3>
 <dl>
@@ -778,19 +778,25 @@
 </p>
 <dl>
 
-<dt><i>line</i></dt>
+<dt><i>line</i> (int)</dt>
 <dd>
-number of line to look at (int)
+number of line to look at
 </dd>
-<dt><i>index</i></dt>
+<dt><i>index</i> (int)</dt>
 <dd>
-position to look at (int)
+position to look at
 </dd>
 </dl>
 <dl>
 <dt>Returns:</dt>
 <dd>
-the word at that position (string)
+the word at that position
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl>
 <a NAME="MiniEditor.__initContextMenu" ID="MiniEditor.__initContextMenu"></a>

--- a/eric6/Documentation/Source/eric6.Tools.TrayStarter.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Tools.TrayStarter.html	Sun Oct 11 17:56:02 2020 +0200
@@ -173,8 +173,8 @@
 <td>Private slot to start the eric6 Python re editor dialog.</td>
 </tr>
 <tr>
-<td><a href="#TrayStarter.__startQRegExp">__startQRegExp</a></td>
-<td>Private slot to start the eric6 QRegExp editor dialog.</td>
+<td><a href="#TrayStarter.__startQRegularExpression">__startQRegularExpression</a></td>
+<td>Private slot to start the eric6 QRegularExpression editor dialog.</td>
 </tr>
 <tr>
 <td><a href="#TrayStarter.__startShell">__startShell</a></td>
@@ -427,12 +427,12 @@
 <p>
         Private slot to start the eric6 Python re editor dialog.
 </p>
-<a NAME="TrayStarter.__startQRegExp" ID="TrayStarter.__startQRegExp"></a>
-<h4>TrayStarter.__startQRegExp</h4>
-<b>__startQRegExp</b>(<i></i>)
+<a NAME="TrayStarter.__startQRegularExpression" ID="TrayStarter.__startQRegularExpression"></a>
+<h4>TrayStarter.__startQRegularExpression</h4>
+<b>__startQRegularExpression</b>(<i></i>)
 
 <p>
-        Private slot to start the eric6 QRegExp editor dialog.
+        Private slot to start the eric6 QRegularExpression editor dialog.
 </p>
 <a NAME="TrayStarter.__startShell" ID="TrayStarter.__startShell"></a>
 <h4>TrayStarter.__startShell</h4>

--- a/eric6/Documentation/Source/eric6.UI.DiffDialog.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/eric6.UI.DiffDialog.html	Sun Oct 11 17:56:02 2020 +0200
@@ -46,15 +46,7 @@
 <h3>Functions</h3>
 
 <table>
-
-<tr>
-<td><a href="#context_diff">context_diff</a></td>
-<td>Compare two sequences of lines; generate the delta as a context diff.</td>
-</tr>
-<tr>
-<td><a href="#unified_diff">unified_diff</a></td>
-<td>Compare two sequences of lines; generate the delta as a unified diff.</td>
-</tr>
+<tr><td>None</td></tr>
 </table>
 <hr />
 <hr />
@@ -352,196 +344,4 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
-<hr />
-<a NAME="context_diff" ID="context_diff"></a>
-<h2>context_diff</h2>
-<b>context_diff</b>(<i>a, b, fromfile='', tofile='', fromfiledate='', tofiledate='', n=3, lineterm='\n'</i>)
-
-<p>
-    Compare two sequences of lines; generate the delta as a context diff.
-</p>
-<p>
-    Context diffs are a compact way of showing line changes and a few
-    lines of context.  The number of context lines is set by 'n' which
-    defaults to three.
-</p>
-<p>
-    By default, the diff control lines (those with *** or ---) are
-    created with a trailing newline.  This is helpful so that inputs
-    created from file.readlines() result in diffs that are suitable for
-    file.writelines() since both the inputs and outputs have trailing
-    newlines.
-</p>
-<p>
-    For inputs that do not have trailing newlines, set the lineterm
-    argument to "" so that the output will be uniformly newline free.
-</p>
-<p>
-    The context diff format normally has a header for filenames and
-    modification times.  Any or all of these may be specified using
-    strings for 'fromfile', 'tofile', 'fromfiledate', and 'tofiledate'.
-    The modification times are normally expressed in the format returned
-    by time.ctime().  If not specified, the strings default to blanks.
-</p>
-<p>
-    Example:
-</p>
-<p>
-    <pre>
-    &gt;&gt;&gt; print ''.join(
-    ...       context_diff('one\ntwo\nthree\nfour\n'.splitlines(1),
-    ...       'zero\none\ntree\nfour\n'.splitlines(1), 'Original', 'Current',
-    ...       'Sat Jan 26 23:30:50 1991', 'Fri Jun 06 10:22:46 2003')),
-    *** Original Sat Jan 26 23:30:50 1991
-    --- Current Fri Jun 06 10:22:46 2003
-    ***************
-    *** 1,4 ****
-      one
-    ! two
-    ! three
-      four
-    --- 1,4 ----
-    + zero
-      one
-    ! tree
-      four
-    </pre>
-</p>
-<dl>
-
-<dt><i>a</i></dt>
-<dd>
-first sequence of lines (list of strings)
-</dd>
-<dt><i>b</i></dt>
-<dd>
-second sequence of lines (list of strings)
-</dd>
-<dt><i>fromfile</i></dt>
-<dd>
-filename of the first file (string)
-</dd>
-<dt><i>tofile</i></dt>
-<dd>
-filename of the second file (string)
-</dd>
-<dt><i>fromfiledate</i></dt>
-<dd>
-modification time of the first file (string)
-</dd>
-<dt><i>tofiledate</i></dt>
-<dd>
-modification time of the second file (string)
-</dd>
-<dt><i>n</i></dt>
-<dd>
-number of lines of context (integer)
-</dd>
-<dt><i>lineterm</i></dt>
-<dd>
-line termination string (string)
-</dd>
-</dl>
-<dl>
-<dt>Returns:</dt>
-<dd>
-a generator yielding lines of differences
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr />
-<hr />
-<a NAME="unified_diff" ID="unified_diff"></a>
-<h2>unified_diff</h2>
-<b>unified_diff</b>(<i>a, b, fromfile='', tofile='', fromfiledate='', tofiledate='', n=3, lineterm='\n'</i>)
-
-<p>
-    Compare two sequences of lines; generate the delta as a unified diff.
-</p>
-<p>
-    Unified diffs are a compact way of showing line changes and a few
-    lines of context.  The number of context lines is set by 'n' which
-    defaults to three.
-</p>
-<p>
-    By default, the diff control lines (those with ---, +++, or @@) are
-    created with a trailing newline.  This is helpful so that inputs
-    created from file.readlines() result in diffs that are suitable for
-    file.writelines() since both the inputs and outputs have trailing
-    newlines.
-</p>
-<p>
-    For inputs that do not have trailing newlines, set the lineterm
-    argument to "" so that the output will be uniformly newline free.
-</p>
-<p>
-    The unidiff format normally has a header for filenames and modification
-    times.  Any or all of these may be specified using strings for
-    'fromfile', 'tofile', 'fromfiledate', and 'tofiledate'.  The modification
-    times are normally expressed in the format returned by time.ctime().
-</p>
-<p>
-    Example:
-</p>
-<p>
-    <pre>
-    &gt;&gt;&gt; for line in unified_diff('one two three four'.split(),
-    ...             'zero one tree four'.split(), 'Original', 'Current',
-    ...             'Sat Jan 26 23:30:50 1991', 'Fri Jun 06 10:20:52 2003',
-    ...             lineterm=''):
-    ...     print line
-    --- Original Sat Jan 26 23:30:50 1991
-    +++ Current Fri Jun 06 10:20:52 2003
-@ -1,4 +1,4 @@
-    +zero
-     one
-    -two
-    -three
-    +tree
-     four
-    </pre>
-</p>
-<dl>
-
-<dt><i>a</i></dt>
-<dd>
-first sequence of lines (list of strings)
-</dd>
-<dt><i>b</i></dt>
-<dd>
-second sequence of lines (list of strings)
-</dd>
-<dt><i>fromfile</i></dt>
-<dd>
-filename of the first file (string)
-</dd>
-<dt><i>tofile</i></dt>
-<dd>
-filename of the second file (string)
-</dd>
-<dt><i>fromfiledate</i></dt>
-<dd>
-modification time of the first file (string)
-</dd>
-<dt><i>tofiledate</i></dt>
-<dd>
-modification time of the second file (string)
-</dd>
-<dt><i>n</i></dt>
-<dd>
-number of lines of context (integer)
-</dd>
-<dt><i>lineterm</i></dt>
-<dd>
-line termination string (string)
-</dd>
-</dl>
-<dl>
-<dt>Returns:</dt>
-<dd>
-a generator yielding lines of differences
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr />
 </body></html>
\ No newline at end of file

--- a/eric6/Documentation/Source/eric6.Utilities.__init__.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Utilities.__init__.html	Sun Oct 11 17:56:02 2020 +0200
@@ -324,6 +324,10 @@
 <td>Return a relative version of a path.</td>
 </tr>
 <tr>
+<td><a href="#rxIndex">rxIndex</a></td>
+<td>Function to get the index (start position) of a regular expression match within some text.</td>
+</tr>
+<tr>
 <td><a href="#samefilepath">samefilepath</a></td>
 <td>Function to compare two paths.</td>
 </tr>
@@ -1662,15 +1666,21 @@
 </p>
 <dl>
 
-<dt><i>key</i></dt>
+<dt><i>key</i> (str)</dt>
 <dd>
-key of the requested environment entry (string)
+key of the requested environment entry
 </dd>
 </dl>
 <dl>
 <dt>Returns:</dt>
 <dd>
-flag indicating the presence of the requested entry (boolean)
+flag indicating the presence of the requested entry
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+bool
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
@@ -2062,19 +2072,25 @@
 </p>
 <dl>
 
-<dt><i>s</i></dt>
+<dt><i>s</i> (str)</dt>
 <dd>
-string to be parsed (string)
+string to be parsed
 </dd>
-<dt><i>rx</i></dt>
+<dt><i>rx</i> (re.Pattern)</dt>
 <dd>
-regex defining the parse pattern (QRegExp)
+regular expression object defining the parse pattern
 </dd>
 </dl>
 <dl>
 <dt>Returns:</dt>
 <dd>
-list of parsed data (list of strings)
+list of parsed data
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+list of str
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
@@ -2302,6 +2318,40 @@
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 <hr />
+<a NAME="rxIndex" ID="rxIndex"></a>
+<h2>rxIndex</h2>
+<b>rxIndex</b>(<i>rx, txt</i>)
+
+<p>
+    Function to get the index (start position) of a regular expression match
+    within some text.
+</p>
+<dl>
+
+<dt><i>rx</i> (re.Pattern)</dt>
+<dd>
+regular expression object as created by re.compile()
+</dd>
+<dt><i>txt</i> (str)</dt>
+<dd>
+text to be scanned
+</dd>
+</dl>
+<dl>
+<dt>Returns:</dt>
+<dd>
+start position of the match or -1 indicating no match was found
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+int
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+<hr />
 <a NAME="samefilepath" ID="samefilepath"></a>
 <h2>samefilepath</h2>
 <b>samefilepath</b>(<i>f1, f2</i>)

--- a/eric6/Documentation/Source/eric6.ViewManager.ViewManager.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/eric6.ViewManager.ViewManager.html	Sun Oct 11 17:56:02 2020 +0200
@@ -23,7 +23,7 @@
 <h1>eric6.ViewManager.ViewManager</h1>
 
 <p>
-Module implementing the viewmanager base class.
+Module implementing the view manager base class.
 </p>
 <h3>Global Attributes</h3>
 
@@ -40,7 +40,7 @@
 </tr>
 <tr>
 <td><a href="#ViewManager">ViewManager</a></td>
-<td>Base class inherited by all specific viewmanager classes.</td>
+<td>Base class inherited by all specific view manager classes.</td>
 </tr>
 </table>
 <h3>Functions</h3>
@@ -152,11 +152,11 @@
 <h2>ViewManager</h2>
 
 <p>
-    Base class inherited by all specific viewmanager classes.
+    Base class inherited by all specific view manager classes.
 </p>
 <p>
     It defines the interface to be implemented by specific
-    viewmanager classes and all common methods.
+    view manager classes and all common methods.
 </p>
 <h3>Signals</h3>
 <dl>

--- a/eric6/Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockIcon.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockIcon.html	Sun Oct 11 17:56:02 2020 +0200
@@ -145,16 +145,16 @@
 </dl>
 <a NAME="AdBlockIcon.__enableAdBlock" ID="AdBlockIcon.__enableAdBlock"></a>
 <h4>AdBlockIcon.__enableAdBlock</h4>
-<b>__enableAdBlock</b>(<i>act</i>)
+<b>__enableAdBlock</b>(<i>enable</i>)
 
 <p>
         Private slot to enable or disable AdBlock.
 </p>
 <dl>
 
-<dt><i>act</i> (QAction)</dt>
+<dt><i>enable</i> (bool)</dt>
 <dd>
-reference to the action
+flag indicating the desired enable state
 </dd>
 </dl>
 <a NAME="AdBlockIcon.__isCurrentHostExcepted" ID="AdBlockIcon.__isCurrentHostExcepted"></a>
@@ -179,7 +179,7 @@
 </dl>
 <a NAME="AdBlockIcon.__setException" ID="AdBlockIcon.__setException"></a>
 <h4>AdBlockIcon.__setException</h4>
-<b>__setException</b>(<i>act</i>)
+<b>__setException</b>(<i>enable</i>)
 
 <p>
         Private slot to add or remove the current host from the list of
@@ -187,9 +187,9 @@
 </p>
 <dl>
 
-<dt><i>act</i> (QAction)</dt>
+<dt><i>enable</i> (bool)</dt>
 <dd>
-referenced to the action
+flag indicating to set or remove an exception
 </dd>
 </dl>
 <a NAME="AdBlockIcon.__showMenu" ID="AdBlockIcon.__showMenu"></a>

--- a/eric6/Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockRule.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockRule.html	Sun Oct 11 17:56:02 2020 +0200
@@ -760,7 +760,7 @@
 <dl>
 <dt>Return Type:</dt>
 <dd>
-tuple of (QRegExp, list of str)
+tuple of (re.Pattern, list of str)
 </dd>
 </dl>
 <a NAME="AdBlockRule.isCSSRule" ID="AdBlockRule.isCSSRule"></a>

--- a/eric6/Documentation/Source/eric6.WebBrowser.History.HistoryCompleter.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/eric6.WebBrowser.History.HistoryCompleter.html	Sun Oct 11 17:56:02 2020 +0200
@@ -322,19 +322,25 @@
 </p>
 <dl>
 
-<dt><i>left</i></dt>
+<dt><i>left</i> (QModelIndex)</dt>
 <dd>
-index of left item (QModelIndex)
+index of left item
 </dd>
-<dt><i>right</i></dt>
+<dt><i>right</i> (QModelIndex)</dt>
 <dd>
-index of right item (QModelIndex)
+index of right item
 </dd>
 </dl>
 <dl>
 <dt>Returns:</dt>
 <dd>
-true, if left is less than right (boolean)
+true, if left is less than right
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+bool
 </dd>
 </dl>
 <a NAME="HistoryCompletionModel.searchString" ID="HistoryCompletionModel.searchString"></a>
@@ -352,14 +358,14 @@
 </dl>
 <a NAME="HistoryCompletionModel.setSearchString" ID="HistoryCompletionModel.setSearchString"></a>
 <h4>HistoryCompletionModel.setSearchString</h4>
-<b>setSearchString</b>(<i>string</i>)
+<b>setSearchString</b>(<i>sstring</i>)
 
 <p>
         Public method to set the current search string.
 </p>
 <dl>
 
-<dt><i>string</i></dt>
+<dt><i>sstring</i></dt>
 <dd>
 new search string (string)
 </dd>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Documentation/Source/eric6.WebBrowser.UrlBar.SslLabel.html	Sun Oct 11 17:56:02 2020 +0200
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.WebBrowser.UrlBar.SslLabel</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body>
+<a NAME="top" ID="top"></a>
+<h1>eric6.WebBrowser.UrlBar.SslLabel</h1>
+
+<p>
+Module implementing the label to show some SSL info (if available).
+</p>
+<h3>Global Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+
+<table>
+
+<tr>
+<td><a href="#SslLabel">SslLabel</a></td>
+<td>Class implementing the label to show some SSL info (if available).</td>
+</tr>
+</table>
+<h3>Functions</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr />
+<hr />
+<a NAME="SslLabel" ID="SslLabel"></a>
+<h2>SslLabel</h2>
+
+<p>
+    Class implementing the label to show some SSL info (if available).
+</p>
+<h3>Derived from</h3>
+E5ClickableLabel
+<h3>Class Attributes</h3>
+
+<table>
+<tr><td>nokStyle</td></tr><tr><td>okStyle</td></tr>
+</table>
+<h3>Class Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+
+<table>
+
+<tr>
+<td><a href="#SslLabel.__init__">SslLabel</a></td>
+<td>Constructor</td>
+</tr>
+<tr>
+<td><a href="#SslLabel.setValidity">setValidity</a></td>
+<td>Public method to set the validity indication.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="SslLabel.__init__" ID="SslLabel.__init__"></a>
+<h4>SslLabel (Constructor)</h4>
+<b>SslLabel</b>(<i>parent=None</i>)
+
+<p>
+        Constructor
+</p>
+<dl>
+
+<dt><i>parent</i></dt>
+<dd>
+reference to the parent widget (QWidget)
+</dd>
+</dl>
+<a NAME="SslLabel.setValidity" ID="SslLabel.setValidity"></a>
+<h4>SslLabel.setValidity</h4>
+<b>setValidity</b>(<i>valid</i>)
+
+<p>
+        Public method to set the validity indication.
+</p>
+<dl>
+
+<dt><i>valid</i></dt>
+<dd>
+flag indicating the certificate validity (boolean)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- a/eric6/Documentation/Source/index-eric6.E5Gui.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/index-eric6.E5Gui.html	Sun Oct 11 17:56:02 2020 +0200
@@ -121,6 +121,10 @@
 <td>Module implementing a tool bar populated from a QAbstractItemModel.</td>
 </tr>
 <tr>
+<td><a href="eric6.E5Gui.E5OverrideCursor.html">E5OverrideCursor</a></td>
+<td>Module implementing a context manager class for an override cursor and a QProcess class controlling an override cursor.</td>
+</tr>
+<tr>
 <td><a href="eric6.E5Gui.E5PassivePopup.html">E5PassivePopup</a></td>
 <td>Module implementing dialog-like popup that displays messages without interrupting the user.</td>
 </tr>

--- a/eric6/Documentation/Source/index-eric6.E5Utilities.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/index-eric6.E5Utilities.html	Sun Oct 11 17:56:02 2020 +0200
@@ -33,5 +33,9 @@
 <td><a href="eric6.E5Utilities.E5Cache.html">E5Cache</a></td>
 <td>Module implementing classes used for caching objects.</td>
 </tr>
+<tr>
+<td><a href="eric6.E5Utilities.E5MutexLocker.html">E5MutexLocker</a></td>
+<td>Module implementing a context manager locking and unlocking a mutex.</td>
+</tr>
 </table>
 </body></html>
\ No newline at end of file

--- a/eric6/Documentation/Source/index-eric6.Plugins.WizardPlugins.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/index-eric6.Plugins.WizardPlugins.html	Sun Oct 11 17:56:02 2020 +0200
@@ -65,10 +65,6 @@
 <td>Package implementing the Python re wizard.</td>
 </tr>
 <tr>
-<td><a href="index-eric6.Plugins.WizardPlugins.QRegExpWizard.html">QRegExpWizard</a></td>
-<td>Package implementing the QRegExp wizard.</td>
-</tr>
-<tr>
 <td><a href="index-eric6.Plugins.WizardPlugins.QRegularExpressionWizard.html">QRegularExpressionWizard</a></td>
 <td>Package implementing the QRegularExpression wizard.</td>
 </tr>

--- a/eric6/Documentation/Source/index-eric6.Plugins.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/index-eric6.Plugins.html	Sun Oct 11 17:56:02 2020 +0200
@@ -146,10 +146,6 @@
 <td>Module implementing the QMessageBox wizard plugin.</td>
 </tr>
 <tr>
-<td><a href="eric6.Plugins.PluginWizardQRegExp.html">PluginWizardQRegExp</a></td>
-<td>Module implementing the QRegExp wizard plugin.</td>
-</tr>
-<tr>
 <td><a href="eric6.Plugins.PluginWizardQRegularExpression.html">PluginWizardQRegularExpression</a></td>
 <td>Module implementing the QRegularExpression wizard plugin.</td>
 </tr>

--- a/eric6/Documentation/Source/index-eric6.QScintilla.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/index-eric6.QScintilla.html	Sun Oct 11 17:56:02 2020 +0200
@@ -98,7 +98,7 @@
 </tr>
 <tr>
 <td><a href="eric6.QScintilla.MiniEditor.html">MiniEditor</a></td>
-<td>Module implementing a minimalistic editor for simple editing tasks.</td>
+<td>Module implementing an editor for simple editing tasks.</td>
 </tr>
 <tr>
 <td><a href="eric6.QScintilla.Printer.html">Printer</a></td>

--- a/eric6/Documentation/Source/index-eric6.ViewManager.html	Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/index-eric6.ViewManager.html	Sun Oct 11 17:56:02 2020 +0200
@@ -45,7 +45,7 @@
 </tr>
 <tr>
 <td><a href="eric6.ViewManager.ViewManager.html">ViewManager</a></td>
-<td>Module implementing the viewmanager base class.</td>
+<td>Module implementing the view manager base class.</td>
 </tr>
 <tr>
 <td><a href="eric6.ViewManager.__init__.html">ViewManager</a></td>