Regenerated source docu.

Sat, 11 Mar 2017 19:18:57 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 11 Mar 2017 19:18:57 +0100
changeset 5606
da305d172769
parent 5605
1950fe1a32c4
child 5607
3bf41677d8ee

Regenerated source docu.

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Cooperation.ChatWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.DataViews.CodeMetrics.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.DebugClients.Python.DebugBase.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.DebugClients.Python.DebugUtilities.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.DebugClients.Python.ThreadExtension.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Debugger.DebugServer.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Debugger.DebugViewer.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Debugger.DebuggerInterfaceNone.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Debugger.DebuggerInterfacePython2.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Debugger.DebuggerInterfacePython3.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Debugger.EditBreakpointDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Debugger.StartDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.DocumentationTools.ModuleDocumentor.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.E5Graphics.E5ArrowItem.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.E5Graphics.E5GraphicsView.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.E5Gui.E5Application.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.E5Gui.E5FileDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.E5Gui.E5ProgressDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.E5Gui.E5TreeWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Globals.compatibility_fixes.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Graphics.AssociationItem.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Graphics.UMLGraphicsView.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Graphics.UMLItem.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockRule.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockTreeWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.__init__.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.HelpIndexWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Helpviewer.WebPlugins.ClickToFlash.ClickToFlash.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.HexEdit.HexEditSearchReplaceWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.HexEdit.HexEditWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardCharactersDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Preferences.ConfigurationPages.EditorFilePage.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Project.AddDirectoryDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Project.AddFileDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Project.Project.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Project.ProjectBaseBrowser.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Project.ProjectTranslationsBrowser.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.PyUnit.UnittestDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.QScintilla.Editor.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.QScintilla.EditorButtonsWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.QScintilla.Exporters.ExporterBase.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.QScintilla.Exporters.__init__.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.QScintilla.Shell.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Tasks.TaskFilter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.UI.Browser.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.UI.CompareDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.UI.NumbersWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.UI.UserInterface.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Utilities.ClassBrowsers.ClbrBaseClasses.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Utilities.ClassBrowsers.idlclbr.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Utilities.ClassBrowsers.pyclbr.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Utilities.ClassBrowsers.rbclbr.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Utilities.ModuleParser.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Utilities.__init__.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Utilities.binplistlib.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Utilities.crypto.py3AES.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Utilities.crypto.py3PBKDF2.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Utilities.uic.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.VCS.VersionControl.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.ViewManager.ViewManager.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockRule.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockTreeWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.__init__.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.QtHelp.HelpIndexWidget.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.TabManager.TabManagerWidget.html file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric6.api	Sat Mar 11 19:17:59 2017 +0100
+++ b/APIs/Python3/eric6.api	Sat Mar 11 19:18:57 2017 +0100
@@ -95,7 +95,7 @@
 eric6.DataViews.CodeMetrics.NEWLINE?7
 eric6.DataViews.CodeMetrics.Parser.parse?4(text)
 eric6.DataViews.CodeMetrics.SourceStat.dedent?4(tok)
-eric6.DataViews.CodeMetrics.SourceStat.getCounter?4(id, key)
+eric6.DataViews.CodeMetrics.SourceStat.getCounter?4(counterId, key)
 eric6.DataViews.CodeMetrics.SourceStat.inc?4(key, value=1)
 eric6.DataViews.CodeMetrics.SourceStat.indent?4(tok)
 eric6.DataViews.CodeMetrics.SourceStat.push?4(identifier, row)
@@ -182,7 +182,7 @@
 eric6.DebugClients.Python.DebugBase.DebugBase.pathsToSkip?7
 eric6.DebugClients.Python.DebugBase.DebugBase.profile?4(frame, event, arg)
 eric6.DebugClients.Python.DebugBase.DebugBase.profileWithRecursion?4(frame, event, arg)
-eric6.DebugClients.Python.DebugBase.DebugBase.run?4(cmd, globals=None, locals=None, debug=True)
+eric6.DebugClients.Python.DebugBase.DebugBase.run?4(cmd, globalsDict=None, localsDict=None, debug=True)
 eric6.DebugClients.Python.DebugBase.DebugBase.setRecursionDepth?4(frame)
 eric6.DebugClients.Python.DebugBase.DebugBase.set_continue?4(special)
 eric6.DebugClients.Python.DebugBase.DebugBase.set_next?4(frame)
@@ -230,7 +230,7 @@
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.sendPassiveStartup?4(filename, exceptions)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.sendResponseLine?4(stack)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.sendSyntaxError?4(message, filename, lineno, charno)
-eric6.DebugClients.Python.DebugClientBase.DebugClientBase.sessionClose?4(exit=True)
+eric6.DebugClients.Python.DebugClientBase.DebugClientBase.sessionClose?4(terminate=True)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.startDebugger?4(filename=None, host=None, port=None, enableTrace=True, exceptions=True, tracePython=False, redirect=True)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.startProgInDebugger?4(progargs, wd='', host=None, port=None, exceptions=True, tracePython=False, redirect=True)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.writeReady?4(stream)
@@ -252,7 +252,7 @@
 eric6.DebugClients.Python.DebugConfig.ConfigVarTypeStrings?7
 eric6.DebugClients.Python.DebugUtilities.ArgInfo?7
 eric6.DebugClients.Python.DebugUtilities._getfullargs?5(co)
-eric6.DebugClients.Python.DebugUtilities.formatargvalues?4(args, varargs, varkw, locals, formatarg=str, formatvarargs=lambda name: '*' + name, formatvarkw=lambda name: '**' + name, formatvalue=lambda value: '=' + repr(value))
+eric6.DebugClients.Python.DebugUtilities.formatargvalues?4(args, varargs, varkw, localsDict, formatarg=str, formatvarargs=lambda name: '*' + name, formatvarkw=lambda name: '**' + name, formatvalue=lambda value: '=' + repr(value))
 eric6.DebugClients.Python.DebugUtilities.getargvalues?4(frame)
 eric6.DebugClients.Python.DebugUtilities.prepareJsonCommand?4(method, params)
 eric6.DebugClients.Python.DebugVariables.ArrayResolver.TypeCodeMap?7
@@ -308,7 +308,7 @@
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.getExecutedFrame?4(frame)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.load_module?4(fullname)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.lockClient?4(blocking=True)
-eric6.DebugClients.Python.ThreadExtension.ThreadExtension.setCurrentThread?4(id)
+eric6.DebugClients.Python.ThreadExtension.ThreadExtension.setCurrentThread?4(threadId)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.threadTerminated?4(threadId)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.unlockClient?4()
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.updateThreadList?4()
@@ -409,16 +409,16 @@
 eric6.Debugger.DebugServer.DebugServer.clientUtPrepared?4(result, exceptionType, exceptionValue)
 eric6.Debugger.DebugServer.DebugServer.clientUtStartTest?4(testname, doc)
 eric6.Debugger.DebugServer.DebugServer.clientUtStopTest?4()
-eric6.Debugger.DebugServer.DebugServer.clientUtTestErrored?4(testname, traceback, id)
-eric6.Debugger.DebugServer.DebugServer.clientUtTestFailed?4(testname, traceback, id)
-eric6.Debugger.DebugServer.DebugServer.clientUtTestFailedExpected?4(testname, traceback, id)
-eric6.Debugger.DebugServer.DebugServer.clientUtTestSkipped?4(testname, reason, id)
-eric6.Debugger.DebugServer.DebugServer.clientUtTestSucceededUnexpected?4(testname, id)
+eric6.Debugger.DebugServer.DebugServer.clientUtTestErrored?4(testname, traceback, testId)
+eric6.Debugger.DebugServer.DebugServer.clientUtTestFailed?4(testname, traceback, testId)
+eric6.Debugger.DebugServer.DebugServer.clientUtTestFailedExpected?4(testname, traceback, testId)
+eric6.Debugger.DebugServer.DebugServer.clientUtTestSkipped?4(testname, reason, testId)
+eric6.Debugger.DebugServer.DebugServer.clientUtTestSucceededUnexpected?4(testname, testId)
 eric6.Debugger.DebugServer.DebugServer.clientVariable?7
 eric6.Debugger.DebugServer.DebugServer.clientVariables?7
 eric6.Debugger.DebugServer.DebugServer.clientWatchConditionError?7
 eric6.Debugger.DebugServer.DebugServer.getBreakPointModel?4()
-eric6.Debugger.DebugServer.DebugServer.getClientCapabilities?4(type)
+eric6.Debugger.DebugServer.DebugServer.getClientCapabilities?4(clientType)
 eric6.Debugger.DebugServer.DebugServer.getClientInterpreter?4()
 eric6.Debugger.DebugServer.DebugServer.getExtensions?4(language)
 eric6.Debugger.DebugServer.DebugServer.getHostAddress?4(localhost)
@@ -430,11 +430,11 @@
 eric6.Debugger.DebugServer.DebugServer.preferencesChanged?4()
 eric6.Debugger.DebugServer.DebugServer.registerDebuggerInterface?4(name, getRegistryData)
 eric6.Debugger.DebugServer.DebugServer.remoteBanner?4()
-eric6.Debugger.DebugServer.DebugServer.remoteBreakpoint?4(fn, line, set, cond=None, temp=False)
+eric6.Debugger.DebugServer.DebugServer.remoteBreakpoint?4(fn, line, setBreakpoint, cond=None, temp=False)
 eric6.Debugger.DebugServer.DebugServer.remoteCapabilities?4()
-eric6.Debugger.DebugServer.DebugServer.remoteClientSetFilter?4(scope, filter)
-eric6.Debugger.DebugServer.DebugServer.remoteClientVariable?4(scope, filter, var, framenr=0)
-eric6.Debugger.DebugServer.DebugServer.remoteClientVariables?4(scope, filter, framenr=0)
+eric6.Debugger.DebugServer.DebugServer.remoteClientSetFilter?4(scope, filterStr)
+eric6.Debugger.DebugServer.DebugServer.remoteClientVariable?4(scope, filterList, var, framenr=0)
+eric6.Debugger.DebugServer.DebugServer.remoteClientVariables?4(scope, filterList, framenr=0)
 eric6.Debugger.DebugServer.DebugServer.remoteCompletion?4(text)
 eric6.Debugger.DebugServer.DebugServer.remoteContinue?4(special=False)
 eric6.Debugger.DebugServer.DebugServer.remoteCoverage?4(fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="")
@@ -532,9 +532,9 @@
 eric6.Debugger.DebugViewer.DebugViewer.setLocalsFilter?4()
 eric6.Debugger.DebugViewer.DebugViewer.setVariablesFilter?4(globalsFilter, localsFilter)
 eric6.Debugger.DebugViewer.DebugViewer.showThreadList?4(currentID, threadList)
-eric6.Debugger.DebugViewer.DebugViewer.showVariable?4(vlist, globals)
-eric6.Debugger.DebugViewer.DebugViewer.showVariables?4(vlist, globals)
-eric6.Debugger.DebugViewer.DebugViewer.showVariablesTab?4(globals)
+eric6.Debugger.DebugViewer.DebugViewer.showVariable?4(vlist, showGlobals)
+eric6.Debugger.DebugViewer.DebugViewer.showVariables?4(vlist, showGlobals)
+eric6.Debugger.DebugViewer.DebugViewer.showVariablesTab?4(showGlobals)
 eric6.Debugger.DebugViewer.DebugViewer.sourceFile?7
 eric6.Debugger.DebugViewer.DebugViewer?1(debugServer, docked, vm, parent=None, embeddedShell=True, embeddedBrowser=True)
 eric6.Debugger.DebuggerInterfaceNone.ClientDefaultCapabilities?7
@@ -543,13 +543,13 @@
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.getClientCapabilities?4()
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.isConnected?4()
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.newConnection?4(sock)
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpoint?4(fn, line, set, cond=None, temp=False)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpoint?4(fn, line, setBreakpoint, cond=None, temp=False)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpointEnable?4(fn, line, enable)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpointIgnore?4(fn, line, count)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteCapabilities?4()
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientSetFilter?4(scope, filter)
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariable?4(scope, filter, var, framenr=0)
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariables?4(scope, filter, framenr=0)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientSetFilter?4(scope, filterStr)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariable?4(scope, filterList, var, framenr=0)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariables?4(scope, filterList, framenr=0)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteCompletion?4(text)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteContinue?4(special=False)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteCoverage?4(fn, argv, wd, erase=False)
@@ -569,7 +569,7 @@
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteUTPrepare?4(fn, tn, tfn, failed, cov, covname, coverase)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteUTRun?4()
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteUTStop?4()
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpoint?4(cond, set, temp=False)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpoint?4(cond, setWatch, temp=False)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpointEnable?4(cond, enable)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpointIgnore?4(cond, count)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.setCallTraceEnabled?4(on)
@@ -589,9 +589,9 @@
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteBreakpointEnable?4(fn, line, enable)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteBreakpointIgnore?4(fn, line, count)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteCapabilities?4()
-eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientSetFilter?4(scope, filter)
-eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientVariable?4(scope, filter, var, framenr=0)
-eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientVariables?4(scope, filter, framenr=0)
+eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientSetFilter?4(scope, filterStr)
+eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientVariable?4(scope, filterList, var, framenr=0)
+eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientVariables?4(scope, filterList, framenr=0)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteCompletion?4(text)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteContinue?4(special=False)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteCoverage?4(fn, argv, wd, erase=False)
@@ -630,9 +630,9 @@
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteBreakpointEnable?4(fn, line, enable)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteBreakpointIgnore?4(fn, line, count)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteCapabilities?4()
-eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientSetFilter?4(scope, filter)
-eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariable?4(scope, filter, var, framenr=0)
-eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariables?4(scope, filter, framenr=0)
+eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientSetFilter?4(scope, filterStr)
+eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariable?4(scope, filterList, var, framenr=0)
+eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariables?4(scope, filterList, framenr=0)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteCompletion?4(text)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteContinue?4(special=False)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteCoverage?4(fn, argv, wd, erase=False)
@@ -664,7 +664,7 @@
 eric6.Debugger.EditBreakpointDialog.EditBreakpointDialog.getAddData?4()
 eric6.Debugger.EditBreakpointDialog.EditBreakpointDialog.getData?4()
 eric6.Debugger.EditBreakpointDialog.EditBreakpointDialog.on_filenamePicker_editTextChanged?4(fn)
-eric6.Debugger.EditBreakpointDialog.EditBreakpointDialog?1(id, properties, condHistory, parent=None, name=None, modal=False, addMode=False, filenameHistory=None)
+eric6.Debugger.EditBreakpointDialog.EditBreakpointDialog?1(breakPointId, properties, condHistory, parent=None, name=None, modal=False, addMode=False, filenameHistory=None)
 eric6.Debugger.EditWatchpointDialog.EditWatchpointDialog.getData?4()
 eric6.Debugger.EditWatchpointDialog.EditWatchpointDialog?1(properties, parent=None, name=None, modal=False)
 eric6.Debugger.ExceptionLogger.ExceptionLogger.addException?4(exceptionType, exceptionMessage, stackTrace)
@@ -688,7 +688,7 @@
 eric6.Debugger.StartDialog.StartDialog.historiesModified?4()
 eric6.Debugger.StartDialog.StartDialog.on_buttonBox_clicked?4(button)
 eric6.Debugger.StartDialog.StartDialog.on_modFuncCombo_editTextChanged?4()
-eric6.Debugger.StartDialog.StartDialog?1(caption, argvList, wdList, envList, exceptions, parent=None, type=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False)
+eric6.Debugger.StartDialog.StartDialog?1(caption, argvList, wdList, envList, exceptions, parent=None, dialogType=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False)
 eric6.Debugger.StartHistoryEditDialog.StartHistoryEditDialog.getHistory?4()
 eric6.Debugger.StartHistoryEditDialog.StartHistoryEditDialog.on_deleteAllButton_clicked?4()
 eric6.Debugger.StartHistoryEditDialog.StartHistoryEditDialog.on_deleteButton_clicked?4()
@@ -851,7 +851,7 @@
 eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setEndPoint?4(x, y)
 eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setPoints?4(xa, ya, xb, yb)
 eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setStartPoint?4(x, y)
-eric6.E5Graphics.E5ArrowItem.E5ArrowItem?1(origin=QPointF(), end=QPointF(), filled=False, type=NormalArrow, parent=None)
+eric6.E5Graphics.E5ArrowItem.E5ArrowItem?1(origin=QPointF(), end=QPointF(), filled=False, arrowType=NormalArrow, parent=None)
 eric6.E5Graphics.E5ArrowItem.NormalArrow?7
 eric6.E5Graphics.E5ArrowItem.WideArrow?7
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.ZoomLevelDefault?7
@@ -862,7 +862,7 @@
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.filteredItems?4(items)
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.printDiagram?4(printer, diagramName="")
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.resizeScene?4(amount, isWidth=True)
-eric6.E5Graphics.E5GraphicsView.E5GraphicsView.saveImage?4(filename, format="PNG")
+eric6.E5Graphics.E5GraphicsView.E5GraphicsView.saveImage?4(filename, imageFormat="PNG")
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.setSceneSize?4(width, height)
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.setZoom?4(value)
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.zoom?4()
@@ -891,8 +891,8 @@
 eric6.E5Gui.E5Application.E5Application.getPluginObject?4(name)
 eric6.E5Gui.E5Application.E5Application.getPluginObjectType?4(name)
 eric6.E5Gui.E5Application.E5Application.getPluginObjects?4()
-eric6.E5Gui.E5Application.E5Application.registerObject?4(name, object)
-eric6.E5Gui.E5Application.E5Application.registerPluginObject?4(name, object, pluginType=None)
+eric6.E5Gui.E5Application.E5Application.registerObject?4(name, objectRef)
+eric6.E5Gui.E5Application.E5Application.registerPluginObject?4(name, objectRef, pluginType=None)
 eric6.E5Gui.E5Application.E5Application.unregisterPluginObject?4(name)
 eric6.E5Gui.E5Application.E5Application?1(argv)
 eric6.E5Gui.E5Application.e5App?7
@@ -930,12 +930,12 @@
 eric6.E5Gui.E5FileDialog.ReadOnly?7
 eric6.E5Gui.E5FileDialog.ShowDirsOnly?7
 eric6.E5Gui.E5FileDialog.getExistingDirectory?4(parent=None, caption="", directory="", options=QFileDialog.ShowDirsOnly)
-eric6.E5Gui.E5FileDialog.getOpenFileName?4(parent=None, caption="", directory="", filter="", options=QFileDialog.Options())
-eric6.E5Gui.E5FileDialog.getOpenFileNameAndFilter?4(parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options())
-eric6.E5Gui.E5FileDialog.getOpenFileNames?4(parent=None, caption="", directory="", filter="", options=QFileDialog.Options())
-eric6.E5Gui.E5FileDialog.getOpenFileNamesAndFilter?4(parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options())
-eric6.E5Gui.E5FileDialog.getSaveFileName?4(parent=None, caption="", directory="", filter="", options=QFileDialog.Options())
-eric6.E5Gui.E5FileDialog.getSaveFileNameAndFilter?4(parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options())
+eric6.E5Gui.E5FileDialog.getOpenFileName?4(parent=None, caption="", directory="", filterStr="", options=QFileDialog.Options())
+eric6.E5Gui.E5FileDialog.getOpenFileNameAndFilter?4(parent=None, caption="", directory="", filterStr="", initialFilter="", options=QFileDialog.Options())
+eric6.E5Gui.E5FileDialog.getOpenFileNames?4(parent=None, caption="", directory="", filterStr="", options=QFileDialog.Options())
+eric6.E5Gui.E5FileDialog.getOpenFileNamesAndFilter?4(parent=None, caption="", directory="", filterStr="", initialFilter="", options=QFileDialog.Options())
+eric6.E5Gui.E5FileDialog.getSaveFileName?4(parent=None, caption="", directory="", filterStr="", options=QFileDialog.Options())
+eric6.E5Gui.E5FileDialog.getSaveFileNameAndFilter?4(parent=None, caption="", directory="", filterStr="", initialFilter="", options=QFileDialog.Options())
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.createRules?4(*rules)
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.formats?4(line)
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.generateRules?4()
@@ -1190,8 +1190,8 @@
 eric6.E5Gui.E5PathPicker.E5PathPickerModes.SaveFileMode?7
 eric6.E5Gui.E5PathPicker.E5PathPickerModes.SaveFileOverwriteMode?7
 eric6.E5Gui.E5ProgressDialog.E5ProgressDialog.format?4()
-eric6.E5Gui.E5ProgressDialog.E5ProgressDialog.setFormat?4(format)
-eric6.E5Gui.E5ProgressDialog.E5ProgressDialog?1(labelText, cancelButtonText, minimum, maximum, format=None, parent=None, flags=Qt.WindowFlags())
+eric6.E5Gui.E5ProgressDialog.E5ProgressDialog.setFormat?4(labelFormat)
+eric6.E5Gui.E5ProgressDialog.E5ProgressDialog?1(labelText, cancelButtonText, minimum, maximum, labelFormat=None, parent=None, flags=Qt.WindowFlags())
 eric6.E5Gui.E5SideBar.E5SideBar.East?7
 eric6.E5Gui.E5SideBar.E5SideBar.North?7
 eric6.E5Gui.E5SideBar.E5SideBar.South?7
@@ -1363,7 +1363,7 @@
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.clear?4()
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.deleteItem?4(item)
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.deleteItems?4(items)
-eric6.E5Gui.E5TreeWidget.E5TreeWidget.filterString?4(filter)
+eric6.E5Gui.E5TreeWidget.E5TreeWidget.filterString?4(filterStr)
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.insertTopLevelItem?4(index, item)
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.insertTopLevelItems?4(index, items)
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.itemControlClicked?7
@@ -1646,7 +1646,7 @@
 eric6.Globals.compatibility_fixes.find_moduleAsStr?4(*args)
 eric6.Globals.compatibility_fixes.joinAsUnicode?4(*args)
 eric6.Globals.compatibility_fixes.load_sourceAsStr?4(*args)
-eric6.Globals.compatibility_fixes.open?4(file, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True)
+eric6.Globals.compatibility_fixes.open?4(filein, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True)
 eric6.Globals.configDir?7
 eric6.Globals.findPythonInterpreters?4(pyVersion)
 eric6.Globals.getConfigDir?4()
