Mercurial Repositories > eric / file diff

--- 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)