@@ -1679,7 +1679,7 @@
 eric6.Graphics.AssociationItem.AssociationItem.parseAssociationItemDataString?4(data)
 eric6.Graphics.AssociationItem.AssociationItem.unassociate?4()
 eric6.Graphics.AssociationItem.AssociationItem.widgetMoved?4()
-eric6.Graphics.AssociationItem.AssociationItem?1(itemA, itemB, type=Normal, topToBottom=False, parent=None)
+eric6.Graphics.AssociationItem.AssociationItem?1(itemA, itemB, assocType=Normal, topToBottom=False, parent=None)
 eric6.Graphics.AssociationItem.Center?7
 eric6.Graphics.AssociationItem.East?7
 eric6.Graphics.AssociationItem.Generalisation?7
@@ -1772,7 +1772,7 @@
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.autoAdjustSceneSize?4(limit=False)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.event?4(evt)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.filteredItems?4(items, itemType=UMLItem)
-eric6.Graphics.UMLGraphicsView.UMLGraphicsView.findItem?4(id)
+eric6.Graphics.UMLGraphicsView.UMLGraphicsView.findItem?4(itemId)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.findItemByName?4(name)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.gestureEvent?4(evt)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.getItemId?4()
@@ -1802,7 +1802,7 @@
 eric6.Graphics.UMLItem.UMLItem.parseItemDataString?4(version, data)
 eric6.Graphics.UMLItem.UMLItem.removeAssociation?4(assoc)
 eric6.Graphics.UMLItem.UMLItem.removeAssociations?4()
-eric6.Graphics.UMLItem.UMLItem.setId?4(id)
+eric6.Graphics.UMLItem.UMLItem.setId?4(itemId)
 eric6.Graphics.UMLItem.UMLItem.setPos?4(x, y)
 eric6.Graphics.UMLItem.UMLItem.setSize?4(width, height)
 eric6.Graphics.UMLItem.UMLItem?1(model=None, x=0, y=0, rounded=False, parent=None)
@@ -1814,10 +1814,10 @@
 eric6.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply.abort?4()
 eric6.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply.readData?4(maxlen)
 eric6.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply?1(request, subscription, rule, parent=None)
-eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(filter)
+eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(filterRule)
 eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addSubscription?4(subscription, refresh=True)
 eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_adBlockGroup_toggled?4(state)
-eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_searchEdit_textChanged?4(filter)
+eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_searchEdit_textChanged?4(filterRule)
 eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_subscriptionsTabWidget_currentChanged?4(index)
 eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_updateSpinBox_valueChanged?4(value)
 eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.showRule?4(rule)
@@ -1887,10 +1887,10 @@
 eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.networkMatch?4(request, domain, encodedUrl)
 eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setEnabled?4(enabled)
 eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setException?4(exception)
-eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setFilter?4(filter)
+eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setFilter?4(filterRule)
 eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.subscription?4()
 eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.urlMatch?4(url)
-eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule?1(filter="", subscription=None)
+eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule?1(filterRule="", subscription=None)
 eric6.Helpviewer.AdBlock.AdBlockRule.toSecondLevelDomain?4(url)
 eric6.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.adBlockDisabledForUrl?4(url)
 eric6.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.addRule?4(rule)
@@ -1922,7 +1922,7 @@
 eric6.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.updateNow?4()
 eric6.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.url?4()
 eric6.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription?1(url, custom, parent=None, default=False)
-eric6.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.addRule?4(filter="")
+eric6.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.addRule?4(filterRule="")
 eric6.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.keyPressEvent?4(evt)
 eric6.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.refresh?4()
 eric6.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.removeRule?4()
@@ -1980,44 +1980,44 @@
 eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter?1(id="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter?1(sourceId="", parent=None)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.getImporterInfo?4(id)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.getImporter?4(id, parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.getImporterInfo?4(sourceId)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.getImporter?4(sourceId, parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.getImporters?4()
 eric6.Helpviewer.Bookmarks.BookmarksManager.BOOKMARKBAR?7
 eric6.Helpviewer.Bookmarks.BookmarksManager.BOOKMARKMENU?7
@@ -2297,7 +2297,7 @@
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_addWhiteButton_clicked?4()
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_blackList_itemSelectionChanged?4()
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_cookiesList_currentItemChanged?4(current, previous)
-eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_filterEdit_textChanged?4(filter)
+eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_filterEdit_textChanged?4(filterStr)
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_reloadButton_clicked?4()
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_removeAllButton_clicked?4()
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_removeBlackButton_clicked?4()
@@ -3406,7 +3406,7 @@
 eric6.HexEdit.HexEditWidget.HexEditWidget.redo?4()
 eric6.HexEdit.HexEditWidget.HexEditWidget.remove?4(pos, length=1)
 eric6.HexEdit.HexEditWidget.HexEditWidget.replace?4(pos, ch)
-eric6.HexEdit.HexEditWidget.HexEditWidget.replaceByteArray?4(pos, len, byteArray)
+eric6.HexEdit.HexEditWidget.HexEditWidget.replaceByteArray?4(pos, length, byteArray)
 eric6.HexEdit.HexEditWidget.HexEditWidget.resizeEvent?4(evt)
 eric6.HexEdit.HexEditWidget.HexEditWidget.revertToUnmodified?4()
 eric6.HexEdit.HexEditWidget.HexEditWidget.selectAll?4()
@@ -3908,7 +3908,7 @@
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.extractLineFlags?4(line, startComment=")
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.initBatchService?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.initService?4()
-eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.worker?4(input, output)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.worker?4(inputQueue, outputQueue)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.availableFutures?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.check?4(codestring='')
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.checkBatch?4()
@@ -4164,7 +4164,7 @@
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.normalizeCode?4(codestring)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.syntaxAndPyflakesBatchCheck?4(argumentsList, send, fx, cancelled)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.syntaxAndPyflakesCheck?4(filename, codestring, checkFlakes=True, ignoreStarImportWarnings=False)
-eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.worker?4(input, output)
+eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.worker?4(inputQueue, outputQueue)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckService.SyntaxCheckService.addLanguage?4(lang, env, path, module, getArgs, getExt, callback, onError)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckService.SyntaxCheckService.batchFinished?7
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckService.SyntaxCheckService.batchJobDone?4(fx, lang)
@@ -4199,7 +4199,7 @@
 eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.jsSyntaxBatchCheck?4(argumentsList, send, fx, cancelled)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.jsSyntaxCheck?4(file, codestring)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.normalizeCode?4(codestring)
-eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.worker?4(input, output)
+eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.worker?4(inputQueue, outputQueue)
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.NannyNag.get_line?4()
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.NannyNag.get_lineno?4()
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.NannyNag.get_msg?4()
@@ -4217,7 +4217,7 @@
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.initBatchService?4()
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.initService?4()
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.process_tokens?4(tokens)
-eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.worker?4(input, output)
+eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.worker?4(inputQueue, outputQueue)
 eric6.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog.check?4(codestring='')
 eric6.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog.checkBatch?4()
 eric6.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog.filenameRole?7
@@ -4778,7 +4778,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.isExecuting?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.myprompt?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.restartServer?4()
-eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.runcommand?4(args, prompt=None, input=None, output=None, error=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.runcommand?4(args, prompt=None, inputData=None, output=None, error=None)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.startServer?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.stopServer?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.wasCanceled?4()
@@ -5119,8 +5119,8 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.PurgeProjectHelper.initMenu?4(mainMenu)
 eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.PurgeProjectHelper.menuTitle?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.PurgeProjectHelper?1()
-eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.hgPurge?4(name, all=False)
-eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.hgPurgeList?4(name, all=False)
+eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.hgPurge?4(name, deleteAll=False)
+eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.hgPurgeList?4(name, deleteAll=False)
 eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.shutdown?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge?1(vcs)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesDefineGuardsDialog.HgQueuesDefineGuardsDialog.closeEvent?4(e)
@@ -5196,7 +5196,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.QUEUE_PURGE?7
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.SERIES_LIST?7
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.UNAPPLIED_LIST?7
-eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.getGuardsList?4(repodir, all=True)
+eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.getGuardsList?4(repodir, allGuards=True)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueCreateRenameQueue?4(name, isCreate)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueDeletePatch?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueDeletePurgeActivateQueue?4(name, operation)
@@ -5213,7 +5213,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueListPatches?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueListQueues?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueNewPatch?4(name)
-eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueuePushPopPatches?4(name, operation, all=False, named=False, force=False)
+eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueuePushPopPatches?4(name, operation, doAll=False, named=False, force=False)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueRefreshPatch?4(name, editMessage=False)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueRenamePatch?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueShowHeader?4(name)
@@ -5870,7 +5870,7 @@
 eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsTag?4(name)
 eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsUpdate?4(name, noDialog=False)
 eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion?1(plugin, parent=None, name=None)
-eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._addView?5(win, fn=None, noName="", next=False)
+eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._addView?5(win, fn=None, noName="", addNext=False)
 eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._initWindowActions?5()
 eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._modificationStatusChanged?5(m, editor)
 eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._removeAllViews?5()
@@ -5937,14 +5937,14 @@
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.currentWidget?4()
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.hasEditor?4(editor)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.hasEditors?4()
-eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.indexOf?4(object)
+eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.indexOf?4(widget)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.insertWidget?4(index, assembly, title)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.mouseDoubleClickEvent?4(event)
-eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.removeWidget?4(object)
+eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.removeWidget?4(widget)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.setCurrentWidget?4(assembly)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.showIndicator?4(on)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget?1(vm)
-eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._addView?5(win, fn=None, noName="", next=False)
+eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._addView?5(win, fn=None, noName="", addNext=False)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._initWindowActions?5()
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._modificationStatusChanged?5(m, editor)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._removeAllViews?5()
@@ -6738,12 +6738,12 @@
 eric6.Preferences.toList?4(value)
 eric6.Project.AddDirectoryDialog.AddDirectoryDialog.getData?4()
 eric6.Project.AddDirectoryDialog.AddDirectoryDialog.on_filterComboBox_highlighted?4(fileType)
-eric6.Project.AddDirectoryDialog.AddDirectoryDialog.on_sourceDirPicker_textChanged?4(dir)
-eric6.Project.AddDirectoryDialog.AddDirectoryDialog?1(pro, filter='source', parent=None, name=None, startdir=None)
+eric6.Project.AddDirectoryDialog.AddDirectoryDialog.on_sourceDirPicker_textChanged?4(directory)
+eric6.Project.AddDirectoryDialog.AddDirectoryDialog?1(pro, fileTypeFilter='source', parent=None, name=None, startdir=None)
 eric6.Project.AddFileDialog.AddFileDialog.getData?4()
 eric6.Project.AddFileDialog.AddFileDialog.on_sourceFilesPicker_aboutToShowPathPickerDialog?4()
 eric6.Project.AddFileDialog.AddFileDialog.on_sourceFilesPicker_textChanged?4(sfile)
-eric6.Project.AddFileDialog.AddFileDialog?1(pro, parent=None, filter=None, name=None, startdir=None)
+eric6.Project.AddFileDialog.AddFileDialog?1(pro, parent=None, fileTypeFilter=None, name=None, startdir=None)
 eric6.Project.AddFoundFilesDialog.AddFoundFilesDialog.getSelection?4()
 eric6.Project.AddFoundFilesDialog.AddFoundFilesDialog.on_addAllButton_clicked?4()
 eric6.Project.AddFoundFilesDialog.AddFoundFilesDialog.on_addSelectedButton_clicked?4()
@@ -6791,9 +6791,9 @@
 eric6.Project.NewPythonPackageDialog.NewPythonPackageDialog.getData?4()
 eric6.Project.NewPythonPackageDialog.NewPythonPackageDialog.on_packageEdit_textChanged?4(txt)
 eric6.Project.NewPythonPackageDialog.NewPythonPackageDialog?1(relPath, parent=None)
-eric6.Project.Project.Project.addDirectory?4(filter=None, startdir=None)
+eric6.Project.Project.Project.addDirectory?4(fileTypeFilter=None, startdir=None)
 eric6.Project.Project.Project.addE5Actions?4(actions)
-eric6.Project.Project.Project.addFiles?4(filter=None, startdir=None)
+eric6.Project.Project.Project.addFiles?4(fileTypeFilter=None, startdir=None)
 eric6.Project.Project.Project.addIdlDir?4()
 eric6.Project.Project.Project.addIdlFiles?4()
 eric6.Project.Project.Project.addLanguage?4()
@@ -6969,7 +6969,7 @@
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._removeDir?5()
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._removeFile?5()
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._renameFile?5()
-eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._selectEntries?5(local=True, filter=None)
+eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._selectEntries?5(local=True, filterList=None)
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._selectSingleItem?5(index)
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._setItemRangeSelected?5(startIndex, endIndex, selected)
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._setItemSelected?5(index, selected)
@@ -7167,13 +7167,13 @@
 eric6.PyUnit.UnittestDialog.UnittestDialog.on_testsuitePicker_aboutToShowPathPickerDialog?4()
 eric6.PyUnit.UnittestDialog.UnittestDialog.on_testsuitePicker_editTextChanged?4(txt)
 eric6.PyUnit.UnittestDialog.UnittestDialog.on_testsuitePicker_pathSelected?4(suite)
-eric6.PyUnit.UnittestDialog.UnittestDialog.testErrored?4(test, exc, id)
-eric6.PyUnit.UnittestDialog.UnittestDialog.testFailed?4(test, exc, id)
-eric6.PyUnit.UnittestDialog.UnittestDialog.testFailedExpected?4(test, exc, id)
+eric6.PyUnit.UnittestDialog.UnittestDialog.testErrored?4(test, exc, testId)
+eric6.PyUnit.UnittestDialog.UnittestDialog.testFailed?4(test, exc, testId)
+eric6.PyUnit.UnittestDialog.UnittestDialog.testFailedExpected?4(test, exc, testId)
 eric6.PyUnit.UnittestDialog.UnittestDialog.testFinished?4()
-eric6.PyUnit.UnittestDialog.UnittestDialog.testSkipped?4(test, reason, id)
+eric6.PyUnit.UnittestDialog.UnittestDialog.testSkipped?4(test, reason, testId)
 eric6.PyUnit.UnittestDialog.UnittestDialog.testStarted?4(test, doc)
-eric6.PyUnit.UnittestDialog.UnittestDialog.testSucceededUnexpected?4(test, id)
+eric6.PyUnit.UnittestDialog.UnittestDialog.testSucceededUnexpected?4(test, testId)
 eric6.PyUnit.UnittestDialog.UnittestDialog.unittestFile?7
 eric6.PyUnit.UnittestDialog.UnittestDialog.unittestStopped?7
 eric6.PyUnit.UnittestDialog.UnittestDialog?1(prog=None, dbs=None, ui=None, fromEric=False, parent=None, name=None)
@@ -7443,7 +7443,7 @@
 eric6.QScintilla.EditorMarkerMap.EditorMarkerMap._paintIt?5(painter)
 eric6.QScintilla.EditorMarkerMap.EditorMarkerMap.initColors?4()
 eric6.QScintilla.EditorMarkerMap.EditorMarkerMap?1(parent=None)
-eric6.QScintilla.Exporters.ExporterBase.ExporterBase._getFileName?5(filter)
+eric6.QScintilla.Exporters.ExporterBase.ExporterBase._getFileName?5(fileFilter)
 eric6.QScintilla.Exporters.ExporterBase.ExporterBase.exportSource?4()
 eric6.QScintilla.Exporters.ExporterBase.ExporterBase?1(editor, parent=None)
 eric6.QScintilla.Exporters.ExporterHTML.ExporterHTML.exportSource?4()
@@ -7509,7 +7509,7 @@
 eric6.QScintilla.Exporters.ExporterTEX.ExporterTEX.CHARZ?7
 eric6.QScintilla.Exporters.ExporterTEX.ExporterTEX.exportSource?4()
 eric6.QScintilla.Exporters.ExporterTEX.ExporterTEX?1(editor, parent=None)
-eric6.QScintilla.Exporters.getExporter?4(format, editor)
+eric6.QScintilla.Exporters.getExporter?4(exporterFormat, editor)
 eric6.QScintilla.Exporters.getSupportedFormats?4()
 eric6.QScintilla.GotoDialog.GotoDialog.getLinenumber?4()
 eric6.QScintilla.GotoDialog.GotoDialog?1(maximum, curLine, parent, name=None, modal=False)
@@ -8051,7 +8051,7 @@
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setStyling?4(length, style)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setVirtualSpaceOptions?4(options)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showFindIndicator?4(sline, sindex, eline, eindex)
-eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showUserList?4(id, lst)
+eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showUserList?4(listId, lst)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.startStyling?4(pos, mask)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.styleAt?4(pos)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.updateVerticalScrollBar?4()
@@ -8097,7 +8097,7 @@
 eric6.QScintilla.Shell.Shell.event?4(evt)
 eric6.QScintilla.Shell.Shell.executeLines?4(lines)
 eric6.QScintilla.Shell.Shell.focusInEvent?4(event)
-eric6.QScintilla.Shell.Shell.focusNextPrevChild?4(next)
+eric6.QScintilla.Shell.Shell.focusNextPrevChild?4(nextChild)
 eric6.QScintilla.Shell.Shell.focusOutEvent?4(event)
 eric6.QScintilla.Shell.Shell.gestureEvent?4(evt)
 eric6.QScintilla.Shell.Shell.getClientType?4()
@@ -8282,11 +8282,11 @@
 eric6.Tasks.Task.Task?1(summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TypeTodo, project=None, description="", uid="", parentUid="")
 eric6.Tasks.TaskFilter.TaskFilter.hasActiveFilter?4()
 eric6.Tasks.TaskFilter.TaskFilter.setActive?4(enabled)
-eric6.Tasks.TaskFilter.TaskFilter.setFileNameFilter?4(filter)
+eric6.Tasks.TaskFilter.TaskFilter.setFileNameFilter?4(filterStr)
 eric6.Tasks.TaskFilter.TaskFilter.setPrioritiesFilter?4(priorities)
 eric6.Tasks.TaskFilter.TaskFilter.setScopeFilter?4(scope)
 eric6.Tasks.TaskFilter.TaskFilter.setStatusFilter?4(status)
-eric6.Tasks.TaskFilter.TaskFilter.setSummaryFilter?4(filter)
+eric6.Tasks.TaskFilter.TaskFilter.setSummaryFilter?4(filterStr)
 eric6.Tasks.TaskFilter.TaskFilter.setTypeFilter?4(taskType)
 eric6.Tasks.TaskFilter.TaskFilter.showTask?4(task)
 eric6.Tasks.TaskFilter.TaskFilter?1()
@@ -8445,9 +8445,9 @@
 eric6.UI.Browser.Browser._showGotoMenu?5()
 eric6.UI.Browser.Browser.binaryFile?7
 eric6.UI.Browser.Browser.designerFile?7
-eric6.UI.Browser.Browser.getSelectedItems?4(filter=None)
-eric6.UI.Browser.Browser.getSelectedItemsCount?4(filter=None)
-eric6.UI.Browser.Browser.getSelectedItemsCountCategorized?4(filter=None)
+eric6.UI.Browser.Browser.getSelectedItems?4(filterList=None)
+eric6.UI.Browser.Browser.getSelectedItemsCount?4(filterList=None)
+eric6.UI.Browser.Browser.getSelectedItemsCountCategorized?4(filterList=None)
 eric6.UI.Browser.Browser.handleInterpreterChanged?4(interpreter)
 eric6.UI.Browser.Browser.handlePreferencesChanged?4()
 eric6.UI.Browser.Browser.handleProgramChange?4(fn)
@@ -8465,7 +8465,7 @@
 eric6.UI.Browser.Browser.svgFile?7
 eric6.UI.Browser.Browser.trpreview?7
 eric6.UI.Browser.Browser.unittestOpen?7
-eric6.UI.Browser.Browser.wantedItem?4(itm, filter=None)
+eric6.UI.Browser.Browser.wantedItem?4(itm, filterList=None)
 eric6.UI.Browser.Browser?1(parent=None)
 eric6.UI.BrowserModel.BrowserClassAttributeItem.attributeObject?4()
 eric6.UI.BrowserModel.BrowserClassAttributeItem.fileName?4()
@@ -8804,7 +8804,7 @@
 eric6.UI.UserInterface.UserInterface.LeftSide?7
 eric6.UI.UserInterface.UserInterface.RightSide?7
 eric6.UI.UserInterface.UserInterface.activateCooperationViewer?4()
-eric6.UI.UserInterface.UserInterface.addE5Actions?4(actions, type)
+eric6.UI.UserInterface.UserInterface.addE5Actions?4(actions, actionType)
 eric6.UI.UserInterface.UserInterface.addSideWidget?4(side, widget, icon, label)
 eric6.UI.UserInterface.UserInterface.appendStderr?7
 eric6.UI.UserInterface.UserInterface.appendStdout?7
@@ -8821,7 +8821,7 @@
 eric6.UI.UserInterface.UserInterface.dragLeaveEvent?4(event)
 eric6.UI.UserInterface.UserInterface.dragMoveEvent?4(event)
 eric6.UI.UserInterface.UserInterface.dropEvent?4(event)
-eric6.UI.UserInterface.UserInterface.getActions?4(type)
+eric6.UI.UserInterface.UserInterface.getActions?4(actionType)
 eric6.UI.UserInterface.UserInterface.getHelpViewer?4(preview=False)
 eric6.UI.UserInterface.UserInterface.getLocale?4()
 eric6.UI.UserInterface.UserInterface.getMenu?4(name)
@@ -8842,7 +8842,7 @@
 eric6.UI.UserInterface.UserInterface.processArgs?4(args)
 eric6.UI.UserInterface.UserInterface.registerToolbar?4(name, text, toolbar)
 eric6.UI.UserInterface.UserInterface.reloadAPIs?7
-eric6.UI.UserInterface.UserInterface.removeE5Actions?4(actions, type='ui')
+eric6.UI.UserInterface.UserInterface.removeE5Actions?4(actions, actionType='ui')
 eric6.UI.UserInterface.UserInterface.removeSideWidget?4(widget)
 eric6.UI.UserInterface.UserInterface.reregisterToolbar?4(name, text)
 eric6.UI.UserInterface.UserInterface.setDebugProfile?4(save=True)
@@ -8883,7 +8883,7 @@
 eric6.Utilities.BackgroundService.BackgroundService?1()
 eric6.Utilities.ClassBrowsers.ClbrBaseClasses.Attribute.addAssignment?4(lineno)
 eric6.Utilities.ClassBrowsers.ClbrBaseClasses.Attribute?1(module, name, file, lineno)
-eric6.Utilities.ClassBrowsers.ClbrBaseClasses.Class?1(module, name, super, file, lineno)
+eric6.Utilities.ClassBrowsers.ClbrBaseClasses.Class?1(module, name, superClasses, file, lineno)
 eric6.Utilities.ClassBrowsers.ClbrBaseClasses.ClbrBase._addattribute?5(attr)
 eric6.Utilities.ClassBrowsers.ClbrBaseClasses.ClbrBase._addclass?5(name, _class)
 eric6.Utilities.ClassBrowsers.ClbrBaseClasses.ClbrBase._addglobal?5(attr)
@@ -8915,7 +8915,7 @@
 eric6.Utilities.ClassBrowsers.find_module?4(name, path, isPyFile=False)
 eric6.Utilities.ClassBrowsers.idlclbr.Attribute?1(module, name, file, lineno)
 eric6.Utilities.ClassBrowsers.idlclbr.Function?1(module, name, file, lineno, signature='', separator=', ')
-eric6.Utilities.ClassBrowsers.idlclbr.Interface?1(module, name, super, file, lineno)
+eric6.Utilities.ClassBrowsers.idlclbr.Interface?1(module, name, superClasses, file, lineno)
 eric6.Utilities.ClassBrowsers.idlclbr.Module?1(module, name, file, lineno)
 eric6.Utilities.ClassBrowsers.idlclbr.SUPPORTED_TYPES?7
 eric6.Utilities.ClassBrowsers.idlclbr.VisibilityMixin?1()
@@ -8939,7 +8939,7 @@
 eric6.Utilities.ClassBrowsers.jsclbr._modules?8
 eric6.Utilities.ClassBrowsers.jsclbr.readmodule_ex?4(module, path=[])
 eric6.Utilities.ClassBrowsers.pyclbr.Attribute?1(module, name, file, lineno)
-eric6.Utilities.ClassBrowsers.pyclbr.Class?1(module, name, super, file, lineno)
+eric6.Utilities.ClassBrowsers.pyclbr.Class?1(module, name, superClasses, file, lineno)
 eric6.Utilities.ClassBrowsers.pyclbr.Function?1(module, name, file, lineno, signature='', separator=', ', modifierType=ClbrBaseClasses.Function.General, annotation="")
 eric6.Utilities.ClassBrowsers.pyclbr.ImportedModule.addImport?4(lineno, importedNames)
 eric6.Utilities.ClassBrowsers.pyclbr.ImportedModule?1(module, file, importedModule)
@@ -8957,7 +8957,7 @@
 eric6.Utilities.ClassBrowsers.pyclbr._modules?8
 eric6.Utilities.ClassBrowsers.pyclbr.readmodule_ex?4(module, path=[], inpackage=False, isPyFile=False)
 eric6.Utilities.ClassBrowsers.rbclbr.Attribute?1(module, name, file, lineno)
-eric6.Utilities.ClassBrowsers.rbclbr.Class?1(module, name, super, file, lineno)
+eric6.Utilities.ClassBrowsers.rbclbr.Class?1(module, name, superClasses, file, lineno)
 eric6.Utilities.ClassBrowsers.rbclbr.Function?1(module, name, file, lineno, signature='', separator=', ')
 eric6.Utilities.ClassBrowsers.rbclbr.Module?1(module, name, file, lineno)
 eric6.Utilities.ClassBrowsers.rbclbr.SUPPORTED_TYPES?7
@@ -8982,7 +8982,7 @@
 eric6.Utilities.ModuleParser.Class.getAttribute?4(name)
 eric6.Utilities.ModuleParser.Class.getMethod?4(name)
 eric6.Utilities.ModuleParser.Class.setEndLine?4(endLineNo)
-eric6.Utilities.ModuleParser.Class?1(module, name, super, file, lineno)
+eric6.Utilities.ModuleParser.Class?1(module, name, superClasses, file, lineno)
 eric6.Utilities.ModuleParser.Function.Class?7
 eric6.Utilities.ModuleParser.Function.General?7
 eric6.Utilities.ModuleParser.Function.Static?7
@@ -9001,7 +9001,7 @@
 eric6.Utilities.ModuleParser.Module.getName?4()
 eric6.Utilities.ModuleParser.Module.getType?4()
 eric6.Utilities.ModuleParser.Module.scan?4(src)
-eric6.Utilities.ModuleParser.Module?1(name, file=None, type=None)
+eric6.Utilities.ModuleParser.Module?1(name, file=None, moduleType=None)
 eric6.Utilities.ModuleParser.PTL_SOURCE?7
 eric6.Utilities.ModuleParser.RB_SOURCE?7
 eric6.Utilities.ModuleParser.RbModule.addClass?4(name, _class)
@@ -9050,7 +9050,7 @@
 eric6.Utilities.binplistlib.PlistReader.contents?7
 eric6.Utilities.binplistlib.PlistReader.currentOffset?7
 eric6.Utilities.binplistlib.PlistReader.file?7
-eric6.Utilities.binplistlib.PlistReader.getSizedInteger?4(data, bytes)
+eric6.Utilities.binplistlib.PlistReader.getSizedInteger?4(data, length)
 eric6.Utilities.binplistlib.PlistReader.offsets?7
 eric6.Utilities.binplistlib.PlistReader.parse?4()
 eric6.Utilities.binplistlib.PlistReader.proc_extra?4()
@@ -9059,7 +9059,7 @@
 eric6.Utilities.binplistlib.PlistReader.readData?4(length)
 eric6.Utilities.binplistlib.PlistReader.readDate?4()
 eric6.Utilities.binplistlib.PlistReader.readDict?4(count)
-eric6.Utilities.binplistlib.PlistReader.readInteger?4(bytes)
+eric6.Utilities.binplistlib.PlistReader.readInteger?4(length)
 eric6.Utilities.binplistlib.PlistReader.readObject?4()
 eric6.Utilities.binplistlib.PlistReader.readReal?4(length)
 eric6.Utilities.binplistlib.PlistReader.readRefs?4(count)
@@ -9071,7 +9071,7 @@
 eric6.Utilities.binplistlib.PlistReader.trailer?7
 eric6.Utilities.binplistlib.PlistReader?1(fileOrStream)
 eric6.Utilities.binplistlib.PlistTrailer?7
-eric6.Utilities.binplistlib.PlistWriter.binaryInt?4(obj, bytes=None)
+eric6.Utilities.binplistlib.PlistWriter.binaryInt?4(obj, length=None)
 eric6.Utilities.binplistlib.PlistWriter.binaryReal?4(obj)
 eric6.Utilities.binplistlib.PlistWriter.byteCounts?7
 eric6.Utilities.binplistlib.PlistWriter.computeOffsets?4(obj, asReference=False, isRoot=False)
@@ -9130,7 +9130,7 @@
 eric6.Utilities.crypto.py3AES.AESModeOfOperation.ModeOfOperation?7
 eric6.Utilities.crypto.py3AES.AESModeOfOperation.aes?7
 eric6.Utilities.crypto.py3AES.AESModeOfOperation.decrypt?4(cipherIn, originalsize, mode, key, size, IV)
-eric6.Utilities.crypto.py3AES.AESModeOfOperation.encrypt?4(input, mode, key, size, IV)
+eric6.Utilities.crypto.py3AES.AESModeOfOperation.encrypt?4(inputData, mode, key, size, IV)
 eric6.Utilities.crypto.py3AES.append_PKCS7_padding?4(b)
 eric6.Utilities.crypto.py3AES.decryptData?4(key, data, mode=AESModeOfOperation.ModeOfOperation["CBC"])
 eric6.Utilities.crypto.py3AES.encryptData?4(key, data, mode=AESModeOfOperation.ModeOfOperation["CBC"])
@@ -9141,14 +9141,14 @@
 eric6.Utilities.crypto.py3PBKDF2.hashPasswordTuple?4(password, digestMod=hashlib.sha512, iterations=10000, saltSize=32)
 eric6.Utilities.crypto.py3PBKDF2.pbkdf2?4(password, salt, iterations, digestMod)
 eric6.Utilities.crypto.py3PBKDF2.rehashPassword?4(password, hashParameters)
-eric6.Utilities.crypto.py3PBKDF2.verifyPassword?4(password, hash)
+eric6.Utilities.crypto.py3PBKDF2.verifyPassword?4(password, pwHash)
 eric6.Utilities.decode?4(text)
 eric6.Utilities.decodeBytes?4(buffer)
 eric6.Utilities.decodeString?4(text)
 eric6.Utilities.determinePythonVersion?4(filename, source, editor=None)
 eric6.Utilities.direntries?4(path, filesonly=False, pattern=None, followsymlinks=True, checkStop=None)
 eric6.Utilities.encode?4(text, orig_coding)
-eric6.Utilities.escape_entities?4(m, map=_escape_map)
+eric6.Utilities.escape_entities?4(m, escmap=_escape_map)
 eric6.Utilities.escape_uentities?4(m)
 eric6.Utilities.extractFlags?4(text)
 eric6.Utilities.extractFlagsFromFile?4(filename)
@@ -9208,7 +9208,7 @@
 eric6.Utilities.supportedCodecs?7
 eric6.Utilities.toBool?4(dataStr)
 eric6.Utilities.toNativeSeparators?4(path)
-eric6.Utilities.uic.compileUiFiles?4(dir, recurse=False)
+eric6.Utilities.uic.compileUiFiles?4(directory, recurse=False)
 eric6.Utilities.unescape_uentities?4(m)
 eric6.Utilities.win32_GetUserName?4()
 eric6.Utilities.win32_Kill?4(pid)
@@ -9324,7 +9324,7 @@
 eric6.VCS.VersionControl.VersionControl.vcsRepositoryInfos?4(ppath)
 eric6.VCS.VersionControl.VersionControl.vcsRevert?4(name)
 eric6.VCS.VersionControl.VersionControl.vcsSetData?4(key, value)
-eric6.VCS.VersionControl.VersionControl.vcsSetDataFromDict?4(dict)
+eric6.VCS.VersionControl.VersionControl.vcsSetDataFromDict?4(dictionary)
 eric6.VCS.VersionControl.VersionControl.vcsSetOptions?4(options)
 eric6.VCS.VersionControl.VersionControl.vcsSetOtherData?4(data)
 eric6.VCS.VersionControl.VersionControl.vcsShutdown?4()
@@ -9353,7 +9353,7 @@
 eric6.ViewManager.ViewManager.QuickSearchLineEdit.focusInEvent?4(evt)
 eric6.ViewManager.ViewManager.QuickSearchLineEdit.gotFocus?7
 eric6.ViewManager.ViewManager.QuickSearchLineEdit.keyPressEvent?4(evt)
-eric6.ViewManager.ViewManager.ViewManager._addView?5(win, fn=None, noName="", next=False)
+eric6.ViewManager.ViewManager.ViewManager._addView?5(win, fn=None, noName="", addNext=False)
 eric6.ViewManager.ViewManager.ViewManager._checkActions?5(editor, setSb=True)
 eric6.ViewManager.ViewManager.ViewManager._getOpenFileFilter?5()
 eric6.ViewManager.ViewManager.ViewManager._getOpenStartDir?5()
@@ -9403,12 +9403,12 @@
 eric6.ViewManager.ViewManager.ViewManager.editorTextChanged?7
 eric6.ViewManager.ViewManager.ViewManager.editorsCheckFocusInEnabled?4()
 eric6.ViewManager.ViewManager.ViewManager.enableEditorsCheckFocusIn?4(enabled)
-eric6.ViewManager.ViewManager.ViewManager.eventFilter?4(object, event)
+eric6.ViewManager.ViewManager.ViewManager.eventFilter?4(qobject, event)
 eric6.ViewManager.ViewManager.ViewManager.exit?4()
 eric6.ViewManager.ViewManager.ViewManager.getAPIsManager?4()
-eric6.ViewManager.ViewManager.ViewManager.getActions?4(type)
+eric6.ViewManager.ViewManager.ViewManager.getActions?4(actionSetType)
 eric6.ViewManager.ViewManager.ViewManager.getActiveName?4()
-eric6.ViewManager.ViewManager.ViewManager.getEditor?4(fn, filetype="", next=False)
+eric6.ViewManager.ViewManager.ViewManager.getEditor?4(fn, filetype="", addNext=False)
 eric6.ViewManager.ViewManager.ViewManager.getMostRecent?4()
 eric6.ViewManager.ViewManager.ViewManager.getNumber?4()
 eric6.ViewManager.ViewManager.ViewManager.getOpenEditor?4(fn)
@@ -9440,7 +9440,7 @@
 eric6.ViewManager.ViewManager.ViewManager.newEditorView?4(fn, caller, filetype="")
 eric6.ViewManager.ViewManager.ViewManager.nextSplit?4()
 eric6.ViewManager.ViewManager.ViewManager.openFiles?4(prog)
-eric6.ViewManager.ViewManager.ViewManager.openSourceFile?4(fn, lineno=-1, filetype="", selStart=0, selEnd=0, pos=0, next=False)
+eric6.ViewManager.ViewManager.ViewManager.openSourceFile?4(fn, lineno=-1, filetype="", selStart=0, selEnd=0, pos=0, addNext=False)
 eric6.ViewManager.ViewManager.ViewManager.preferencesChanged?4()
 eric6.ViewManager.ViewManager.ViewManager.prevSplit?4()
 eric6.ViewManager.ViewManager.ViewManager.previewStateChanged?7
@@ -9451,7 +9451,7 @@
 eric6.ViewManager.ViewManager.ViewManager.projectFileRenamed?4(oldfn, newfn)
 eric6.ViewManager.ViewManager.ViewManager.projectLexerAssociationsChanged?4()
 eric6.ViewManager.ViewManager.ViewManager.projectOpened?4()
-eric6.ViewManager.ViewManager.ViewManager.receive?4(hash, fileName, command)
+eric6.ViewManager.ViewManager.ViewManager.receive?4(projectHash, fileName, command)
 eric6.ViewManager.ViewManager.ViewManager.removeSplit?4()
 eric6.ViewManager.ViewManager.ViewManager.replaceWidget?4()
 eric6.ViewManager.ViewManager.ViewManager.saveAllEditors?4()
@@ -9484,10 +9484,10 @@
 eric6.ViewManager.ViewManager.ViewManager.zoomValueChanged?4(value)
 eric6.ViewManager.ViewManager.ViewManager?1()
 eric6.ViewManager.factory?4(parent, ui, dbs, pluginManager)
-eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(filter)
+eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(filterRule)
 eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.addSubscription?4(subscription, refresh=True)
 eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_adBlockGroup_toggled?4(state)
-eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_searchEdit_textChanged?4(filter)
+eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_searchEdit_textChanged?4(filterRule)
 eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_subscriptionsTabWidget_currentChanged?4(index)
 eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_updateSpinBox_valueChanged?4(value)
 eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_useLimitedEasyListCheckBox_clicked?4(checked)
@@ -9560,10 +9560,10 @@
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.networkMatch?4(request, domain, encodedUrl)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setEnabled?4(enabled)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setException?4(exception)
-eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setFilter?4(filter)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setFilter?4(filterRule)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.subscription?4()
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.urlMatch?4(url)
-eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule?1(filter="", subscription=None)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule?1(filterRule="", subscription=None)
 eric6.WebBrowser.AdBlock.AdBlockRule.toSecondLevelDomain?4(url)
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.adBlockDisabledForUrl?4(url)
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.addRule?4(rule)
@@ -9595,7 +9595,7 @@
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.updateNow?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.url?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription?1(url, custom, parent=None, default=False)
-eric6.WebBrowser.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.addRule?4(filter="")
+eric6.WebBrowser.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.addRule?4(filterRule="")
 eric6.WebBrowser.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.keyPressEvent?4(evt)
 eric6.WebBrowser.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.refresh?4()
 eric6.WebBrowser.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.removeRule?4()
@@ -9671,44 +9671,44 @@
 eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter?1(id="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter?1(sourceId="", parent=None)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.getImporterInfo?4(id)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.getImporter?4(id, parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.getImporterInfo?4(sourceId)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.getImporter?4(sourceId, parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.getImporters?4()
 eric6.WebBrowser.Bookmarks.BookmarksManager.BOOKMARKBAR?7
 eric6.WebBrowser.Bookmarks.BookmarksManager.BOOKMARKMENU?7
@@ -9983,7 +9983,7 @@
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_addWhiteButton_clicked?4()
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_blackList_itemSelectionChanged?4()
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_cookiesList_currentItemChanged?4(current, previous)
-eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_filterEdit_textChanged?4(filter)
+eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_filterEdit_textChanged?4(filterStr)
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_reloadButton_clicked?4()
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_removeAllButton_clicked?4()
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_removeBlackButton_clicked?4()
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Source/eric6.Cooperation.ChatWidget.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Cooperation.ChatWidget.html	Sat Mar 11 19:18:57 2017 +0100
@@ -52,7 +52,7 @@
 <dd>
 emitted to signal a change of the connected
             state (bool)
-</dd><dt>editorCommand(hash, filename, message)</dt>
+</dd><dt>editorCommand(hashStr, filename, message)</dt>
 <dd>
 emitted when an editor
             command has been received (string, string, string)
@@ -255,11 +255,11 @@
         Private slot to cut the contents of the chat display to the clipboard.
 </p><a NAME="ChatWidget.__editorCommandMessage" ID="ChatWidget.__editorCommandMessage"></a>
 <h4>ChatWidget.__editorCommandMessage</h4>
-<b>__editorCommandMessage</b>(<i>hash, fileName, message</i>)
+<b>__editorCommandMessage</b>(<i>hashStr, fileName, message</i>)
 <p>
         Private slot to handle editor command messages from the client.
 </p><dl>
-<dt><i>hash</i></dt>
+<dt><i>hashStr</i></dt>
 <dd>
 hash of the project (string)
 </dd><dt><i>fileName</i></dt>
--- a/Documentation/Source/eric6.DataViews.CodeMetrics.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.DataViews.CodeMetrics.html	Sat Mar 11 19:18:57 2017 +0100
@@ -183,11 +183,11 @@
 </dd>
 </dl><a NAME="SourceStat.getCounter" ID="SourceStat.getCounter"></a>
 <h4>SourceStat.getCounter</h4>
-<b>getCounter</b>(<i>id, key</i>)
+<b>getCounter</b>(<i>counterId, key</i>)
 <p>
         Public method used to get a specific counter value.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>counterId</i></dt>
 <dd>
 id of the counter (string)
 </dd><dt><i>key</i></dt>
--- a/Documentation/Source/eric6.DebugClients.Python.DebugBase.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.DebugClients.Python.DebugBase.html	Sat Mar 11 19:18:57 2017 +0100
@@ -517,17 +517,17 @@
 </dd>
 </dl><a NAME="DebugBase.run" ID="DebugBase.run"></a>
 <h4>DebugBase.run</h4>
-<b>run</b>(<i>cmd, globals=None, locals=None, debug=True</i>)
+<b>run</b>(<i>cmd, globalsDict=None, localsDict=None, debug=True</i>)
 <p>
         Public method to start a given command under debugger control.
 </p><dl>
 <dt><i>cmd</i> (str or CodeType)</dt>
 <dd>
 command / code to execute under debugger control
-</dd><dt><i>globals=</i> (dict)</dt>
+</dd><dt><i>globalsDict=</i> (dict)</dt>
 <dd>
 dictionary of global variables for cmd
-</dd><dt><i>locals=</i> (dict)</dt>
+</dd><dt><i>localsDict=</i> (dict)</dt>
 <dd>
 dictionary of local variables for cmd
 </dd><dt><i>debug=</i> (bool)</dt>
--- a/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html	Sat Mar 11 19:18:57 2017 +0100
@@ -274,7 +274,7 @@
 </dd>
 </dl><a NAME="DebugClientBase.__dumpVariable" ID="DebugClientBase.__dumpVariable"></a>
 <h4>DebugClientBase.__dumpVariable</h4>
-<b>__dumpVariable</b>(<i>var, frmnr, scope, filter</i>)
+<b>__dumpVariable</b>(<i>var, frmnr, scope, filterList</i>)
 <p>
         Private method to return the variables of a frame to the debug server.
 </p><dl>
@@ -289,14 +289,14 @@
 </dd><dt><i>scope</i></dt>
 <dd>
 1 to report global variables, 0 for local variables (int)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 the indices of variable types to be filtered
             (list of int)
 </dd>
 </dl><a NAME="DebugClientBase.__dumpVariables" ID="DebugClientBase.__dumpVariables"></a>
 <h4>DebugClientBase.__dumpVariables</h4>
-<b>__dumpVariables</b>(<i>frmnr, scope, filter</i>)
+<b>__dumpVariables</b>(<i>frmnr, scope, filterList</i>)
 <p>
         Private method to return the variables of a frame to the debug server.
 </p><dl>
@@ -307,7 +307,7 @@
 </dd><dt><i>scope</i></dt>
 <dd>
 1 to report global variables, 0 for local variables (int)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 the indices of variable types to be filtered
             (list of int)
@@ -355,7 +355,7 @@
 </dd>
 </dl><a NAME="DebugClientBase.__formatVariablesList" ID="DebugClientBase.__formatVariablesList"></a>
 <h4>DebugClientBase.__formatVariablesList</h4>
-<b>__formatVariablesList</b>(<i>keylist, dict_, scope, filter=[], formatSequences=False</i>)
+<b>__formatVariablesList</b>(<i>keylist, dict_, scope, filterList=[], formatSequences=False</i>)
 <p>
         Private method to produce a formated variables list.
 </p><p>
@@ -377,11 +377,11 @@
             filter (int).
             Variables are only added to the list, if their name do not match
             any of the filter expressions.
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
-the indices of variable types to be filtered. Variables
-            are only added to the list, if their type is not contained in the
-            filter list.
+the indices of variable types to be filtered.
+            Variables are only added to the list, if their type is not
+            contained in the filter list.
 </dd><dt><i>formatSequences</i></dt>
 <dd>
 flag indicating, that sequence or dictionary
@@ -825,12 +825,12 @@
 </dd>
 </dl><a NAME="DebugClientBase.sessionClose" ID="DebugClientBase.sessionClose"></a>
 <h4>DebugClientBase.sessionClose</h4>
-<b>sessionClose</b>(<i>exit=True</i>)
+<b>sessionClose</b>(<i>terminate=True</i>)
 <p>
         Public method to close the session with the debugger and optionally
         terminate.
 </p><dl>
-<dt><i>exit</i></dt>
+<dt><i>terminate</i></dt>
 <dd>
 flag indicating to terminate (boolean)
 </dd>
--- a/Documentation/Source/eric6.DebugClients.Python.DebugUtilities.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.DebugClients.Python.DebugUtilities.html	Sat Mar 11 19:18:57 2017 +0100
@@ -76,7 +76,7 @@
 <hr /><hr />
 <a NAME="formatargvalues" ID="formatargvalues"></a>
 <h2>formatargvalues</h2>
-<b>formatargvalues</b>(<i>args, varargs, varkw, locals, formatarg=str, formatvarargs=lambda name: '*' + name, formatvarkw=lambda name: '**' + name, formatvalue=lambda value: '=' + repr(value)</i>)
+<b>formatargvalues</b>(<i>args, varargs, varkw, localsDict, formatarg=str, formatvarargs=lambda name: '*' + name, formatvarkw=lambda name: '**' + name, formatvalue=lambda value: '=' + repr(value)</i>)
 <p>
     Function to format an argument spec from the 4 values returned
     by getargvalues.
@@ -90,7 +90,7 @@
 </dd><dt><i>varkw</i> (str)</dt>
 <dd>
 name of the keyword arguments
-</dd><dt><i>locals</i> (dict)</dt>
+</dd><dt><i>localsDict</i> (dict)</dt>
 <dd>
 reference to the local variables dictionary
 </dd><dt><i>formatarg=</i> (func)</dt>
--- a/Documentation/Source/eric6.DebugClients.Python.ThreadExtension.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.DebugClients.Python.ThreadExtension.html	Sat Mar 11 19:18:57 2017 +0100
@@ -286,11 +286,11 @@
 </dd>
 </dl><a NAME="ThreadExtension.setCurrentThread" ID="ThreadExtension.setCurrentThread"></a>
 <h4>ThreadExtension.setCurrentThread</h4>
-<b>setCurrentThread</b>(<i>id</i>)
+<b>setCurrentThread</b>(<i>threadId</i>)
 <p>
         Public method to set the current thread.
 </p><dl>
-<dt><i>id</i> (int)</dt>
+<dt><i>threadId</i> (int)</dt>
 <dd>
 the id the current thread should be set to.
 </dd>
--- a/Documentation/Source/eric6.Debugger.DebugServer.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.DebugServer.html	Sat Mar 11 19:18:57 2017 +0100
@@ -763,14 +763,14 @@
 </dd>
 </dl><a NAME="DebugServer.__remoteWatchpoint" ID="DebugServer.__remoteWatchpoint"></a>
 <h4>DebugServer.__remoteWatchpoint</h4>
-<b>__remoteWatchpoint</b>(<i>cond, set, temp=False</i>)
+<b>__remoteWatchpoint</b>(<i>cond, setWatch, temp=False</i>)
 <p>
         Private method to set or clear a watch expression.
 </p><dl>
 <dt><i>cond</i></dt>
 <dd>
 expression of the watch expression (string)
-</dd><dt><i>set</i></dt>
+</dd><dt><i>setWatch</i></dt>
 <dd>
 flag indicating setting or resetting a watch expression
             (boolean)
@@ -897,7 +897,7 @@
         Public method to process the client stop test info.
 </p><a NAME="DebugServer.clientUtTestErrored" ID="DebugServer.clientUtTestErrored"></a>
 <h4>DebugServer.clientUtTestErrored</h4>
-<b>clientUtTestErrored</b>(<i>testname, traceback, id</i>)
+<b>clientUtTestErrored</b>(<i>testname, traceback, testId</i>)
 <p>
         Public method to process the client test errored info.
 </p><dl>
@@ -907,13 +907,13 @@
 </dd><dt><i>traceback</i></dt>
 <dd>
 lines of traceback info (list of strings)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="DebugServer.clientUtTestFailed" ID="DebugServer.clientUtTestFailed"></a>
 <h4>DebugServer.clientUtTestFailed</h4>
-<b>clientUtTestFailed</b>(<i>testname, traceback, id</i>)
+<b>clientUtTestFailed</b>(<i>testname, traceback, testId</i>)
 <p>
         Public method to process the client test failed info.
 </p><dl>
@@ -923,13 +923,13 @@
 </dd><dt><i>traceback</i></dt>
 <dd>
 lines of traceback info (list of strings)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="DebugServer.clientUtTestFailedExpected" ID="DebugServer.clientUtTestFailedExpected"></a>
 <h4>DebugServer.clientUtTestFailedExpected</h4>
-<b>clientUtTestFailedExpected</b>(<i>testname, traceback, id</i>)
+<b>clientUtTestFailedExpected</b>(<i>testname, traceback, testId</i>)
 <p>
         Public method to process the client test failed expected info.
 </p><dl>
@@ -939,13 +939,13 @@
 </dd><dt><i>traceback</i></dt>
 <dd>
 lines of traceback info (list of strings)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="DebugServer.clientUtTestSkipped" ID="DebugServer.clientUtTestSkipped"></a>
 <h4>DebugServer.clientUtTestSkipped</h4>
-<b>clientUtTestSkipped</b>(<i>testname, reason, id</i>)
+<b>clientUtTestSkipped</b>(<i>testname, reason, testId</i>)
 <p>
         Public method to process the client test skipped info.
 </p><dl>
@@ -955,20 +955,20 @@
 </dd><dt><i>reason</i></dt>
 <dd>
 reason for skipping the test (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="DebugServer.clientUtTestSucceededUnexpected" ID="DebugServer.clientUtTestSucceededUnexpected"></a>
 <h4>DebugServer.clientUtTestSucceededUnexpected</h4>
-<b>clientUtTestSucceededUnexpected</b>(<i>testname, id</i>)
+<b>clientUtTestSucceededUnexpected</b>(<i>testname, testId</i>)
 <p>
         Public method to process the client test succeeded unexpected info.
 </p><dl>
 <dt><i>testname</i></dt>
 <dd>
 name of the test (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
@@ -984,11 +984,11 @@
 </dd>
 </dl><a NAME="DebugServer.getClientCapabilities" ID="DebugServer.getClientCapabilities"></a>
 <h4>DebugServer.getClientCapabilities</h4>
-<b>getClientCapabilities</b>(<i>type</i>)
+<b>getClientCapabilities</b>(<i>clientType</i>)
 <p>
         Public method to retrieve the debug clients capabilities.
 </p><dl>
-<dt><i>type</i></dt>
+<dt><i>clientType</i></dt>
 <dd>
 debug client type (string)
 </dd>
@@ -1119,7 +1119,7 @@
         Public slot to get the banner info of the remote client.
 </p><a NAME="DebugServer.remoteBreakpoint" ID="DebugServer.remoteBreakpoint"></a>
 <h4>DebugServer.remoteBreakpoint</h4>
-<b>remoteBreakpoint</b>(<i>fn, line, set, cond=None, temp=False</i>)
+<b>remoteBreakpoint</b>(<i>fn, line, setBreakpoint, cond=None, temp=False</i>)
 <p>
         Public method to set or clear a breakpoint.
 </p><dl>
@@ -1129,9 +1129,10 @@
 </dd><dt><i>line</i></dt>
 <dd>
 linenumber of the breakpoint (int)
-</dd><dt><i>set</i></dt>
+</dd><dt><i>setBreakpoint</i></dt>
 <dd>
-flag indicating setting or resetting a breakpoint (boolean)
+flag indicating setting or resetting a breakpoint
+            (boolean)
 </dd><dt><i>cond</i></dt>
 <dd>
 condition of the breakpoint (string)
@@ -1146,27 +1147,28 @@
         Public slot to get the debug clients capabilities.
 </p><a NAME="DebugServer.remoteClientSetFilter" ID="DebugServer.remoteClientSetFilter"></a>
 <h4>DebugServer.remoteClientSetFilter</h4>
-<b>remoteClientSetFilter</b>(<i>scope, filter</i>)
+<b>remoteClientSetFilter</b>(<i>scope, filterStr</i>)
 <p>
         Public method to set a variables filter list.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
-regexp string for variable names to filter out (string)
+regexp string for variable names to filter out
+            (string)
 </dd>
 </dl><a NAME="DebugServer.remoteClientVariable" ID="DebugServer.remoteClientVariable"></a>
 <h4>DebugServer.remoteClientVariable</h4>
-<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>)
+<b>remoteClientVariable</b>(<i>scope, filterList, var, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>var</i></dt>
@@ -1178,14 +1180,14 @@
 </dd>
 </dl><a NAME="DebugServer.remoteClientVariables" ID="DebugServer.remoteClientVariables"></a>
 <h4>DebugServer.remoteClientVariables</h4>
-<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>)
+<b>remoteClientVariables</b>(<i>scope, filterList, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>framenr</i></dt>
--- a/Documentation/Source/eric6.Debugger.DebugViewer.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.DebugViewer.html	Sat Mar 11 19:18:57 2017 +0100
@@ -385,37 +385,37 @@
 </dd>
 </dl><a NAME="DebugViewer.showVariable" ID="DebugViewer.showVariable"></a>
 <h4>DebugViewer.showVariable</h4>
-<b>showVariable</b>(<i>vlist, globals</i>)
+<b>showVariable</b>(<i>vlist, showGlobals</i>)
 <p>
         Public method to show the variables in the respective window.
 </p><dl>
 <dt><i>vlist</i></dt>
 <dd>
 list of variables to display
-</dd><dt><i>globals</i></dt>
+</dd><dt><i>showGlobals</i></dt>
 <dd>
 flag indicating global/local state
 </dd>
 </dl><a NAME="DebugViewer.showVariables" ID="DebugViewer.showVariables"></a>
 <h4>DebugViewer.showVariables</h4>
-<b>showVariables</b>(<i>vlist, globals</i>)
+<b>showVariables</b>(<i>vlist, showGlobals</i>)
 <p>
         Public method to show the variables in the respective window.
 </p><dl>
 <dt><i>vlist</i></dt>
 <dd>
 list of variables to display
-</dd><dt><i>globals</i></dt>
+</dd><dt><i>showGlobals</i></dt>
 <dd>
 flag indicating global/local state
 </dd>
 </dl><a NAME="DebugViewer.showVariablesTab" ID="DebugViewer.showVariablesTab"></a>
 <h4>DebugViewer.showVariablesTab</h4>
-<b>showVariablesTab</b>(<i>globals</i>)
+<b>showVariablesTab</b>(<i>showGlobals</i>)
 <p>
         Public method to make a variables tab visible.
 </p><dl>
-<dt><i>globals</i></dt>
+<dt><i>showGlobals</i></dt>
 <dd>
 flag indicating global/local state
 </dd>
--- a/Documentation/Source/eric6.Debugger.DebuggerInterfaceNone.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.DebuggerInterfaceNone.html	Sat Mar 11 19:18:57 2017 +0100
@@ -237,7 +237,7 @@
 </dd>
 </dl><a NAME="DebuggerInterfaceNone.remoteBreakpoint" ID="DebuggerInterfaceNone.remoteBreakpoint"></a>
 <h4>DebuggerInterfaceNone.remoteBreakpoint</h4>
-<b>remoteBreakpoint</b>(<i>fn, line, set, cond=None, temp=False</i>)
+<b>remoteBreakpoint</b>(<i>fn, line, setBreakpoint, cond=None, temp=False</i>)
 <p>
         Public method to set or clear a breakpoint.
 </p><dl>
@@ -247,9 +247,10 @@
 </dd><dt><i>line</i></dt>
 <dd>
 linenumber of the breakpoint (int)
-</dd><dt><i>set</i></dt>
+</dd><dt><i>setBreakpoint</i></dt>
 <dd>
-flag indicating setting or resetting a breakpoint (boolean)
+flag indicating setting or resetting a
+            breakpoint (boolean)
 </dd><dt><i>cond</i></dt>
 <dd>
 condition of the breakpoint (string)
@@ -297,27 +298,28 @@
         Public slot to get the debug clients capabilities.
 </p><a NAME="DebuggerInterfaceNone.remoteClientSetFilter" ID="DebuggerInterfaceNone.remoteClientSetFilter"></a>
 <h4>DebuggerInterfaceNone.remoteClientSetFilter</h4>
-<b>remoteClientSetFilter</b>(<i>scope, filter</i>)
+<b>remoteClientSetFilter</b>(<i>scope, filterStr</i>)
 <p>
         Public method to set a variables filter list.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
-regexp string for variable names to filter out (string)
+regexp string for variable names to filter out
+            (string)
 </dd>
 </dl><a NAME="DebuggerInterfaceNone.remoteClientVariable" ID="DebuggerInterfaceNone.remoteClientVariable"></a>
 <h4>DebuggerInterfaceNone.remoteClientVariable</h4>
-<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>)
+<b>remoteClientVariable</b>(<i>scope, filterList, var, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>var</i></dt>
@@ -329,14 +331,14 @@
 </dd>
 </dl><a NAME="DebuggerInterfaceNone.remoteClientVariables" ID="DebuggerInterfaceNone.remoteClientVariables"></a>
 <h4>DebuggerInterfaceNone.remoteClientVariables</h4>
-<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>)
+<b>remoteClientVariables</b>(<i>scope, filterList, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>framenr</i></dt>
@@ -579,14 +581,14 @@
         public method to stop a unittest run.
 </p><a NAME="DebuggerInterfaceNone.remoteWatchpoint" ID="DebuggerInterfaceNone.remoteWatchpoint"></a>
 <h4>DebuggerInterfaceNone.remoteWatchpoint</h4>
-<b>remoteWatchpoint</b>(<i>cond, set, temp=False</i>)
+<b>remoteWatchpoint</b>(<i>cond, setWatch, temp=False</i>)
 <p>
         Public method to set or clear a watch expression.
 </p><dl>
 <dt><i>cond</i></dt>
 <dd>
 expression of the watch expression (string)
-</dd><dt><i>set</i></dt>
+</dd><dt><i>setWatch</i></dt>
 <dd>
 flag indicating setting or resetting a watch expression
             (boolean)
--- a/Documentation/Source/eric6.Debugger.DebuggerInterfacePython2.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.DebuggerInterfacePython2.html	Sat Mar 11 19:18:57 2017 +0100
@@ -419,27 +419,28 @@
         Public slot to get the debug clients capabilities.
 </p><a NAME="DebuggerInterfacePython2.remoteClientSetFilter" ID="DebuggerInterfacePython2.remoteClientSetFilter"></a>
 <h4>DebuggerInterfacePython2.remoteClientSetFilter</h4>
-<b>remoteClientSetFilter</b>(<i>scope, filter</i>)
+<b>remoteClientSetFilter</b>(<i>scope, filterStr</i>)
 <p>
         Public method to set a variables filter list.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
-regexp string for variable names to filter out (string)
+regexp string for variable names to filter out
+            (string)
 </dd>
 </dl><a NAME="DebuggerInterfacePython2.remoteClientVariable" ID="DebuggerInterfacePython2.remoteClientVariable"></a>
 <h4>DebuggerInterfacePython2.remoteClientVariable</h4>
-<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>)
+<b>remoteClientVariable</b>(<i>scope, filterList, var, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>var</i></dt>
@@ -451,14 +452,14 @@
 </dd>
 </dl><a NAME="DebuggerInterfacePython2.remoteClientVariables" ID="DebuggerInterfacePython2.remoteClientVariables"></a>
 <h4>DebuggerInterfacePython2.remoteClientVariables</h4>
-<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>)
+<b>remoteClientVariables</b>(<i>scope, filterList, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>framenr</i></dt>
--- a/Documentation/Source/eric6.Debugger.DebuggerInterfacePython3.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.DebuggerInterfacePython3.html	Sat Mar 11 19:18:57 2017 +0100
@@ -419,27 +419,28 @@
         Public slot to get the debug clients capabilities.
 </p><a NAME="DebuggerInterfacePython3.remoteClientSetFilter" ID="DebuggerInterfacePython3.remoteClientSetFilter"></a>
 <h4>DebuggerInterfacePython3.remoteClientSetFilter</h4>
-<b>remoteClientSetFilter</b>(<i>scope, filter</i>)
+<b>remoteClientSetFilter</b>(<i>scope, filterStr</i>)
 <p>
         Public method to set a variables filter list.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
-regexp string for variable names to filter out (string)
+regexp string for variable names to filter out
+            (string)
 </dd>
 </dl><a NAME="DebuggerInterfacePython3.remoteClientVariable" ID="DebuggerInterfacePython3.remoteClientVariable"></a>
 <h4>DebuggerInterfacePython3.remoteClientVariable</h4>
-<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>)
+<b>remoteClientVariable</b>(<i>scope, filterList, var, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>var</i></dt>
@@ -451,14 +452,14 @@
 </dd>
 </dl><a NAME="DebuggerInterfacePython3.remoteClientVariables" ID="DebuggerInterfacePython3.remoteClientVariables"></a>
 <h4>DebuggerInterfacePython3.remoteClientVariables</h4>
-<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>)
+<b>remoteClientVariables</b>(<i>scope, filterList, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>framenr</i></dt>
--- a/Documentation/Source/eric6.Debugger.EditBreakpointDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.EditBreakpointDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -76,11 +76,11 @@
 </table>
 <a NAME="EditBreakpointDialog.__init__" ID="EditBreakpointDialog.__init__"></a>
 <h4>EditBreakpointDialog (Constructor)</h4>
-<b>EditBreakpointDialog</b>(<i>id, properties, condHistory, parent=None, name=None, modal=False, addMode=False, filenameHistory=None</i>)
+<b>EditBreakpointDialog</b>(<i>breakPointId, properties, condHistory, parent=None, name=None, modal=False, addMode=False, filenameHistory=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>breakPointId</i></dt>
 <dd>
 id of the breakpoint (tuple)
                 (filename, linenumber)
--- a/Documentation/Source/eric6.Debugger.StartDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.StartDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -108,7 +108,7 @@
 </table>
 <a NAME="StartDialog.__init__" ID="StartDialog.__init__"></a>
 <h4>StartDialog (Constructor)</h4>
-<b>StartDialog</b>(<i>caption, argvList, wdList, envList, exceptions, parent=None, type=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False</i>)
+<b>StartDialog</b>(<i>caption, argvList, wdList, envList, exceptions, parent=None, dialogType=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False</i>)
 <p>
         Constructor
 </p><dl>
@@ -130,7 +130,7 @@
 </dd><dt><i>parent</i></dt>
 <dd>
 parent widget of this dialog (QWidget)
-</dd><dt><i>type</i></dt>
+</dd><dt><i>dialogType</i></dt>
 <dd>
 type of the start dialog
                 <ul>
--- a/Documentation/Source/eric6.DocumentationTools.ModuleDocumentor.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.DocumentationTools.ModuleDocumentor.html	Sat Mar 11 19:18:57 2017 +0100
@@ -308,16 +308,17 @@
 </dd>
 </dl><a NAME="ModuleDocument.__genListSection" ID="ModuleDocument.__genListSection"></a>
 <h4>ModuleDocument.__genListSection</h4>
-<b>__genListSection</b>(<i>names, dict, kwSuffix=""</i>)
+<b>__genListSection</b>(<i>names, sectionDict, kwSuffix=""</i>)
 <p>
         Private method to generate a list section of the document.
 </p><dl>
 <dt><i>names</i></dt>
 <dd>
 The names to appear in the list. (list of strings)
-</dd><dt><i>dict</i></dt>
+</dd><dt><i>sectionDict</i></dt>
 <dd>
-A dictionary containing all relevant information.
+dictionary containing all relevant information
+            (dict)
 </dd><dt><i>kwSuffix</i></dt>
 <dd>
 suffix to be used for the QtHelp keywords (string)
@@ -325,11 +326,11 @@
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-The list section. (string)
+list section (string)
 </dd>
 </dl><a NAME="ModuleDocument.__genMethodSection" ID="ModuleDocument.__genMethodSection"></a>
 <h4>ModuleDocument.__genMethodSection</h4>
-<b>__genMethodSection</b>(<i>obj, className, filter</i>)
+<b>__genMethodSection</b>(<i>obj, className, modifierFilter</i>)
 <p>
         Private method to generate the method details section.
 </p><dl>
@@ -339,7 +340,7 @@
 </dd><dt><i>className</i></dt>
 <dd>
 name of the class containing the method (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>modifierFilter</i></dt>
 <dd>
 filter value designating the method types
 </dd>
@@ -350,16 +351,17 @@
 </dd>
 </dl><a NAME="ModuleDocument.__genMethodsListSection" ID="ModuleDocument.__genMethodsListSection"></a>
 <h4>ModuleDocument.__genMethodsListSection</h4>
-<b>__genMethodsListSection</b>(<i>names, dict, className, clsName, includeInit=True</i>)
+<b>__genMethodsListSection</b>(<i>names, sectionDict, className, clsName, includeInit=True</i>)
 <p>
         Private method to generate the methods list section of a class.
 </p><dl>
 <dt><i>names</i></dt>
 <dd>
 names to appear in the list (list of strings)
-</dd><dt><i>dict</i></dt>
+</dd><dt><i>sectionDict</i></dt>
 <dd>
 dictionary containing all relevant information
+            (dict)
 </dd><dt><i>className</i></dt>
 <dd>
 class name containing the names
@@ -423,19 +425,20 @@
 </dd>
 </dl><a NAME="ModuleDocument.__genRbModulesClassesListSection" ID="ModuleDocument.__genRbModulesClassesListSection"></a>
 <h4>ModuleDocument.__genRbModulesClassesListSection</h4>
-<b>__genRbModulesClassesListSection</b>(<i>names, dict, moduleName</i>)
+<b>__genRbModulesClassesListSection</b>(<i>names, sectionDict, moduleName</i>)
 <p>
         Private method to generate the classes list section of a Ruby module.
 </p><dl>
 <dt><i>names</i></dt>
 <dd>
 The names to appear in the list. (list of strings)
-</dd><dt><i>dict</i></dt>
+</dd><dt><i>sectionDict</i></dt>
 <dd>
-A dictionary containing all relevant information.
+dictionary containing all relevant information
+            (dict)
 </dd><dt><i>moduleName</i></dt>
 <dd>
-Name of the Ruby module containing the classes.
+name of the Ruby module containing the classes
             (string)
 </dd>
 </dl><dl>
--- a/Documentation/Source/eric6.E5Graphics.E5ArrowItem.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.E5Graphics.E5ArrowItem.html	Sat Mar 11 19:18:57 2017 +0100
@@ -82,7 +82,7 @@
 </table>
 <a NAME="E5ArrowItem.__init__" ID="E5ArrowItem.__init__"></a>
 <h4>E5ArrowItem (Constructor)</h4>
-<b>E5ArrowItem</b>(<i>origin=QPointF(), end=QPointF(), filled=False, type=NormalArrow, parent=None</i>)
+<b>E5ArrowItem</b>(<i>origin=QPointF(), end=QPointF(), filled=False, arrowType=NormalArrow, parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -95,7 +95,7 @@
 </dd><dt><i>filled</i></dt>
 <dd>
 flag indicating a filled arrow head (boolean)
-</dd><dt><i>type</i></dt>
+</dd><dt><i>arrowType</i></dt>
 <dd>
 arrow type (NormalArrow, WideArrow)
 </dd><dt><i>parent=</i></dt>
--- a/Documentation/Source/eric6.E5Graphics.E5GraphicsView.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.E5Graphics.E5GraphicsView.html	Sat Mar 11 19:18:57 2017 +0100
@@ -131,7 +131,7 @@
 </dd>
 </dl><a NAME="E5GraphicsView.__getDiagram" ID="E5GraphicsView.__getDiagram"></a>
 <h4>E5GraphicsView.__getDiagram</h4>
-<b>__getDiagram</b>(<i>rect, format="PNG", filename=None</i>)
+<b>__getDiagram</b>(<i>rect, imageFormat="PNG", filename=None</i>)
 <p>
         Private method to retrieve the diagram from the scene fitting it
         in the minimum rectangle.
@@ -139,7 +139,7 @@
 <dt><i>rect</i></dt>
 <dd>
 minimum rectangle fitting the diagram (QRectF)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>imageFormat</i></dt>
 <dd>
 format for the image file (string)
 </dd><dt><i>filename</i></dt>
@@ -253,14 +253,14 @@
 </dd>
 </dl><a NAME="E5GraphicsView.saveImage" ID="E5GraphicsView.saveImage"></a>
 <h4>E5GraphicsView.saveImage</h4>
-<b>saveImage</b>(<i>filename, format="PNG"</i>)
+<b>saveImage</b>(<i>filename, imageFormat="PNG"</i>)
 <p>
         Public method to save the scene to a file.
 </p><dl>
 <dt><i>filename</i></dt>
 <dd>
 name of the file to write the image to (string)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>imageFormat</i></dt>
 <dd>
 format for the image file (string)
 </dd>
--- a/Documentation/Source/eric6.E5Gui.E5Application.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5Application.html	Sat Mar 11 19:18:57 2017 +0100
@@ -169,14 +169,14 @@
 </dd>
 </dl><a NAME="E5Application.registerObject" ID="E5Application.registerObject"></a>
 <h4>E5Application.registerObject</h4>
-<b>registerObject</b>(<i>name, object</i>)
+<b>registerObject</b>(<i>name, objectRef</i>)
 <p>
         Public method to register an object in the object registry.
 </p><dl>
 <dt><i>name</i></dt>
 <dd>
 name of the object (string)
-</dd><dt><i>object</i></dt>
+</dd><dt><i>objectRef</i></dt>
 <dd>
 reference to the object
 </dd>
@@ -187,14 +187,14 @@
 </dd>
 </dl><a NAME="E5Application.registerPluginObject" ID="E5Application.registerPluginObject"></a>
 <h4>E5Application.registerPluginObject</h4>
-<b>registerPluginObject</b>(<i>name, object, pluginType=None</i>)
+<b>registerPluginObject</b>(<i>name, objectRef, pluginType=None</i>)
 <p>
         Public method to register a plugin object in the object registry.
 </p><dl>
 <dt><i>name</i></dt>
 <dd>
 name of the plugin object (string)
-</dd><dt><i>object</i></dt>
+</dd><dt><i>objectRef</i></dt>
 <dd>
 reference to the plugin object
 </dd><dt><i>pluginType=</i></dt>
--- a/Documentation/Source/eric6.E5Gui.E5FileDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5FileDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -63,12 +63,12 @@
 <hr /><hr />
 <a NAME="__reorderFilter" ID="__reorderFilter"></a>
 <h2>__reorderFilter</h2>
-<b>__reorderFilter</b>(<i>filter, initialFilter=""</i>)
+<b>__reorderFilter</b>(<i>filterStr, initialFilter=""</i>)
 <p>
     Private function to reorder the file filter to cope with a KDE issue
     introduced by distributor's usage of KDE file dialogs.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterStr</i></dt>
 <dd>
 Qt file filter (string)
 </dd><dt><i>initialFilter</i></dt>
@@ -112,7 +112,7 @@
 <hr /><hr />
 <a NAME="getOpenFileName" ID="getOpenFileName"></a>
 <h2>getOpenFileName</h2>
-<b>getOpenFileName</b>(<i>parent=None, caption="", directory="", filter="", options=QFileDialog.Options()</i>)
+<b>getOpenFileName</b>(<i>parent=None, caption="", directory="", filterStr="", options=QFileDialog.Options()</i>)
 <p>
     Module function to get the name of a file for opening it.
 </p><dl>
@@ -125,7 +125,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>options</i></dt>
@@ -142,7 +142,7 @@
 <hr /><hr />
 <a NAME="getOpenFileNameAndFilter" ID="getOpenFileNameAndFilter"></a>
 <h2>getOpenFileNameAndFilter</h2>
-<b>getOpenFileNameAndFilter</b>(<i>parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()</i>)
+<b>getOpenFileNameAndFilter</b>(<i>parent=None, caption="", directory="", filterStr="", initialFilter="", options=QFileDialog.Options()</i>)
 <p>
     Module function to get the name of a file for opening it and the selected
     file name filter.
@@ -156,7 +156,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>initialFilter</i></dt>
@@ -176,7 +176,7 @@
 <hr /><hr />
 <a NAME="getOpenFileNames" ID="getOpenFileNames"></a>
 <h2>getOpenFileNames</h2>
-<b>getOpenFileNames</b>(<i>parent=None, caption="", directory="", filter="", options=QFileDialog.Options()</i>)
+<b>getOpenFileNames</b>(<i>parent=None, caption="", directory="", filterStr="", options=QFileDialog.Options()</i>)
 <p>
     Module function to get a list of names of files for opening.
 </p><dl>
@@ -189,7 +189,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>options</i></dt>
@@ -206,7 +206,7 @@
 <hr /><hr />
 <a NAME="getOpenFileNamesAndFilter" ID="getOpenFileNamesAndFilter"></a>
 <h2>getOpenFileNamesAndFilter</h2>
-<b>getOpenFileNamesAndFilter</b>(<i>parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()</i>)
+<b>getOpenFileNamesAndFilter</b>(<i>parent=None, caption="", directory="", filterStr="", initialFilter="", options=QFileDialog.Options()</i>)
 <p>
     Module function to get a list of names of files for opening and the
     selected file name filter.
@@ -220,7 +220,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>initialFilter</i></dt>
@@ -241,7 +241,7 @@
 <hr /><hr />
 <a NAME="getSaveFileName" ID="getSaveFileName"></a>
 <h2>getSaveFileName</h2>
-<b>getSaveFileName</b>(<i>parent=None, caption="", directory="", filter="", options=QFileDialog.Options()</i>)
+<b>getSaveFileName</b>(<i>parent=None, caption="", directory="", filterStr="", options=QFileDialog.Options()</i>)
 <p>
     Module function to get the name of a file for saving it.
 </p><dl>
@@ -254,7 +254,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>options</i></dt>
@@ -271,7 +271,7 @@
 <hr /><hr />
 <a NAME="getSaveFileNameAndFilter" ID="getSaveFileNameAndFilter"></a>
 <h2>getSaveFileNameAndFilter</h2>
-<b>getSaveFileNameAndFilter</b>(<i>parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()</i>)
+<b>getSaveFileNameAndFilter</b>(<i>parent=None, caption="", directory="", filterStr="", initialFilter="", options=QFileDialog.Options()</i>)
 <p>
     Module function to get the name of a file for saving it and the selected
     file name filter.
@@ -285,7 +285,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>initialFilter</i></dt>
--- a/Documentation/Source/eric6.E5Gui.E5ProgressDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5ProgressDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -74,7 +74,7 @@
 </table>
 <a NAME="E5ProgressDialog.__init__" ID="E5ProgressDialog.__init__"></a>
 <h4>E5ProgressDialog (Constructor)</h4>
-<b>E5ProgressDialog</b>(<i>labelText, cancelButtonText, minimum, maximum, format=None, parent=None, flags=Qt.WindowFlags()</i>)
+<b>E5ProgressDialog</b>(<i>labelText, cancelButtonText, minimum, maximum, labelFormat=None, parent=None, flags=Qt.WindowFlags()</i>)
 <p>
         Constructor
 </p><dl>
@@ -90,7 +90,7 @@
 </dd><dt><i>maximum</i></dt>
 <dd>
 maximum value (integer)
-</dd><dt><i>format=</i></dt>
+</dd><dt><i>labelFormat=</i></dt>
 <dd>
 label format of the progress bar (string)
 </dd><dt><i>parent=</i></dt>
@@ -112,11 +112,11 @@
 </dd>
 </dl><a NAME="E5ProgressDialog.setFormat" ID="E5ProgressDialog.setFormat"></a>
 <h4>E5ProgressDialog.setFormat</h4>
-<b>setFormat</b>(<i>format</i>)
+<b>setFormat</b>(<i>labelFormat</i>)
 <p>
         Public method to set the progress bar format.
 </p><dl>
-<dt><i>format</i></dt>
+<dt><i>labelFormat</i></dt>
 <dd>
 progress bar format (string)
 </dd>
--- a/Documentation/Source/eric6.E5Gui.E5TreeWidget.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5TreeWidget.html	Sat Mar 11 19:18:57 2017 +0100
@@ -229,11 +229,11 @@
 </dd>
 </dl><a NAME="E5TreeWidget.filterString" ID="E5TreeWidget.filterString"></a>
 <h4>E5TreeWidget.filterString</h4>
-<b>filterString</b>(<i>filter</i>)
+<b>filterString</b>(<i>filterStr</i>)
 <p>
         Public slot to set a new filter.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterStr</i></dt>
 <dd>
 filter to be set (string)
 </dd>
--- a/Documentation/Source/eric6.Globals.compatibility_fixes.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Globals.compatibility_fixes.html	Sat Mar 11 19:18:57 2017 +0100
@@ -343,11 +343,11 @@
 <hr /><hr />
 <a NAME="open" ID="open"></a>
 <h2>open</h2>
-<b>open</b>(<i>file, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True</i>)
+<b>open</b>(<i>filein, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True</i>)
 <p>
     Replacement for the build in open function.
 </p><dl>
-<dt><i>file</i></dt>
+<dt><i>filein</i></dt>
 <dd>
 filename or file descriptor (string)
 </dd><dt><i>mode=</i></dt>
--- a/Documentation/Source/eric6.Graphics.AssociationItem.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Graphics.AssociationItem.html	Sat Mar 11 19:18:57 2017 +0100
@@ -123,7 +123,7 @@
 </dd>
 </dl><a NAME="AssociationItem.__init__" ID="AssociationItem.__init__"></a>
 <h4>AssociationItem (Constructor)</h4>
-<b>AssociationItem</b>(<i>itemA, itemB, type=Normal, topToBottom=False, parent=None</i>)
+<b>AssociationItem</b>(<i>itemA, itemB, assocType=Normal, topToBottom=False, parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -133,7 +133,7 @@
 </dd><dt><i>itemB</i></dt>
 <dd>
 second widget of the association
-</dd><dt><i>type</i></dt>
+</dd><dt><i>assocType</i></dt>
 <dd>
 type of the association. This must be one of
             <ul>
--- a/Documentation/Source/eric6.Graphics.UMLGraphicsView.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Graphics.UMLGraphicsView.html	Sat Mar 11 19:18:57 2017 +0100
@@ -323,11 +323,11 @@
 </dd>
 </dl><a NAME="UMLGraphicsView.findItem" ID="UMLGraphicsView.findItem"></a>
 <h4>UMLGraphicsView.findItem</h4>
-<b>findItem</b>(<i>id</i>)
+<b>findItem</b>(<i>itemId</i>)
 <p>
         Public method to find an UML item based on the ID.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>itemId</i></dt>
 <dd>
 of the item to search for (integer)
 </dd>
--- a/Documentation/Source/eric6.Graphics.UMLItem.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Graphics.UMLItem.html	Sat Mar 11 19:18:57 2017 +0100
@@ -276,11 +276,11 @@
         Public method to remove all associations of this widget.
 </p><a NAME="UMLItem.setId" ID="UMLItem.setId"></a>
 <h4>UMLItem.setId</h4>
-<b>setId</b>(<i>id</i>)
+<b>setId</b>(<i>itemId</i>)
 <p>
         Public method to assign an ID to the item.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>itemId</i></dt>
 <dd>
 assigned ID (integer)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -203,11 +203,11 @@
         Private slot to update the selected subscription.
 </p><a NAME="AdBlockDialog.addCustomRule" ID="AdBlockDialog.addCustomRule"></a>
 <h4>AdBlockDialog.addCustomRule</h4>
-<b>addCustomRule</b>(<i>filter</i>)
+<b>addCustomRule</b>(<i>filterRule</i>)
 <p>
         Public slot to add a custom AdBlock rule.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter to be added (string)
 </dd>
@@ -237,11 +237,11 @@
 </dd>
 </dl><a NAME="AdBlockDialog.on_searchEdit_textChanged" ID="AdBlockDialog.on_searchEdit_textChanged"></a>
 <h4>AdBlockDialog.on_searchEdit_textChanged</h4>
-<b>on_searchEdit_textChanged</b>(<i>filter</i>)
+<b>on_searchEdit_textChanged</b>(<i>filterRule</i>)
 <p>
         Private slot to set a new filter on the current widget.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter to be set (string)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockRule.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockRule.html	Sat Mar 11 19:18:57 2017 +0100
@@ -148,11 +148,11 @@
 </table>
 <a NAME="AdBlockRule.__init__" ID="AdBlockRule.__init__"></a>
 <h4>AdBlockRule (Constructor)</h4>
-<b>AdBlockRule</b>(<i>filter="", subscription=None</i>)
+<b>AdBlockRule</b>(<i>filterRule="", subscription=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter string of the rule (string)
 </dd><dt><i>subscription</i></dt>
@@ -431,11 +431,11 @@
 </dd>
 </dl><a NAME="AdBlockRule.setFilter" ID="AdBlockRule.setFilter"></a>
 <h4>AdBlockRule.setFilter</h4>
-<b>setFilter</b>(<i>filter</i>)
+<b>setFilter</b>(<i>filterRule</i>)
 <p>
         Public method to set the rule filter string.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 rule filter string (string)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockTreeWidget.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockTreeWidget.html	Sat Mar 11 19:18:57 2017 +0100
@@ -156,11 +156,11 @@
         Private slot handling a subscription change.
 </p><a NAME="AdBlockTreeWidget.addRule" ID="AdBlockTreeWidget.addRule"></a>
 <h4>AdBlockTreeWidget.addRule</h4>
-<b>addRule</b>(<i>filter=""</i>)
+<b>addRule</b>(<i>filterRule=""</i>)
 <p>
         Public slot to add a new rule.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter to be added (string)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -82,11 +82,11 @@
 </table>
 <a NAME="BookmarksImporter.__init__" ID="BookmarksImporter.__init__"></a>
 <h4>BookmarksImporter (Constructor)</h4>
-<b>BookmarksImporter</b>(<i>id="", parent=None</i>)
+<b>BookmarksImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -88,11 +88,11 @@
 </table>
 <a NAME="ChromeImporter.__init__" ID="ChromeImporter.__init__"></a>
 <h4>ChromeImporter (Constructor)</h4>
-<b>ChromeImporter</b>(<i>id="", parent=None</i>)
+<b>ChromeImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -173,11 +173,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -79,11 +79,11 @@
 </table>
 <a NAME="FirefoxImporter.__init__" ID="FirefoxImporter.__init__"></a>
 <h4>FirefoxImporter (Constructor)</h4>
-<b>FirefoxImporter</b>(<i>id="", parent=None</i>)
+<b>FirefoxImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -79,11 +79,11 @@
 </table>
 <a NAME="HtmlImporter.__init__" ID="HtmlImporter.__init__"></a>
 <h4>HtmlImporter (Constructor)</h4>
-<b>HtmlImporter</b>(<i>id="", parent=None</i>)
+<b>HtmlImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given HTML source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -79,11 +79,11 @@
 </table>
 <a NAME="IExplorerImporter.__init__" ID="IExplorerImporter.__init__"></a>
 <h4>IExplorerImporter (Constructor)</h4>
-<b>IExplorerImporter</b>(<i>id="", parent=None</i>)
+<b>IExplorerImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -79,11 +79,11 @@
 </table>
 <a NAME="OperaImporter.__init__" ID="OperaImporter.__init__"></a>
 <h4>OperaImporter (Constructor)</h4>
-<b>OperaImporter</b>(<i>id="", parent=None</i>)
+<b>OperaImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -82,11 +82,11 @@
 </table>
 <a NAME="SafariImporter.__init__" ID="SafariImporter.__init__"></a>
 <h4>SafariImporter (Constructor)</h4>
-<b>SafariImporter</b>(<i>id="", parent=None</i>)
+<b>SafariImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -141,11 +141,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -79,11 +79,11 @@
 </table>
 <a NAME="XbelImporter.__init__" ID="XbelImporter.__init__"></a>
 <h4>XbelImporter (Constructor)</h4>
-<b>XbelImporter</b>(<i>id="", parent=None</i>)
+<b>XbelImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given XBEL source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.__init__.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.__init__.html	Sat Mar 11 19:18:57 2017 +0100
@@ -47,11 +47,11 @@
 <hr /><hr />
 <a NAME="getImporter" ID="getImporter"></a>
 <h2>getImporter</h2>
-<b>getImporter</b>(<i>id, parent=None</i>)
+<b>getImporter</b>(<i>sourceId, parent=None</i>)
 <p>
     Module function to get an importer for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source id to get an importer for (string)
 </dd><dt><i>parent</i></dt>
@@ -73,11 +73,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source id to get info for (string)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -215,11 +215,11 @@
 </dd>
 </dl><a NAME="FlashCookieManagerDialog.on_filterEdit_textChanged" ID="FlashCookieManagerDialog.on_filterEdit_textChanged"></a>
 <h4>FlashCookieManagerDialog.on_filterEdit_textChanged</h4>
-<b>on_filterEdit_textChanged</b>(<i>filter</i>)
+<b>on_filterEdit_textChanged</b>(<i>filterStr</i>)
 <p>
         Private slot to filter the cookies list.
 </p><dl>
-<dt><i>filter</i> (str)</dt>
+<dt><i>filterStr</i> (str)</dt>
 <dd>
 filter text
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.HelpIndexWidget.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.HelpIndexWidget.html	Sat Mar 11 19:18:57 2017 +0100
@@ -133,11 +133,11 @@
         Private slot to enable the search edit.
 </p><a NAME="HelpIndexWidget.__filterIndices" ID="HelpIndexWidget.__filterIndices"></a>
 <h4>HelpIndexWidget.__filterIndices</h4>
-<b>__filterIndices</b>(<i>filter</i>)
+<b>__filterIndices</b>(<i>filterStr</i>)
 <p>
         Private slot to filter the indices according to the given filter.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterStr</i></dt>
 <dd>
 filter to be used (string)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.WebPlugins.ClickToFlash.ClickToFlash.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.WebPlugins.ClickToFlash.ClickToFlash.html	Sat Mar 11 19:18:57 2017 +0100
@@ -232,13 +232,13 @@
         Private slot to hide the object.
 </p><a NAME="ClickToFlash.__load" ID="ClickToFlash.__load"></a>
 <h4>ClickToFlash.__load</h4>
-<b>__load</b>(<i>all=False</i>)
+<b>__load</b>(<i>allPlayers=False</i>)
 <p>
         Private slot to load the flash content.
 </p><dl>
-<dt><i>all</i></dt>
+<dt><i>allPlayers</i></dt>
 <dd>
-flag indicating to load all flash players. (boolean)
+flag indicating to load all flash players (boolean)
 </dd>
 </dl><a NAME="ClickToFlash.__removeFromWhitelist" ID="ClickToFlash.__removeFromWhitelist"></a>
 <h4>ClickToFlash.__removeFromWhitelist</h4>
--- a/Documentation/Source/eric6.HexEdit.HexEditSearchReplaceWidget.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.HexEdit.HexEditSearchReplaceWidget.html	Sat Mar 11 19:18:57 2017 +0100
@@ -178,14 +178,14 @@
 </dd>
 </dl><a NAME="HexEditSearchReplaceWidget.__bytearray2text" ID="HexEditSearchReplaceWidget.__bytearray2text"></a>
 <h4>HexEditSearchReplaceWidget.__bytearray2text</h4>
-<b>__bytearray2text</b>(<i>array, format</i>)
+<b>__bytearray2text</b>(<i>array, dataFormat</i>)
 <p>
         Private method to convert a byte array to a text.
 </p><dl>
 <dt><i>array</i> (bytearray)</dt>
 <dd>
 byte array to be converted
-</dd><dt><i>format</i> (str)</dt>
+</dd><dt><i>dataFormat</i> (str)</dt>
 <dd>
 format of the text
 </dd>
@@ -303,14 +303,14 @@
 </dd>
 </dl><a NAME="HexEditSearchReplaceWidget.__text2bytearray" ID="HexEditSearchReplaceWidget.__text2bytearray"></a>
 <h4>HexEditSearchReplaceWidget.__text2bytearray</h4>
-<b>__text2bytearray</b>(<i>txt, format</i>)
+<b>__text2bytearray</b>(<i>txt, dataFormat</i>)
 <p>
         Private method to convert a text to a byte array.
 </p><dl>
 <dt><i>txt</i> (str)</dt>
 <dd>
 text to be converted
-</dd><dt><i>format</i> (str)</dt>
+</dd><dt><i>dataFormat</i> (str)</dt>
 <dd>
 format of the text
 </dd>
--- a/Documentation/Source/eric6.HexEdit.HexEditWidget.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.HexEdit.HexEditWidget.html	Sat Mar 11 19:18:57 2017 +0100
@@ -1123,14 +1123,14 @@
 </dd>
 </dl><a NAME="HexEditWidget.replaceByteArray" ID="HexEditWidget.replaceByteArray"></a>
 <h4>HexEditWidget.replaceByteArray</h4>
-<b>replaceByteArray</b>(<i>pos, len, byteArray</i>)
+<b>replaceByteArray</b>(<i>pos, length, byteArray</i>)
 <p>
         Public method to replace bytes.
 </p><dl>
 <dt><i>pos</i> (int)</dt>
 <dd>
 position to replace the bytes at
-</dd><dt><i>len</i> (int)</dt>
+</dd><dt><i>length</i> (int)</dt>
 <dd>
 amount of bytes to replace
 </dd><dt><i>byteArray</i> (bytearray or QByteArray)</dt>
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html	Sat Mar 11 19:18:57 2017 +0100
@@ -269,14 +269,14 @@
 <hr /><hr />
 <a NAME="worker" ID="worker"></a>
 <h2>worker</h2>
-<b>worker</b>(<i>input, output</i>)
+<b>worker</b>(<i>inputQueue, outputQueue</i>)
 <p>
     Module function acting as the parallel worker for the style check.
 </p><dl>
-<dt><i>input</i></dt>
+<dt><i>inputQueue</i></dt>
 <dd>
 input queue (multiprocessing.Queue)
-</dd><dt><i>output</i></dt>
+</dd><dt><i>outputQueue</i></dt>
 <dd>
 output queue (multiprocessing.Queue)
 </dd>
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html	Sat Mar 11 19:18:57 2017 +0100
@@ -222,14 +222,14 @@
 <hr /><hr />
 <a NAME="worker" ID="worker"></a>
 <h2>worker</h2>
-<b>worker</b>(<i>input, output</i>)
+<b>worker</b>(<i>inputQueue, outputQueue</i>)
 <p>
     Module function acting as the parallel worker for the style check.
 </p><dl>
-<dt><i>input</i></dt>
+<dt><i>inputQueue</i></dt>
 <dd>
 input queue (multiprocessing.Queue)
-</dd><dt><i>output</i></dt>
+</dd><dt><i>outputQueue</i></dt>
 <dd>
 output queue (multiprocessing.Queue)
 </dd>
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html	Sat Mar 11 19:18:57 2017 +0100
@@ -175,14 +175,14 @@
 <hr /><hr />
 <a NAME="worker" ID="worker"></a>
 <h2>worker</h2>
-<b>worker</b>(<i>input, output</i>)
+<b>worker</b>(<i>inputQueue, outputQueue</i>)
 <p>
     Module function acting as the parallel worker for the style check.
 </p><dl>
-<dt><i>input</i></dt>
+<dt><i>inputQueue</i></dt>
 <dd>
 input queue (multiprocessing.Queue)
-</dd><dt><i>output</i></dt>
+</dd><dt><i>outputQueue</i></dt>
 <dd>
 output queue (multiprocessing.Queue)
 </dd>
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html	Sat Mar 11 19:18:57 2017 +0100
@@ -461,14 +461,14 @@
 <hr /><hr />
 <a NAME="worker" ID="worker"></a>
 <h2>worker</h2>
-<b>worker</b>(<i>input, output</i>)
+<b>worker</b>(<i>inputQueue, outputQueue</i>)
 <p>
     Module function acting as the parallel worker for the style check.
 </p><dl>
-<dt><i>input</i></dt>
+<dt><i>inputQueue</i></dt>
 <dd>
 input queue (multiprocessing.Queue)
-</dd><dt><i>output</i></dt>
+</dd><dt><i>outputQueue</i></dt>
 <dd>
 output queue (multiprocessing.Queue)
 </dd>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.html	Sat Mar 11 19:18:57 2017 +0100
@@ -258,7 +258,7 @@
 </dd>
 </dl><a NAME="HgClient.runcommand" ID="HgClient.runcommand"></a>
 <h4>HgClient.runcommand</h4>
-<b>runcommand</b>(<i>args, prompt=None, input=None, output=None, error=None</i>)
+<b>runcommand</b>(<i>args, prompt=None, inputData=None, output=None, error=None</i>)
 <p>
         Public method to execute a command via the command server.
 </p><dl>
@@ -270,10 +270,10 @@
 function to reply to prompts by the server. It
             receives the max number of bytes to return and the contents
             of the output channel received so far.
-</dd><dt><i>input=</i></dt>
+</dd><dt><i>inputData=</i></dt>
 <dd>
-function to reply to bulk data requests by the server.
-            It receives the max number of bytes to return.
+function to reply to bulk data requests by the
+            server. It receives the max number of bytes to return.
 </dd><dt><i>output=</i></dt>
 <dd>
 function receiving the data from the server (string).
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html	Sat Mar 11 19:18:57 2017 +0100
@@ -89,17 +89,17 @@
 </dd>
 </dl><a NAME="Purge.__getEntries" ID="Purge.__getEntries"></a>
 <h4>Purge.__getEntries</h4>
-<b>__getEntries</b>(<i>repodir, all</i>)
+<b>__getEntries</b>(<i>repodir, deleteAll</i>)
 <p>
         Private method to get a list of files/directories being purged.
 </p><dl>
 <dt><i>repodir</i></dt>
 <dd>
 directory name of the repository (string)
-</dd><dt><i>all</i></dt>
+</dd><dt><i>deleteAll</i></dt>
 <dd>
-flag indicating to delete all files including ignored ones
-            (boolean)
+flag indicating to delete all files including ignored
+            ones (boolean)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -108,31 +108,31 @@
 </dd>
 </dl><a NAME="Purge.hgPurge" ID="Purge.hgPurge"></a>
 <h4>Purge.hgPurge</h4>
-<b>hgPurge</b>(<i>name, all=False</i>)
+<b>hgPurge</b>(<i>name, deleteAll=False</i>)
 <p>
         Public method to purge files and directories not tracked by Mercurial.
 </p><dl>
 <dt><i>name</i></dt>
 <dd>
 file/directory name (string)
-</dd><dt><i>all</i></dt>
+</dd><dt><i>deleteAll</i></dt>
 <dd>
-flag indicating to delete all files including ignored ones
-            (boolean)
+flag indicating to delete all files including ignored
+            ones (boolean)
 </dd>
 </dl><a NAME="Purge.hgPurgeList" ID="Purge.hgPurgeList"></a>
 <h4>Purge.hgPurgeList</h4>
-<b>hgPurgeList</b>(<i>name, all=False</i>)
+<b>hgPurgeList</b>(<i>name, deleteAll=False</i>)
 <p>
         Public method to list files and directories not tracked by Mercurial.
 </p><dl>
 <dt><i>name</i></dt>
 <dd>
 file/directory name (string)
-</dd><dt><i>all</i></dt>
+</dd><dt><i>deleteAll</i></dt>
 <dd>
-flag indicating to list all files including ignored ones
-            (boolean)
+flag indicating to list all files including ignored
+            ones (boolean)
 </dd>
 </dl><a NAME="Purge.shutdown" ID="Purge.shutdown"></a>
 <h4>Purge.shutdown</h4>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html	Sat Mar 11 19:18:57 2017 +0100
@@ -395,7 +395,7 @@
         one is at the top on top of local changes.
 </p><a NAME="QueuesProjectHelper.__hgQueuePushPopPatches" ID="QueuesProjectHelper.__hgQueuePushPopPatches"></a>
 <h4>QueuesProjectHelper.__hgQueuePushPopPatches</h4>
-<b>__hgQueuePushPopPatches</b>(<i>name, operation, all=False, named=False, force=False</i>)
+<b>__hgQueuePushPopPatches</b>(<i>name, operation, doAll=False, named=False, force=False</i>)
 <p>
         Private method to push patches onto the stack or pop patches off the
         stack.
@@ -407,7 +407,7 @@
 <dd>
 operation type to be performed (Queues.POP,
             Queues.PUSH, Queues.GOTO)
-</dd><dt><i>all=</i></dt>
+</dd><dt><i>doAll=</i></dt>
 <dd>
 flag indicating to push/pop all (boolean)
 </dd><dt><i>named=</i></dt>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html	Sat Mar 11 19:18:57 2017 +0100
@@ -215,14 +215,14 @@
 </dd>
 </dl><a NAME="Queues.getGuardsList" ID="Queues.getGuardsList"></a>
 <h4>Queues.getGuardsList</h4>
-<b>getGuardsList</b>(<i>repodir, all=True</i>)
+<b>getGuardsList</b>(<i>repodir, allGuards=True</i>)
 <p>
         Public method to get a list of all guards defined.
 </p><dl>
 <dt><i>repodir</i></dt>
 <dd>
 directory name of the repository (string)
-</dd><dt><i>all</i></dt>
+</dd><dt><i>allGuards</i></dt>
 <dd>
 flag indicating to get all guards (boolean)
 </dd>
@@ -406,7 +406,7 @@
 </dd>
 </dl><a NAME="Queues.hgQueuePushPopPatches" ID="Queues.hgQueuePushPopPatches"></a>
 <h4>Queues.hgQueuePushPopPatches</h4>
-<b>hgQueuePushPopPatches</b>(<i>name, operation, all=False, named=False, force=False</i>)
+<b>hgQueuePushPopPatches</b>(<i>name, operation, doAll=False, named=False, force=False</i>)
 <p>
         Public method to push patches onto the stack or pop patches off the
         stack.
@@ -418,7 +418,7 @@
 <dd>
 operation type to be performed (Queues.POP,
             Queues.PUSH, Queues.GOTO)
-</dd><dt><i>all=</i></dt>
+</dd><dt><i>doAll=</i></dt>
 <dd>
 flag indicating to push/pop all (boolean)
 </dd><dt><i>named=</i></dt>
--- a/Documentation/Source/eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.html	Sat Mar 11 19:18:57 2017 +0100
@@ -375,7 +375,7 @@
 </dd>
 </dl><a NAME="Listspace._addView" ID="Listspace._addView"></a>
 <h4>Listspace._addView</h4>
-<b>_addView</b>(<i>win, fn=None, noName="", next=False</i>)
+<b>_addView</b>(<i>win, fn=None, noName="", addNext=False</i>)
 <p>
         Protected method to add a view (i.e. window).
 </p><dl>
@@ -388,7 +388,7 @@
 </dd><dt><i>noName</i></dt>
 <dd>
 name to be used for an unnamed editor (string)
-</dd><dt><i>next</i></dt>
+</dd><dt><i>addNext</i></dt>
 <dd>
 flag indicating to add the view next to the current
             view (bool)
--- a/Documentation/Source/eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.html	Sat Mar 11 19:18:57 2017 +0100
@@ -533,13 +533,13 @@
 </dd>
 </dl><a NAME="TabWidget.indexOf" ID="TabWidget.indexOf"></a>
 <h4>TabWidget.indexOf</h4>
-<b>indexOf</b>(<i>object</i>)
+<b>indexOf</b>(<i>widget</i>)
 <p>
         Public method to get the tab index of the given editor.
 </p><dl>
-<dt><i>object</i></dt>
+<dt><i>widget</i></dt>
 <dd>
-object to get the index for (QLabel or Editor)
+widget to get the index for (QLabel or Editor)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -580,13 +580,13 @@
 </dd>
 </dl><a NAME="TabWidget.removeWidget" ID="TabWidget.removeWidget"></a>
 <h4>TabWidget.removeWidget</h4>
-<b>removeWidget</b>(<i>object</i>)
+<b>removeWidget</b>(<i>widget</i>)
 <p>
         Public method to remove a widget.
 </p><dl>
-<dt><i>object</i></dt>
+<dt><i>widget</i></dt>
 <dd>
-object to be removed (QWidget)
+widget to be removed (QWidget)
 </dd>
 </dl><a NAME="TabWidget.setCurrentWidget" ID="TabWidget.setCurrentWidget"></a>
 <h4>TabWidget.setCurrentWidget</h4>
@@ -814,7 +814,7 @@
 </dd>
 </dl><a NAME="Tabview._addView" ID="Tabview._addView"></a>
 <h4>Tabview._addView</h4>
-<b>_addView</b>(<i>win, fn=None, noName="", next=False</i>)
+<b>_addView</b>(<i>win, fn=None, noName="", addNext=False</i>)
 <p>
         Protected method to add a view (i.e. window).
 </p><dl>
@@ -827,7 +827,7 @@
 </dd><dt><i>noName</i></dt>
 <dd>
 name to be used for an unnamed editor (string)
-</dd><dt><i>next</i></dt>
+</dd><dt><i>addNext</i></dt>
 <dd>
 flag indicating to add the view next to the current
             view (bool)
--- a/Documentation/Source/eric6.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -132,12 +132,12 @@
         Private slot to enable/disable certain groups and the test button.
 </p><a NAME="FileDialogWizardDialog.__toggleInitialFilterAndResult" ID="FileDialogWizardDialog.__toggleInitialFilterAndResult"></a>
 <h4>FileDialogWizardDialog.__toggleInitialFilterAndResult</h4>
-<b>__toggleInitialFilterAndResult</b>(<i>id</i>)
+<b>__toggleInitialFilterAndResult</b>(<i>checkedId</i>)
 <p>
         Private slot to enable/disable the initial filter elements and the
         results entries.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>checkedId</i></dt>
 <dd>
 id of the clicked button (integer)
 </dd>
--- a/Documentation/Source/eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -121,17 +121,17 @@
         Private slot to add a line of entry widgets for single characters.
 </p><a NAME="QRegExpWizardCharactersDialog.__formatCharacter" ID="QRegExpWizardCharactersDialog.__formatCharacter"></a>
 <h4>QRegExpWizardCharactersDialog.__formatCharacter</h4>
-<b>__formatCharacter</b>(<i>char, format</i>)
+<b>__formatCharacter</b>(<i>char, formatIdentifier</i>)
 <p>
         Private method to format the characters entered into the dialog.
 </p><dl>
 <dt><i>char</i></dt>
 <dd>
 character string entered into the dialog (string)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>formatIdentifier</i></dt>
 <dd>
-string giving a special format (-c, -h, -i or -o) or
-            the already formatted character (string)
+string giving a special format (-c, -h, -i or
+            -o) or the already formatted character (string)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -145,11 +145,11 @@
         Private method to initialize the W3C character selector entries.
 </p><a NAME="QRegExpWizardCharactersDialog.__performSelectedAction" ID="QRegExpWizardCharactersDialog.__performSelectedAction"></a>
 <h4>QRegExpWizardCharactersDialog.__performSelectedAction</h4>
-<b>__performSelectedAction</b>(<i>format, lineedit, combo</i>)
+<b>__performSelectedAction</b>(<i>formatIdentifier, lineedit, combo</i>)
 <p>
         Private method performing some actions depending on the input.
 </p><dl>
-<dt><i>format</i></dt>
+<dt><i>formatIdentifier</i></dt>
 <dd>
 format of the selected entry (string)
 </dd><dt><i>lineedit</i></dt>
@@ -174,16 +174,17 @@
 </dd>
 </dl><a NAME="QRegExpWizardCharactersDialog.__populateW3cCharacterCombo" ID="QRegExpWizardCharactersDialog.__populateW3cCharacterCombo"></a>
 <h4>QRegExpWizardCharactersDialog.__populateW3cCharacterCombo</h4>
-<b>__populateW3cCharacterCombo</b>(<i>combo, format</i>)
+<b>__populateW3cCharacterCombo</b>(<i>combo, formatIdentifier</i>)
 <p>
         Private method to populate a W3C character selection combo.
 </p><dl>
 <dt><i>combo</i></dt>
 <dd>
 combo box to be populated (QComboBox)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>formatIdentifier</i></dt>
 <dd>
-format identifier (one of "-ccp", "-ccn", "-cbp", "-cbn")
+format identifier (one of "-ccp", "-ccn",
+            "-cbp", "-cbn")
 </dd>
 </dl><a NAME="QRegExpWizardCharactersDialog.__rangesCharTypeSelected" ID="QRegExpWizardCharactersDialog.__rangesCharTypeSelected"></a>
 <h4>QRegExpWizardCharactersDialog.__rangesCharTypeSelected</h4>
--- a/Documentation/Source/eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardCharactersDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardCharactersDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -117,17 +117,17 @@
         Private slot to add a line of entry widgets for single characters.
 </p><a NAME="QRegularExpressionWizardCharactersDialog.__formatCharacter" ID="QRegularExpressionWizardCharactersDialog.__formatCharacter"></a>
 <h4>QRegularExpressionWizardCharactersDialog.__formatCharacter</h4>
-<b>__formatCharacter</b>(<i>char, format</i>)
+<b>__formatCharacter</b>(<i>char, formatIdentifier</i>)
 <p>
         Private method to format the characters entered into the dialog.
 </p><dl>
 <dt><i>char</i></dt>
 <dd>
 character string entered into the dialog (string)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>formatIdentifier</i></dt>
 <dd>
-string giving a special format (-c, -h, -i or -o) or
-            the already formatted character (string)
+string giving a special format (-c, -h, -i or
+            -o) or the already formatted character (string)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -141,11 +141,11 @@
         Private method to initialize the W3C character selector entries.
 </p><a NAME="QRegularExpressionWizardCharactersDialog.__performSelectedAction" ID="QRegularExpressionWizardCharactersDialog.__performSelectedAction"></a>
 <h4>QRegularExpressionWizardCharactersDialog.__performSelectedAction</h4>
-<b>__performSelectedAction</b>(<i>format, lineedit, combo</i>)
+<b>__performSelectedAction</b>(<i>formatIdentifier, lineedit, combo</i>)
 <p>
         Private method performing some actions depending on the input.
 </p><dl>
-<dt><i>format</i></dt>
+<dt><i>formatIdentifier</i></dt>
 <dd>
 format of the selected entry (string)
 </dd><dt><i>lineedit</i></dt>
@@ -170,14 +170,14 @@
 </dd>
 </dl><a NAME="QRegularExpressionWizardCharactersDialog.__populateCharacterCombo" ID="QRegularExpressionWizardCharactersDialog.__populateCharacterCombo"></a>
 <h4>QRegularExpressionWizardCharactersDialog.__populateCharacterCombo</h4>
-<b>__populateCharacterCombo</b>(<i>combo, format</i>)
+<b>__populateCharacterCombo</b>(<i>combo, formatIdentifier</i>)
 <p>
         Private method to populate a character selection combo.
 </p><dl>
 <dt><i>combo</i></dt>
 <dd>
 combo box to be populated (QComboBox)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>formatIdentifier</i></dt>
 <dd>
 format identifier (one of "-ccp", "-ccn",
             "-cbp", "-cbn", "-csp", "-csn", "-psp", "-psn")
--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorFilePage.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorFilePage.html	Sat Mar 11 19:18:57 2017 +0100
@@ -102,11 +102,11 @@
         Constructor
 </p><a NAME="EditorFilePage.__checkFileFilter" ID="EditorFilePage.__checkFileFilter"></a>
 <h4>EditorFilePage.__checkFileFilter</h4>
-<b>__checkFileFilter</b>(<i>filter</i>)
+<b>__checkFileFilter</b>(<i>fileFilter</i>)
 <p>
         Private method to check a file filter for validity.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>fileFilter</i></dt>
 <dd>
 file filter pattern to check (string)
 </dd>
--- a/Documentation/Source/eric6.Project.AddDirectoryDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Project.AddDirectoryDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -76,14 +76,14 @@
 </table>
 <a NAME="AddDirectoryDialog.__init__" ID="AddDirectoryDialog.__init__"></a>
 <h4>AddDirectoryDialog (Constructor)</h4>
-<b>AddDirectoryDialog</b>(<i>pro, filter='source', parent=None, name=None, startdir=None</i>)
+<b>AddDirectoryDialog</b>(<i>pro, fileTypeFilter='source', parent=None, name=None, startdir=None</i>)
 <p>
         Constructor
 </p><dl>
 <dt><i>pro</i></dt>
 <dd>
 reference to the project object
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>fileTypeFilter</i></dt>
 <dd>
 file type filter (string)
 </dd><dt><i>parent</i></dt>
@@ -120,7 +120,7 @@
 </dd>
 </dl><a NAME="AddDirectoryDialog.on_sourceDirPicker_textChanged" ID="AddDirectoryDialog.on_sourceDirPicker_textChanged"></a>
 <h4>AddDirectoryDialog.on_sourceDirPicker_textChanged</h4>
-<b>on_sourceDirPicker_textChanged</b>(<i>dir</i>)
+<b>on_sourceDirPicker_textChanged</b>(<i>directory</i>)
 <p>
         Private slot to handle the source directory text changed.
 </p><p>
@@ -129,7 +129,7 @@
         It is assumed, that the user wants to add a bunch of files to
         the project in place.
 </p><dl>
-<dt><i>dir</i></dt>
+<dt><i>directory</i></dt>
 <dd>
 the text of the source directory line edit (string)
 </dd>
--- a/Documentation/Source/eric6.Project.AddFileDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Project.AddFileDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -76,7 +76,7 @@
 </table>
 <a NAME="AddFileDialog.__init__" ID="AddFileDialog.__init__"></a>
 <h4>AddFileDialog (Constructor)</h4>
-<b>AddFileDialog</b>(<i>pro, parent=None, filter=None, name=None, startdir=None</i>)
+<b>AddFileDialog</b>(<i>pro, parent=None, fileTypeFilter=None, name=None, startdir=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -86,7 +86,7 @@
 </dd><dt><i>parent</i></dt>
 <dd>
 parent widget of this dialog (QWidget)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>fileTypeFilter</i></dt>
 <dd>
 filter specification for the file to add (string)
 </dd><dt><i>name</i></dt>
--- a/Documentation/Source/eric6.Project.Project.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Project.Project.html	Sat Mar 11 19:18:57 2017 +0100
@@ -1237,11 +1237,11 @@
         Private method to write the project data to an XML file.
 </p><a NAME="Project.addDirectory" ID="Project.addDirectory"></a>
 <h4>Project.addDirectory</h4>
-<b>addDirectory</b>(<i>filter=None, startdir=None</i>)
+<b>addDirectory</b>(<i>fileTypeFilter=None, startdir=None</i>)
 <p>
         Public method used to add all files of a directory to the project.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>fileTypeFilter</i></dt>
 <dd>
 filter to be used by the add directory dialog
             (string out of source, form, resource, interface, others)
@@ -1261,11 +1261,11 @@
 </dd>
 </dl><a NAME="Project.addFiles" ID="Project.addFiles"></a>
 <h4>Project.addFiles</h4>
-<b>addFiles</b>(<i>filter=None, startdir=None</i>)
+<b>addFiles</b>(<i>fileTypeFilter=None, startdir=None</i>)
 <p>
         Public slot used to add files to the project.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>fileTypeFilter</i></dt>
 <dd>
 filter to be used by the add file dialog
             (string out of source, form, resource, interface, others)
--- a/Documentation/Source/eric6.Project.ProjectBaseBrowser.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Project.ProjectBaseBrowser.html	Sat Mar 11 19:18:57 2017 +0100
@@ -385,7 +385,7 @@
         Protected method to rename a file of the project.
 </p><a NAME="ProjectBaseBrowser._selectEntries" ID="ProjectBaseBrowser._selectEntries"></a>
 <h4>ProjectBaseBrowser._selectEntries</h4>
-<b>_selectEntries</b>(<i>local=True, filter=None</i>)
+<b>_selectEntries</b>(<i>local=True, filterList=None</i>)
 <p>
         Protected method to select entries based on their VCS status.
 </p><dl>
@@ -393,7 +393,7 @@
 <dd>
 flag indicating local (i.e. non VCS controlled)
             file/directory entries should be selected (boolean)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of classes to check against
 </dd>
--- a/Documentation/Source/eric6.Project.ProjectTranslationsBrowser.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Project.ProjectTranslationsBrowser.html	Sat Mar 11 19:18:57 2017 +0100
@@ -411,7 +411,7 @@
         Private slot called by the multiMenu aboutToShow signal.
 </p><a NAME="ProjectTranslationsBrowser.__writeTempProjectFile" ID="ProjectTranslationsBrowser.__writeTempProjectFile"></a>
 <h4>ProjectTranslationsBrowser.__writeTempProjectFile</h4>
-<b>__writeTempProjectFile</b>(<i>langs, filter</i>)
+<b>__writeTempProjectFile</b>(<i>langs, filterList</i>)
 <p>
         Private method to write a temporary project file suitable for
         pylupdate and lrelease.
@@ -421,10 +421,10 @@
 list of languages to include in the process. An empty
             list (default) means that all translations should be included.
             (list of ProjectBrowserFileItem)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
-list of source file extension that should be considered
-            (list of strings)
+list of source file extension that should be
+            considered (list of strings)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
--- a/Documentation/Source/eric6.PyUnit.UnittestDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.PyUnit.UnittestDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -486,7 +486,7 @@
 </dd>
 </dl><a NAME="UnittestDialog.testErrored" ID="UnittestDialog.testErrored"></a>
 <h4>UnittestDialog.testErrored</h4>
-<b>testErrored</b>(<i>test, exc, id</i>)
+<b>testErrored</b>(<i>test, exc, testId</i>)
 <p>
         Public method called if a test errors.
 </p><dl>
@@ -496,13 +496,13 @@
 </dd><dt><i>exc</i></dt>
 <dd>
 string representation of the exception (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="UnittestDialog.testFailed" ID="UnittestDialog.testFailed"></a>
 <h4>UnittestDialog.testFailed</h4>
-<b>testFailed</b>(<i>test, exc, id</i>)
+<b>testFailed</b>(<i>test, exc, testId</i>)
 <p>
         Public method called if a test fails.
 </p><dl>
@@ -512,13 +512,13 @@
 </dd><dt><i>exc</i></dt>
 <dd>
 string representation of the exception (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="UnittestDialog.testFailedExpected" ID="UnittestDialog.testFailedExpected"></a>
 <h4>UnittestDialog.testFailedExpected</h4>
-<b>testFailedExpected</b>(<i>test, exc, id</i>)
+<b>testFailedExpected</b>(<i>test, exc, testId</i>)
 <p>
         Public method called if a test fails expectedly.
 </p><dl>
@@ -528,7 +528,7 @@
 </dd><dt><i>exc</i></dt>
 <dd>
 string representation of the exception (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
@@ -541,7 +541,7 @@
         <b>Note</b>: It is also called if it has already failed or errored.
 </p><a NAME="UnittestDialog.testSkipped" ID="UnittestDialog.testSkipped"></a>
 <h4>UnittestDialog.testSkipped</h4>
-<b>testSkipped</b>(<i>test, reason, id</i>)
+<b>testSkipped</b>(<i>test, reason, testId</i>)
 <p>
         Public method called if a test was skipped.
 </p><dl>
@@ -551,7 +551,7 @@
 </dd><dt><i>reason</i></dt>
 <dd>
 reason for skipping the test (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
@@ -570,14 +570,14 @@
 </dd>
 </dl><a NAME="UnittestDialog.testSucceededUnexpected" ID="UnittestDialog.testSucceededUnexpected"></a>
 <h4>UnittestDialog.testSucceededUnexpected</h4>
-<b>testSucceededUnexpected</b>(<i>test, id</i>)
+<b>testSucceededUnexpected</b>(<i>test, testId</i>)
 <p>
         Public method called if a test succeeds unexpectedly.
 </p><dl>
 <dt><i>test</i></dt>
 <dd>
 name of the test (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
--- a/Documentation/Source/eric6.QScintilla.Editor.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.Editor.html	Sat Mar 11 19:18:57 2017 +0100
@@ -1496,13 +1496,13 @@
         menu action.
 </p><a NAME="Editor.__completionListSelected" ID="Editor.__completionListSelected"></a>
 <h4>Editor.__completionListSelected</h4>
-<b>__completionListSelected</b>(<i>id, txt</i>)
+<b>__completionListSelected</b>(<i>listId, txt</i>)
 <p>
         Private slot to handle the selection from the completion list.
 </p><dl>
-<dt><i>id</i></dt>
-<dd>
-the ID of the user list (should be 1) (integer)
+<dt><i>listId</i></dt>
+<dd>
+the ID of the user list (should be 1 or 2) (integer)
 </dd><dt><i>txt</i></dt>
 <dd>
 the selected text (string)
--- a/Documentation/Source/eric6.QScintilla.EditorButtonsWidget.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.EditorButtonsWidget.html	Sat Mar 11 19:18:57 2017 +0100
@@ -124,11 +124,11 @@
 </dd>
 </dl><a NAME="EditorButtonsWidget.__addButton" ID="EditorButtonsWidget.__addButton"></a>
 <h4>EditorButtonsWidget.__addButton</h4>
-<b>__addButton</b>(<i>format, iconName, toolTip</i>)
+<b>__addButton</b>(<i>formatName, iconName, toolTip</i>)
 <p>
         Private method to add a format button.
 </p><dl>
-<dt><i>format</i> (str)</dt>
+<dt><i>formatName</i> (str)</dt>
 <dd>
 unique name of the format
 </dd><dt><i>iconName</i> (str)</dt>
@@ -175,11 +175,11 @@
         Private method to set the enabled state of the scroll buttons.
 </p><a NAME="EditorButtonsWidget.__formatClicked" ID="EditorButtonsWidget.__formatClicked"></a>
 <h4>EditorButtonsWidget.__formatClicked</h4>
-<b>__formatClicked</b>(<i>format</i>)
+<b>__formatClicked</b>(<i>formatName</i>)
 <p>
         Private slot to handle a format button being clicked.
 </p><dl>
-<dt><i>format</i> (str)</dt>
+<dt><i>formatName</i> (str)</dt>
 <dd>
 format type of the button
 </dd>
--- a/Documentation/Source/eric6.QScintilla.Exporters.ExporterBase.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.Exporters.ExporterBase.html	Sat Mar 11 19:18:57 2017 +0100
@@ -86,11 +86,11 @@
 </dd>
 </dl><a NAME="ExporterBase._getFileName" ID="ExporterBase._getFileName"></a>
 <h4>ExporterBase._getFileName</h4>
-<b>_getFileName</b>(<i>filter</i>)
+<b>_getFileName</b>(<i>fileFilter</i>)
 <p>
         Protected method to get the file name of the export file from the user.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>fileFilter</i></dt>
 <dd>
 the filter string to be used (string). The filter for
             "All Files (*)" is appended by this method.
--- a/Documentation/Source/eric6.QScintilla.Exporters.__init__.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.Exporters.__init__.html	Sat Mar 11 19:18:57 2017 +0100
@@ -44,11 +44,11 @@
 <hr /><hr />
 <a NAME="getExporter" ID="getExporter"></a>
 <h2>getExporter</h2>
-<b>getExporter</b>(<i>format, editor</i>)
+<b>getExporter</b>(<i>exporterFormat, editor</i>)
 <p>
     Module function to instantiate an exporter object for a given format.
 </p><dl>
-<dt><i>format</i></dt>
+<dt><i>exporterFormat</i></dt>
 <dd>
 format of the exporter (string)
 </dd><dt><i>editor</i></dt>
--- a/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Sat Mar 11 19:18:57 2017 +0100
@@ -408,7 +408,7 @@
 </dd>
 </dl><a NAME="QsciScintillaCompat.__completionListSelected" ID="QsciScintillaCompat.__completionListSelected"></a>
 <h4>QsciScintillaCompat.__completionListSelected</h4>
-<b>__completionListSelected</b>(<i>id, txt</i>)
+<b>__completionListSelected</b>(<i>listId, txt</i>)
 <p>
         Private slot to handle the selection from the completion list.
 </p><p>
@@ -417,7 +417,7 @@
         list but not giving it back when an item is selected via a
         double-click.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>listId</i></dt>
 <dd>
 the ID of the user list (integer)
 </dd><dt><i>txt</i></dt>
@@ -1632,11 +1632,11 @@
 </dd>
 </dl><a NAME="QsciScintillaCompat.showUserList" ID="QsciScintillaCompat.showUserList"></a>
 <h4>QsciScintillaCompat.showUserList</h4>
-<b>showUserList</b>(<i>id, lst</i>)
+<b>showUserList</b>(<i>listId, lst</i>)
 <p>
             Public method to show a user supplied list.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>listId</i></dt>
 <dd>
 id of the list (integer)
 </dd><dt><i>lst</i></dt>
--- a/Documentation/Source/eric6.QScintilla.Shell.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.Shell.html	Sat Mar 11 19:18:57 2017 +0100
@@ -667,11 +667,11 @@
 </dd>
 </dl><a NAME="Shell.__completionListSelected" ID="Shell.__completionListSelected"></a>
 <h4>Shell.__completionListSelected</h4>
-<b>__completionListSelected</b>(<i>id, txt</i>)
+<b>__completionListSelected</b>(<i>listId, txt</i>)
 <p>
         Private slot to handle the selection from the completion list.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>listId</i></dt>
 <dd>
 the ID of the user list (should be 1) (integer)
 </dd><dt><i>txt</i></dt>
@@ -1099,14 +1099,14 @@
 </dd>
 </dl><a NAME="Shell.focusNextPrevChild" ID="Shell.focusNextPrevChild"></a>
 <h4>Shell.focusNextPrevChild</h4>
-<b>focusNextPrevChild</b>(<i>next</i>)
+<b>focusNextPrevChild</b>(<i>nextChild</i>)
 <p>
         Public method to stop Tab moving to the next window.
 </p><p>
         While the user is entering a multi-line command, the movement to
         the next window by the Tab key being pressed is suppressed.
 </p><dl>
-<dt><i>next</i></dt>
+<dt><i>nextChild</i></dt>
 <dd>
 next window
 </dd>
--- a/Documentation/Source/eric6.Tasks.TaskFilter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Tasks.TaskFilter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -119,11 +119,11 @@
 </dd>
 </dl><a NAME="TaskFilter.setFileNameFilter" ID="TaskFilter.setFileNameFilter"></a>
 <h4>TaskFilter.setFileNameFilter</h4>
-<b>setFileNameFilter</b>(<i>filter</i>)
+<b>setFileNameFilter</b>(<i>filterStr</i>)
 <p>
         Public method to set the filename filter.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterStr</i></dt>
 <dd>
 a wildcard expression for the filename filter
             to set (string) or None
@@ -160,11 +160,11 @@
 </dd>
 </dl><a NAME="TaskFilter.setSummaryFilter" ID="TaskFilter.setSummaryFilter"></a>
 <h4>TaskFilter.setSummaryFilter</h4>
-<b>setSummaryFilter</b>(<i>filter</i>)
+<b>setSummaryFilter</b>(<i>filterStr</i>)
 <p>
         Public method to set the description filter.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterStr</i></dt>
 <dd>
 a regular expression for the description filter
             to set (string) or None
--- a/Documentation/Source/eric6.UI.Browser.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.UI.Browser.html	Sat Mar 11 19:18:57 2017 +0100
@@ -350,11 +350,11 @@
         Protected slot to prepare the goto submenu of the attribute menu.
 </p><a NAME="Browser.getSelectedItems" ID="Browser.getSelectedItems"></a>
 <h4>Browser.getSelectedItems</h4>
-<b>getSelectedItems</b>(<i>filter=None</i>)
+<b>getSelectedItems</b>(<i>filterList=None</i>)
 <p>
         Public method to get the selected items.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterList</i></dt>
 <dd>
 list of classes to check against
 </dd>
@@ -365,11 +365,11 @@
 </dd>
 </dl><a NAME="Browser.getSelectedItemsCount" ID="Browser.getSelectedItemsCount"></a>
 <h4>Browser.getSelectedItemsCount</h4>
-<b>getSelectedItemsCount</b>(<i>filter=None</i>)
+<b>getSelectedItemsCount</b>(<i>filterList=None</i>)
 <p>
         Public method to get the count of items selected.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterList</i></dt>
 <dd>
 list of classes to check against
 </dd>
@@ -380,11 +380,11 @@
 </dd>
 </dl><a NAME="Browser.getSelectedItemsCountCategorized" ID="Browser.getSelectedItemsCountCategorized"></a>
 <h4>Browser.getSelectedItemsCountCategorized</h4>
-<b>getSelectedItemsCountCategorized</b>(<i>filter=None</i>)
+<b>getSelectedItemsCountCategorized</b>(<i>filterList=None</i>)
 <p>
         Public method to get a categorized count of selected items.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterList</i></dt>
 <dd>
 list of classes to check against
 </dd>
@@ -463,14 +463,14 @@
         Public slot to save the toplevel directories.
 </p><a NAME="Browser.wantedItem" ID="Browser.wantedItem"></a>
 <h4>Browser.wantedItem</h4>
-<b>wantedItem</b>(<i>itm, filter=None</i>)
+<b>wantedItem</b>(<i>itm, filterList=None</i>)
 <p>
         Public method to check type of an item.
 </p><dl>
 <dt><i>itm</i></dt>
 <dd>
 the item to check (BrowserItem)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of classes to check against
 </dd>
--- a/Documentation/Source/eric6.UI.CompareDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.UI.CompareDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -134,7 +134,7 @@
 </dd>
 </dl><a NAME="CompareDialog.__appendText" ID="CompareDialog.__appendText"></a>
 <h4>CompareDialog.__appendText</h4>
-<b>__appendText</b>(<i>pane, linenumber, line, format, interLine=False</i>)
+<b>__appendText</b>(<i>pane, linenumber, line, charFormat, interLine=False</i>)
 <p>
         Private method to append text to the end of the contents pane.
 </p><dl>
@@ -147,7 +147,7 @@
 </dd><dt><i>line</i></dt>
 <dd>
 text to insert (string)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>charFormat</i></dt>
 <dd>
 text format to be used (QTextCharFormat)
 </dd><dt><i>interLine</i></dt>
--- a/Documentation/Source/eric6.UI.NumbersWidget.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.UI.NumbersWidget.html	Sat Mar 11 19:18:57 2017 +0100
@@ -378,11 +378,11 @@
 </dd>
 </dl><a NAME="NumbersWidget.__formatNumbers" ID="NumbersWidget.__formatNumbers"></a>
 <h4>NumbersWidget.__formatNumbers</h4>
-<b>__formatNumbers</b>(<i>format</i>)
+<b>__formatNumbers</b>(<i>numberFormat</i>)
 <p>
         Private method to format the various number inputs.
 </p><dl>
-<dt><i>format</i></dt>
+<dt><i>numberFormat</i></dt>
 <dd>
 number format indicator (integer)
 </dd>
--- a/Documentation/Source/eric6.UI.UserInterface.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.UI.UserInterface.html	Sat Mar 11 19:18:57 2017 +0100
@@ -2067,16 +2067,16 @@
         Public slot to handle the activation of the cooperation window.
 </p><a NAME="UserInterface.addE5Actions" ID="UserInterface.addE5Actions"></a>
 <h4>UserInterface.addE5Actions</h4>
-<b>addE5Actions</b>(<i>actions, type</i>)
+<b>addE5Actions</b>(<i>actions, actionType</i>)
 <p>
         Public method to add actions to the list of actions.
 </p><dl>
 <dt><i>actions</i></dt>
 <dd>
 list of actions to be added (list of E5Action)
-</dd><dt><i>type</i></dt>
+</dd><dt><i>actionType</i></dt>
 <dd>
-string denoting the action set to get.
+string denoting the action set to add to.
             It must be one of "ui" or "wizards".
 </dd>
 </dl><a NAME="UserInterface.addSideWidget" ID="UserInterface.addSideWidget"></a>
@@ -2211,11 +2211,11 @@
 </dd>
 </dl><a NAME="UserInterface.getActions" ID="UserInterface.getActions"></a>
 <h4>UserInterface.getActions</h4>
-<b>getActions</b>(<i>type</i>)
+<b>getActions</b>(<i>actionType</i>)
 <p>
         Public method to get a list of all actions.
 </p><dl>
-<dt><i>type</i></dt>
+<dt><i>actionType</i></dt>
 <dd>
 string denoting the action set to get.
             It must be one of "ui" or "wizards".
@@ -2437,16 +2437,16 @@
 </dd>
 </dl><a NAME="UserInterface.removeE5Actions" ID="UserInterface.removeE5Actions"></a>
 <h4>UserInterface.removeE5Actions</h4>
-<b>removeE5Actions</b>(<i>actions, type='ui'</i>)
+<b>removeE5Actions</b>(<i>actions, actionType='ui'</i>)
 <p>
         Public method to remove actions from the list of actions.
 </p><dl>
 <dt><i>actions</i></dt>
 <dd>
 list of actions (list of E5Action)
-</dd><dt><i>type</i></dt>
+</dd><dt><i>actionType</i></dt>
 <dd>
-string denoting the action set to get.
+string denoting the action set to remove from.
             It must be one of "ui" or "wizards".
 </dd>
 </dl><a NAME="UserInterface.removeSideWidget" ID="UserInterface.removeSideWidget"></a>
--- a/Documentation/Source/eric6.Utilities.ClassBrowsers.ClbrBaseClasses.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ClassBrowsers.ClbrBaseClasses.html	Sat Mar 11 19:18:57 2017 +0100
@@ -150,7 +150,7 @@
 </table>
 <a NAME="Class.__init__" ID="Class.__init__"></a>
 <h4>Class (Constructor)</h4>
-<b>Class</b>(<i>module, name, super, file, lineno</i>)
+<b>Class</b>(<i>module, name, superClasses, file, lineno</i>)
 <p>
         Constructor
 </p><dl>
@@ -160,7 +160,7 @@
 </dd><dt><i>name</i></dt>
 <dd>
 name of this class
-</dd><dt><i>super</i></dt>
+</dd><dt><i>superClasses</i></dt>
 <dd>
 list of class names this class is inherited from
 </dd><dt><i>file</i></dt>
--- a/Documentation/Source/eric6.Utilities.ClassBrowsers.idlclbr.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ClassBrowsers.idlclbr.html	Sat Mar 11 19:18:57 2017 +0100
@@ -191,7 +191,7 @@
 </table>
 <a NAME="Interface.__init__" ID="Interface.__init__"></a>
 <h4>Interface (Constructor)</h4>
-<b>Interface</b>(<i>module, name, super, file, lineno</i>)
+<b>Interface</b>(<i>module, name, superClasses, file, lineno</i>)
 <p>
         Constructor
 </p><dl>
@@ -201,9 +201,10 @@
 </dd><dt><i>name</i></dt>
 <dd>
 name of this interface
-</dd><dt><i>super</i></dt>
+</dd><dt><i>superClasses</i></dt>
 <dd>
-list of interface names this interface is inherited from
+list of interface names this interface is
+            inherited from
 </dd><dt><i>file</i></dt>
 <dd>
 filename containing this interface
--- a/Documentation/Source/eric6.Utilities.ClassBrowsers.pyclbr.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ClassBrowsers.pyclbr.html	Sat Mar 11 19:18:57 2017 +0100
@@ -144,7 +144,7 @@
 </table>
 <a NAME="Class.__init__" ID="Class.__init__"></a>
 <h4>Class (Constructor)</h4>
-<b>Class</b>(<i>module, name, super, file, lineno</i>)
+<b>Class</b>(<i>module, name, superClasses, file, lineno</i>)
 <p>
         Constructor
 </p><dl>
@@ -154,7 +154,7 @@
 </dd><dt><i>name</i></dt>
 <dd>
 name of this class
-</dd><dt><i>super</i></dt>
+</dd><dt><i>superClasses</i></dt>
 <dd>
 list of class names this class is inherited from
 </dd><dt><i>file</i></dt>
--- a/Documentation/Source/eric6.Utilities.ClassBrowsers.rbclbr.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ClassBrowsers.rbclbr.html	Sat Mar 11 19:18:57 2017 +0100
@@ -135,7 +135,7 @@
 </table>
 <a NAME="Class.__init__" ID="Class.__init__"></a>
 <h4>Class (Constructor)</h4>
-<b>Class</b>(<i>module, name, super, file, lineno</i>)
+<b>Class</b>(<i>module, name, superClasses, file, lineno</i>)
 <p>
         Constructor
 </p><dl>
@@ -145,7 +145,7 @@
 </dd><dt><i>name</i></dt>
 <dd>
 name of this class
-</dd><dt><i>super</i></dt>
+</dd><dt><i>superClasses</i></dt>
 <dd>
 list of class names this class is inherited from
 </dd><dt><i>file</i></dt>
--- a/Documentation/Source/eric6.Utilities.ModuleParser.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ModuleParser.html	Sat Mar 11 19:18:57 2017 +0100
@@ -195,7 +195,7 @@
 </table>
 <a NAME="Class.__init__" ID="Class.__init__"></a>
 <h4>Class (Constructor)</h4>
-<b>Class</b>(<i>module, name, super, file, lineno</i>)
+<b>Class</b>(<i>module, name, superClasses, file, lineno</i>)
 <p>
         Constructor
 </p><dl>
@@ -205,7 +205,7 @@
 </dd><dt><i>name</i></dt>
 <dd>
 name of the class (string)
-</dd><dt><i>super</i></dt>
+</dd><dt><i>superClasses</i></dt>
 <dd>
 list of classnames this class is inherited from
                 (list of strings)
@@ -467,7 +467,7 @@
 </table>
 <a NAME="Module.__init__" ID="Module.__init__"></a>
 <h4>Module (Constructor)</h4>
-<b>Module</b>(<i>name, file=None, type=None</i>)
+<b>Module</b>(<i>name, file=None, moduleType=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -477,7 +477,7 @@
 </dd><dt><i>file</i></dt>
 <dd>
 filename of file containing this module (string)
-</dd><dt><i>type</i></dt>
+</dd><dt><i>moduleType</i></dt>
 <dd>
 type of this module
 </dd>
@@ -494,11 +494,11 @@
 </dd>
 </dl><a NAME="Module.__py_setVisibility" ID="Module.__py_setVisibility"></a>
 <h4>Module.__py_setVisibility</h4>
-<b>__py_setVisibility</b>(<i>object</i>)
+<b>__py_setVisibility</b>(<i>objectRef</i>)
 <p>
         Private method to set the visibility of an object.
 </p><dl>
-<dt><i>object</i></dt>
+<dt><i>objectRef</i></dt>
 <dd>
 reference to the object (Attribute, Class or Function)
 </dd>
--- a/Documentation/Source/eric6.Utilities.__init__.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.__init__.html	Sat Mar 11 19:18:57 2017 +0100
@@ -630,14 +630,14 @@
 <hr /><hr />
 <a NAME="escape_entities" ID="escape_entities"></a>
 <h2>escape_entities</h2>
-<b>escape_entities</b>(<i>m, map=_escape_map</i>)
+<b>escape_entities</b>(<i>m, escmap=_escape_map</i>)
 <p>
     Function to encode html entities.
 </p><dl>
 <dt><i>m</i></dt>
 <dd>
 the match object
-</dd><dt><i>map</i></dt>
+</dd><dt><i>escmap</i></dt>
 <dd>
 the map of entities to encode
 </dd>
--- a/Documentation/Source/eric6.Utilities.binplistlib.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.binplistlib.html	Sat Mar 11 19:18:57 2017 +0100
@@ -392,14 +392,14 @@
 </dd>
 </dl><a NAME="PlistReader.getSizedInteger" ID="PlistReader.getSizedInteger"></a>
 <h4>PlistReader.getSizedInteger</h4>
-<b>getSizedInteger</b>(<i>data, bytes</i>)
+<b>getSizedInteger</b>(<i>data, length</i>)
 <p>
         Public method to read an integer of a specific size.
 </p><dl>
 <dt><i>data</i></dt>
 <dd>
 data to extract the integer from (bytes)
-</dd><dt><i>bytes</i></dt>
+</dd><dt><i>length</i></dt>
 <dd>
 length of the integer (integer)
 </dd>
@@ -499,11 +499,11 @@
 </dd>
 </dl><a NAME="PlistReader.readInteger" ID="PlistReader.readInteger"></a>
 <h4>PlistReader.readInteger</h4>
-<b>readInteger</b>(<i>bytes</i>)
+<b>readInteger</b>(<i>length</i>)
 <p>
         Public method to read an Integer object.
 </p><dl>
-<dt><i>bytes</i></dt>
+<dt><i>length</i></dt>
 <dd>
 length of the object (integer)
 </dd>
@@ -745,14 +745,14 @@
 </dd>
 </dl><a NAME="PlistWriter.binaryInt" ID="PlistWriter.binaryInt"></a>
 <h4>PlistWriter.binaryInt</h4>
-<b>binaryInt</b>(<i>obj, bytes=None</i>)
+<b>binaryInt</b>(<i>obj, length=None</i>)
 <p>
         Public method to pack an integer object.
 </p><dl>
 <dt><i>obj</i></dt>
 <dd>
 integer to be packed
-</dd><dt><i>bytes</i></dt>
+</dd><dt><i>length</i></dt>
 <dd>
 length the integer should be packed into (integer)
 </dd>
--- a/Documentation/Source/eric6.Utilities.crypto.py3AES.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.crypto.py3AES.html	Sat Mar 11 19:18:57 2017 +0100
@@ -575,11 +575,11 @@
 </table>
 <a NAME="AESModeOfOperation.__extractBytes" ID="AESModeOfOperation.__extractBytes"></a>
 <h4>AESModeOfOperation.__extractBytes</h4>
-<b>__extractBytes</b>(<i>input, start, end, mode</i>)
+<b>__extractBytes</b>(<i>inputData, start, end, mode</i>)
 <p>
         Private method to extract a range of bytes from the input.
 </p><dl>
-<dt><i>input</i></dt>
+<dt><i>inputData</i></dt>
 <dd>
 input data (bytes)
 </dd><dt><i>start</i></dt>
@@ -635,11 +635,11 @@
 </dd>
 </dl><a NAME="AESModeOfOperation.encrypt" ID="AESModeOfOperation.encrypt"></a>
 <h4>AESModeOfOperation.encrypt</h4>
-<b>encrypt</b>(<i>input, mode, key, size, IV</i>)
+<b>encrypt</b>(<i>inputData, mode, key, size, IV</i>)
 <p>
         Public method to perform the encryption operation.
 </p><dl>
-<dt><i>input</i></dt>
+<dt><i>inputData</i></dt>
 <dd>
 data to be encrypted (bytes)
 </dd><dt><i>mode</i></dt>
@@ -658,7 +658,7 @@
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-tuple with mode of operation, length of the input and
+tuple with mode of operation, length of the input data and
             the encrypted data (integer, integer, bytes)
 </dd>
 </dl><dl>
--- a/Documentation/Source/eric6.Utilities.crypto.py3PBKDF2.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.crypto.py3PBKDF2.html	Sat Mar 11 19:18:57 2017 +0100
@@ -163,14 +163,14 @@
 <hr /><hr />
 <a NAME="verifyPassword" ID="verifyPassword"></a>
 <h2>verifyPassword</h2>
-<b>verifyPassword</b>(<i>password, hash</i>)
+<b>verifyPassword</b>(<i>password, pwHash</i>)
 <p>
     Module function to verify a password against a hash encoded password.
 </p><dl>
 <dt><i>password</i></dt>
 <dd>
 clear text password (string)
-</dd><dt><i>hash</i></dt>
+</dd><dt><i>pwHash</i></dt>
 <dd>
 hash encoded password in the form
         'digestmod$iterations$salt$hashed_password' as produced by the
--- a/Documentation/Source/eric6.Utilities.uic.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.uic.html	Sat Mar 11 19:18:57 2017 +0100
@@ -67,12 +67,12 @@
 <hr /><hr />
 <a NAME="compileUiFiles" ID="compileUiFiles"></a>
 <h2>compileUiFiles</h2>
-<b>compileUiFiles</b>(<i>dir, recurse=False</i>)
+<b>compileUiFiles</b>(<i>directory, recurse=False</i>)
 <p>
     Module function to compile the .ui files of a directory tree to Python
     sources.
 </p><dl>
-<dt><i>dir</i></dt>
+<dt><i>directory</i></dt>
 <dd>
 name of a directory to scan for .ui files (string)
 </dd><dt><i>recurse</i></dt>
--- a/Documentation/Source/eric6.VCS.VersionControl.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.VCS.VersionControl.html	Sat Mar 11 19:18:57 2017 +0100
@@ -1077,11 +1077,11 @@
 </dd>
 </dl><a NAME="VersionControl.vcsSetDataFromDict" ID="VersionControl.vcsSetDataFromDict"></a>
 <h4>VersionControl.vcsSetDataFromDict</h4>
-<b>vcsSetDataFromDict</b>(<i>dict</i>)
+<b>vcsSetDataFromDict</b>(<i>dictionary</i>)
 <p>
         Public method used to set entries in the otherData dictionary.
 </p><dl>
-<dt><i>dict</i></dt>
+<dt><i>dictionary</i></dt>
 <dd>
 dictionary to pick entries from
 </dd>
--- a/Documentation/Source/eric6.ViewManager.ViewManager.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.ViewManager.ViewManager.html	Sat Mar 11 19:18:57 2017 +0100
@@ -1874,7 +1874,7 @@
 </dd>
 </dl><a NAME="ViewManager._addView" ID="ViewManager._addView"></a>
 <h4>ViewManager._addView</h4>
-<b>_addView</b>(<i>win, fn=None, noName="", next=False</i>)
+<b>_addView</b>(<i>win, fn=None, noName="", addNext=False</i>)
 <p>
         Protected method to add a view (i.e. window).
 </p><dl>
@@ -1887,7 +1887,7 @@
 </dd><dt><i>noName</i></dt>
 <dd>
 name to be used for an unnamed editor (string)
-</dd><dt><i>next</i></dt>
+</dd><dt><i>addNext</i></dt>
 <dd>
 flag indicating to add the view next to the current
             view (bool)
@@ -2283,11 +2283,11 @@
 </dd>
 </dl><a NAME="ViewManager.eventFilter" ID="ViewManager.eventFilter"></a>
 <h4>ViewManager.eventFilter</h4>
-<b>eventFilter</b>(<i>object, event</i>)
+<b>eventFilter</b>(<i>qobject, event</i>)
 <p>
         Public method called to filter an event.
 </p><dl>
-<dt><i>object</i></dt>
+<dt><i>qobject</i></dt>
 <dd>
 object, that generated the event (QObject)
 </dd><dt><i>event</i></dt>
@@ -2316,16 +2316,15 @@
 </dd>
 </dl><a NAME="ViewManager.getActions" ID="ViewManager.getActions"></a>
 <h4>ViewManager.getActions</h4>
-<b>getActions</b>(<i>type</i>)
+<b>getActions</b>(<i>actionSetType</i>)
 <p>
         Public method to get a list of all actions.
 </p><dl>
-<dt><i>type</i></dt>
+<dt><i>actionSetType</i></dt>
 <dd>
 string denoting the action set to get.
-                It must be one of "edit", "file", "search",
-                "view", "window", "macro", "bookmark" or
-                "spelling".
+            It must be one of "edit", "file", "search", "view", "window",
+            "macro", "bookmark" or "spelling".
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -2344,7 +2343,7 @@
 </dd>
 </dl><a NAME="ViewManager.getEditor" ID="ViewManager.getEditor"></a>
 <h4>ViewManager.getEditor</h4>
-<b>getEditor</b>(<i>fn, filetype="", next=False</i>)
+<b>getEditor</b>(<i>fn, filetype="", addNext=False</i>)
 <p>
         Public method to return the editor displaying the given file.
 </p><p>
@@ -2357,10 +2356,10 @@
 </dd><dt><i>filetype</i></dt>
 <dd>
 type of the source file (string)
-</dd><dt><i>next</i></dt>
+</dd><dt><i>addNext</i></dt>
 <dd>
-flag indicating that if a new editor needs to be created,
-            it should be added next to the current editor (bool)
+flag indicating that if a new editor needs to be
+            created, it should be added next to the current editor (bool)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -2710,7 +2709,7 @@
 </dd>
 </dl><a NAME="ViewManager.openSourceFile" ID="ViewManager.openSourceFile"></a>
 <h4>ViewManager.openSourceFile</h4>
-<b>openSourceFile</b>(<i>fn, lineno=-1, filetype="", selStart=0, selEnd=0, pos=0, next=False</i>)
+<b>openSourceFile</b>(<i>fn, lineno=-1, filetype="", selStart=0, selEnd=0, pos=0, addNext=False</i>)
 <p>
         Public slot to display a file in an editor.
 </p><dl>
@@ -2734,7 +2733,7 @@
 </dd><dt><i>pos</i></dt>
 <dd>
 position within the line to place the cursor at (integer)
-</dd><dt><i>next</i></dt>
+</dd><dt><i>addNext</i></dt>
 <dd>
 flag indicating to add the file next to the current
             editor (bool)
@@ -2808,11 +2807,11 @@
         Public slot to handle the projectOpened signal.
 </p><a NAME="ViewManager.receive" ID="ViewManager.receive"></a>
 <h4>ViewManager.receive</h4>
-<b>receive</b>(<i>hash, fileName, command</i>)
+<b>receive</b>(<i>projectHash, fileName, command</i>)
 <p>
         Public slot to handle received editor commands.
 </p><dl>
-<dt><i>hash</i></dt>
+<dt><i>projectHash</i></dt>
 <dd>
 hash of the project (string)
 </dd><dt><i>fileName</i></dt>
--- a/Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -206,11 +206,11 @@
         Private slot to update the selected subscription.
 </p><a NAME="AdBlockDialog.addCustomRule" ID="AdBlockDialog.addCustomRule"></a>
 <h4>AdBlockDialog.addCustomRule</h4>
-<b>addCustomRule</b>(<i>filter</i>)
+<b>addCustomRule</b>(<i>filterRule</i>)
 <p>
         Public slot to add a custom AdBlock rule.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter to be added (string)
 </dd>
@@ -240,11 +240,11 @@
 </dd>
 </dl><a NAME="AdBlockDialog.on_searchEdit_textChanged" ID="AdBlockDialog.on_searchEdit_textChanged"></a>
 <h4>AdBlockDialog.on_searchEdit_textChanged</h4>
-<b>on_searchEdit_textChanged</b>(<i>filter</i>)
+<b>on_searchEdit_textChanged</b>(<i>filterRule</i>)
 <p>
         Private slot to set a new filter on the current widget.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter to be set (string)
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockRule.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockRule.html	Sat Mar 11 19:18:57 2017 +0100
@@ -163,11 +163,11 @@
 </table>
 <a NAME="AdBlockRule.__init__" ID="AdBlockRule.__init__"></a>
 <h4>AdBlockRule (Constructor)</h4>
-<b>AdBlockRule</b>(<i>filter="", subscription=None</i>)
+<b>AdBlockRule</b>(<i>filterRule="", subscription=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter string of the rule (string)
 </dd><dt><i>subscription</i></dt>
@@ -534,11 +534,11 @@
 </dd>
 </dl><a NAME="AdBlockRule.setFilter" ID="AdBlockRule.setFilter"></a>
 <h4>AdBlockRule.setFilter</h4>
-<b>setFilter</b>(<i>filter</i>)
+<b>setFilter</b>(<i>filterRule</i>)
 <p>
         Public method to set the rule filter string.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 rule filter string (string)
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockTreeWidget.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.AdBlock.AdBlockTreeWidget.html	Sat Mar 11 19:18:57 2017 +0100
@@ -156,11 +156,11 @@
         Private slot handling a subscription change.
 </p><a NAME="AdBlockTreeWidget.addRule" ID="AdBlockTreeWidget.addRule"></a>
 <h4>AdBlockTreeWidget.addRule</h4>
-<b>addRule</b>(<i>filter=""</i>)
+<b>addRule</b>(<i>filterRule=""</i>)
 <p>
         Public slot to add a new rule.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter to be added (string)
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -82,11 +82,11 @@
 </table>
 <a NAME="BookmarksImporter.__init__" ID="BookmarksImporter.__init__"></a>
 <h4>BookmarksImporter (Constructor)</h4>
-<b>BookmarksImporter</b>(<i>id="", parent=None</i>)
+<b>BookmarksImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
--- a/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -88,11 +88,11 @@
 </table>
 <a NAME="ChromeImporter.__init__" ID="ChromeImporter.__init__"></a>
 <h4>ChromeImporter (Constructor)</h4>
-<b>ChromeImporter</b>(<i>id="", parent=None</i>)
+<b>ChromeImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -173,11 +173,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -79,11 +79,11 @@
 </table>
 <a NAME="FirefoxImporter.__init__" ID="FirefoxImporter.__init__"></a>
 <h4>FirefoxImporter (Constructor)</h4>
-<b>FirefoxImporter</b>(<i>id="", parent=None</i>)
+<b>FirefoxImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -79,11 +79,11 @@
 </table>
 <a NAME="HtmlImporter.__init__" ID="HtmlImporter.__init__"></a>
 <h4>HtmlImporter (Constructor)</h4>
-<b>HtmlImporter</b>(<i>id="", parent=None</i>)
+<b>HtmlImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given HTML source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -79,11 +79,11 @@
 </table>
 <a NAME="IExplorerImporter.__init__" ID="IExplorerImporter.__init__"></a>
 <h4>IExplorerImporter (Constructor)</h4>
-<b>IExplorerImporter</b>(<i>id="", parent=None</i>)
+<b>IExplorerImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -79,11 +79,11 @@
 </table>
 <a NAME="OperaImporter.__init__" ID="OperaImporter.__init__"></a>
 <h4>OperaImporter (Constructor)</h4>
-<b>OperaImporter</b>(<i>id="", parent=None</i>)
+<b>OperaImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -82,11 +82,11 @@
 </table>
 <a NAME="SafariImporter.__init__" ID="SafariImporter.__init__"></a>
 <h4>SafariImporter (Constructor)</h4>
-<b>SafariImporter</b>(<i>id="", parent=None</i>)
+<b>SafariImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -141,11 +141,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.html	Sat Mar 11 19:18:57 2017 +0100
@@ -79,11 +79,11 @@
 </table>
 <a NAME="XbelImporter.__init__" ID="XbelImporter.__init__"></a>
 <h4>XbelImporter (Constructor)</h4>
-<b>XbelImporter</b>(<i>id="", parent=None</i>)
+<b>XbelImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given XBEL source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.__init__.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksImporters.__init__.html	Sat Mar 11 19:18:57 2017 +0100
@@ -47,11 +47,11 @@
 <hr /><hr />
 <a NAME="getImporter" ID="getImporter"></a>
 <h2>getImporter</h2>
-<b>getImporter</b>(<i>id, parent=None</i>)
+<b>getImporter</b>(<i>sourceId, parent=None</i>)
 <p>
     Module function to get an importer for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source id to get an importer for (string)
 </dd><dt><i>parent</i></dt>
@@ -73,11 +73,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source id to get info for (string)
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.html	Sat Mar 11 19:18:57 2017 +0100
@@ -215,11 +215,11 @@
 </dd>
 </dl><a NAME="FlashCookieManagerDialog.on_filterEdit_textChanged" ID="FlashCookieManagerDialog.on_filterEdit_textChanged"></a>
 <h4>FlashCookieManagerDialog.on_filterEdit_textChanged</h4>
-<b>on_filterEdit_textChanged</b>(<i>filter</i>)
+<b>on_filterEdit_textChanged</b>(<i>filterStr</i>)
 <p>
         Private slot to filter the cookies list.
 </p><dl>
-<dt><i>filter</i> (str)</dt>
+<dt><i>filterStr</i> (str)</dt>
 <dd>
 filter text
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.QtHelp.HelpIndexWidget.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.QtHelp.HelpIndexWidget.html	Sat Mar 11 19:18:57 2017 +0100
@@ -86,7 +86,7 @@
 <td>Private slot to enable the search edit.</td>
 </tr><tr>
 <td><a href="#HelpIndexWidget.__filterIndices">__filterIndices</a></td>
-<td>Private slot to filter the indices according to the given filter.</td>
+<td>Private slot to filter the indexes according to the given filter.</td>
 </tr><tr>
 <td><a href="#HelpIndexWidget.__linkActivated">__linkActivated</a></td>
 <td>Private slot to handle the activation of a keyword entry.</td>
@@ -136,11 +136,11 @@
         Private slot to enable the search edit.
 </p><a NAME="HelpIndexWidget.__filterIndices" ID="HelpIndexWidget.__filterIndices"></a>
 <h4>HelpIndexWidget.__filterIndices</h4>
-<b>__filterIndices</b>(<i>filter</i>)
+<b>__filterIndices</b>(<i>indexFilter</i>)
 <p>
-        Private slot to filter the indices according to the given filter.
+        Private slot to filter the indexes according to the given filter.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>indexFilter</i></dt>
 <dd>
 filter to be used (string)
 </dd>
--- a/Documentation/Source/eric6.WebBrowser.TabManager.TabManagerWidget.html	Sat Mar 11 19:17:59 2017 +0100
+++ b/Documentation/Source/eric6.WebBrowser.TabManager.TabManagerWidget.html	Sat Mar 11 19:18:57 2017 +0100
@@ -239,11 +239,11 @@
         Private slot to referesh the tree.
 </p><a NAME="TabManagerWidget.__setGroupType" ID="TabManagerWidget.__setGroupType"></a>
 <h4>TabManagerWidget.__setGroupType</h4>
-<b>__setGroupType</b>(<i>type</i>)
+<b>__setGroupType</b>(<i>groupType</i>)
 <p>
         Private method to set the 'Group By' type.
 </p><dl>
-<dt><i>type</i> (int (0 - 2))</dt>
+<dt><i>groupType</i> (int (0 - 2))</dt>
 <dd>
 'Group By' type to be set
 </dd>

eric ide

mercurial