Mercurial Repositories > eric / file diff

--- a/eric7/APIs/Python3/eric7.bas	Sun May 23 18:39:22 2021 +0200
+++ b/eric7/APIs/Python3/eric7.bas	Mon May 24 11:11:43 2021 +0200
@@ -4,14 +4,14 @@
 AboutPlugin QObject
 AdBlockDialog QDialog Ui_AdBlockDialog
 AdBlockExceptionsDialog QDialog Ui_AdBlockExceptionsDialog
-AdBlockIcon E5ClickableLabel
+AdBlockIcon EricClickableLabel
 AdBlockManager QObject
 AdBlockMatcher QObject
 AdBlockPage QObject
 AdBlockRuleOption IntEnum
 AdBlockRuleType IntEnum
 AdBlockSubscription QObject
-AdBlockTreeWidget E5TreeWidget
+AdBlockTreeWidget EricTreeWidget
 AdBlockUrlInterceptor UrlInterceptor
 AddBookmarkDialog QDialog Ui_AddBookmarkDialog
 AddBookmarkProxyModel QSortFilterProxyModel
@@ -26,7 +26,7 @@
 ApplicationPage ConfigurationPageBase Ui_ApplicationPage
 ArgumentsError RuntimeError
 ArrayResolver BaseResolver
-AssociationItem E5ArrowItem
+AssociationItem EricArrowItem
 AssociationPointRegion enum.Enum
 AssociationType enum.Enum
 Attribute ClbrBaseClasses.Attribute VisibilityMixin
@@ -43,10 +43,10 @@
 BookmarksImportDialog QDialog Ui_BookmarksImportDialog
 BookmarksImporter QObject
 BookmarksManager QObject
-BookmarksMenu E5ModelMenu
+BookmarksMenu EricModelMenu
 BookmarksMenuBarMenu BookmarksMenu
 BookmarksModel QAbstractItemModel
-BookmarksToolBar E5ModelToolBar
+BookmarksToolBar EricModelToolBar
 BreakPointModel QAbstractItemModel
 BreakPointViewer QTreeView
 Browser QTreeView
@@ -67,7 +67,6 @@
 CallStackViewer QWidget
 CallTraceViewer QWidget Ui_CallTraceViewer
 ChangeBookmarkCommand QUndoCommand
-Charset str
 ChatWidget QWidget Ui_ChatWidget
 ChromeImporter BookmarksImporter
 CircuitPythonDevice MicroPythonDevice
@@ -93,7 +92,7 @@
 ColorDialogWizard QObject
 ColorDialogWizardDialog QDialog Ui_ColorDialogWizardDialog
 CompareDialog QWidget Ui_CompareDialog
-CompareWindow E5MainWindow
+CompareWindow EricMainWindow
 CompleterBase QObject
 CompleterPython CompleterBase
 CompleterRuby CompleterBase
@@ -112,7 +111,7 @@
 ConfigurationPageBase QWidget
 ConfigurationPageItem QTreeWidgetItem
 ConfigurationWidget QWidget
-ConfigurationWindow E5MainWindow
+ConfigurationWindow EricMainWindow
 Connection QTcpSocket
 ConnectionSelectionDialog QDialog Ui_ConnectionSelectionDialog
 CookieExceptionsModel QAbstractTableModel
@@ -137,7 +136,6 @@
 DebuggerPropertiesDialog QDialog Ui_DebuggerPropertiesDialog
 DebuggerPropertiesFile QObject
 DebuggerPropertiesReader XMLStreamReaderBase
-DebuggerPropertiesWriter XMLStreamWriterBase
 DebuggerPython3Page ConfigurationPageBase Ui_DebuggerPython3Page
 DeepLEngine TranslationEngine
 DefaultResolver BaseResolver
@@ -147,13 +145,10 @@
 DictViewResolver ListResolver
 DiffColoursPage ConfigurationPageBase Ui_DiffColoursPage
 DiffDialog QWidget Ui_DiffDialog
-DiffHighlighter E5GenericDiffHighlighter
+DiffHighlighter EricGenericDiffHighlighter
 DiffReport StandardReport
-DiffWindow E5MainWindow
+DiffWindow EricMainWindow
 DirectorySyncHandler SyncHandler
-DispositionParm str
-DispositionParmList UniqueNamespace
-DispositionType peg.List
 DocstringMenuForEnterOnly QMenu
 DocumentationViewerWidget QWidget
 DotDesktopListSelectionDialog QDialog Ui_DotDesktopListSelectionDialog
@@ -162,105 +157,9 @@
 DownloadAskActionDialog QDialog Ui_DownloadAskActionDialog
 DownloadItem QWidget Ui_DownloadItem
 DownloadManager QDialog Ui_DownloadManager
-DownloadManagerButton E5ToolButton
+DownloadManagerButton EricToolButton
 DownloadModel QAbstractListModel
 DummyThreadWrapper ThreadWrapper module._DummyThread
-DuplicateParamError Exception
-E5Action QAction
-E5AnimatedLabel QLabel
-E5AnimatedWidget QWidget
-E5Application QApplication
-E5ArrowItem QAbstractGraphicsShapeItem
-E5ArrowType enum.Enum
-E5ClearableComboBox E5ComboBox
-E5ClearableLineEdit E5LineEdit
-E5ClickableLabel QLabel
-E5ClickableLed E5Led
-E5ComboBox QComboBox
-E5ComboPathPicker E5PathPickerBase
-E5ComboSelectionDialog QDialog Ui_E5ComboSelectionDialog
-E5DirCompleter QCompleter
-E5DnDTabBar E5WheelTabBar
-E5ErrorMessage QErrorMessage
-E5ErrorMessageFilterDialog QDialog Ui_E5ErrorMessageFilterDialog
-E5FileCompleter QCompleter
-E5FileSaveConfirmDialog QDialog
-E5Ftp ftplib.FTP
-E5FtpProxyError ftplib.Error
-E5FtpProxyType enum.Enum
-E5GenericDiffHighlighter QSyntaxHighlighter
-E5GoogleMail QObject
-E5GoogleMailAuthBrowser QDialog
-E5GraphicsView QGraphicsView
-E5HorizontalToolBox E5TabWidget
-E5JsonServer QTcpServer
-E5Led QWidget
-E5LedType enum.Enum
-E5LineEdit QLineEdit
-E5LineEditButton QAbstractButton
-E5LineEditSide enum.Enum
-E5LineEditSideWidget QWidget
-E5ListSelectionDialog QDialog Ui_E5ListSelectionDialog
-E5ListView QListView
-E5MainWindow QMainWindow
-E5MapWidget QWidget
-E5MessageBox QMessageBox
-E5MessageBoxWizard QObject
-E5MessageBoxWizardDialog QDialog Ui_E5MessageBoxWizardDialog
-E5ModelMenu QMenu
-E5ModelToolBar QToolBar
-E5MutexLocker contextlib.AbstractContextManager
-E5NetworkHeaderDetailsDialog QDialog Ui_E5NetworkHeaderDetailsDialog
-E5NetworkProxyFactory QNetworkProxyFactory
-E5OverrideCursor contextlib.AbstractContextManager
-E5OverrideCursorProcess QProcess
-E5OverridenCursor contextlib.AbstractContextManager
-E5PassivePopup QFrame
-E5PassivePopupStyle enum.Enum
-E5PasswordMeter QProgressBar
-E5PathPicker E5PathPickerBase
-E5PathPickerBase QWidget
-E5PathPickerDialog QDialog
-E5PathPickerModes enum.Enum
-E5PlainTextDialog QDialog Ui_E5PlainTextDialog
-E5ProcessDialog QDialog Ui_E5ProcessDialog
-E5ProgressDialog QProgressDialog
-E5SideBar QWidget
-E5SideBarSide enum.Enum
-E5SimpleHelpDialog QDialog Ui_E5SimpleHelpDialog
-E5SingleApplicationClient SingleApplicationClient
-E5SingleApplicationServer SingleApplicationServer
-E5SqueezeLabel QLabel
-E5SqueezeLabelPath QLabel
-E5SslCertificateSelectionDialog QDialog Ui_E5SslCertificateSelectionDialog
-E5SslCertificatesDialog QDialog Ui_E5SslCertificatesDialog
-E5SslCertificatesInfoDialog QDialog Ui_E5SslCertificatesInfoDialog
-E5SslCertificatesInfoWidget QWidget Ui_E5SslCertificatesInfoWidget
-E5SslErrorHandler QObject
-E5SslErrorState enum.Enum
-E5SslInfoWidget QMenu
-E5StringListCompleter QCompleter
-E5StringListEditWidget QWidget Ui_E5StringListEditWidget
-E5TabWidget QTabWidget
-E5TableView QTableView
-E5TextEditSearchWidget QWidget
-E5TextEditType enum.Enum
-E5TextInputDialog QDialog
-E5TextSpinBox QSpinBox
-E5TldExtractor QObject
-E5ToolBarDialog QDialog Ui_E5ToolBarDialog
-E5ToolBarManager QObject
-E5ToolButton QToolButton
-E5ToolButtonOptions enum.IntEnum
-E5TreeSortFilterProxyModel QSortFilterProxyModel
-E5TreeView QTreeView
-E5TreeWidget QTreeWidget
-E5TreeWidgetItemsState enum.Enum
-E5UrlPermission enum.IntEnum
-E5VerticalToolBox QToolBox
-E5WheelTabBar QTabBar
-E5XmlRpcClient QObject
-E5ZoomWidget QWidget Ui_E5ZoomWidget
 EditBreakpointDialog QDialog Ui_EditBreakpointDialog
 EditWatchpointDialog QDialog Ui_EditWatchpointDialog
 Editor QsciScintillaCompat
@@ -280,7 +179,7 @@
 EditorHighlightingStylesSelectionDialog QDialog Ui_EditorHighlightingStylesSelectionDialog
 EditorKeywordsPage ConfigurationPageBase Ui_EditorKeywordsPage
 EditorLanguageTabIndentOverrideDialog QDialog Ui_EditorLanguageTabIndentOverrideDialog
-EditorMarkerMap E5MapWidget
+EditorMarkerMap EricMapWidget
 EditorMouseClickHandlerPage ConfigurationPageBase Ui_EditorMouseClickHandlerPage
 EditorOutlineModel BrowserModel
 EditorOutlineView QTreeView
@@ -293,8 +192,99 @@
 EmailDialog QDialog Ui_EmailDialog
 EmailPage ConfigurationPageBase Ui_EmailPage
 Enum ClbrBaseClasses.Enum VisibilityMixin
+EricAction QAction
+EricAnimatedLabel QLabel
+EricAnimatedWidget QWidget
+EricApplication QApplication
+EricArrowItem QAbstractGraphicsShapeItem
+EricArrowType enum.Enum
+EricClearableLineEdit EricLineEdit
+EricClickableLabel QLabel
+EricClickableLed EricLed
+EricComboPathPicker EricPathPickerBase
+EricComboSelectionDialog QDialog Ui_E5ComboSelectionDialog
+EricDirCompleter QCompleter
+EricDnDTabBar EricWheelTabBar
+EricErrorMessage QErrorMessage
+EricErrorMessageFilterDialog QDialog Ui_EricErrorMessageFilterDialog
+EricFileCompleter QCompleter
+EricFileSaveConfirmDialog QDialog
+EricFtp ftplib.FTP
+EricFtpProxyError ftplib.Error
+EricFtpProxyType enum.Enum
+EricGenericDiffHighlighter QSyntaxHighlighter
+EricGoogleMail QObject
+EricGoogleMailAuthBrowser QDialog
+EricGraphicsView QGraphicsView
+EricHorizontalToolBox EricTabWidget
+EricJsonServer QTcpServer
+EricLed QWidget
+EricLedType enum.Enum
+EricLineEdit QLineEdit
+EricLineEditButton QAbstractButton
+EricLineEditSide enum.Enum
+EricLineEditSideWidget QWidget
+EricListSelectionDialog QDialog Ui_EricListSelectionDialog
+EricListView QListView
+EricMainWindow QMainWindow
+EricMapWidget QWidget
+EricMessageBox QMessageBox
+EricMessageBoxWizard QObject
+EricMessageBoxWizardDialog QDialog Ui_EricMessageBoxWizardDialog
+EricModelMenu QMenu
+EricModelToolBar QToolBar
+EricMutexLocker contextlib.AbstractContextManager
+EricNetworkProxyFactory QNetworkProxyFactory
+EricOverrideCursor contextlib.AbstractContextManager
+EricOverrideCursorProcess QProcess
+EricOverridenCursor contextlib.AbstractContextManager
+EricPassivePopup QFrame
+EricPassivePopupStyle enum.Enum
+EricPasswordMeter QProgressBar
+EricPathPicker EricPathPickerBase
+EricPathPickerBase QWidget
+EricPathPickerDialog QDialog
+EricPathPickerModes enum.Enum
+EricPlainTextDialog QDialog Ui_EricPlainTextDialog
+EricProcessDialog QDialog Ui_EricProcessDialog
+EricProgressDialog QProgressDialog
 EricSchemeHandler QWebEngineUrlSchemeHandler
 EricSchemeReply QIODevice
+EricSideBar QWidget
+EricSideBarSide enum.Enum
+EricSimpleHelpDialog QDialog Ui_EricSimpleHelpDialog
+EricSingleApplicationClient SingleApplicationClient
+EricSingleApplicationServer SingleApplicationServer
+EricSqueezeLabel QLabel
+EricSqueezeLabelPath QLabel
+EricSslCertificateSelectionDialog QDialog Ui_EricSslCertificateSelectionDialog
+EricSslCertificatesDialog QDialog Ui_EricSslCertificatesDialog
+EricSslCertificatesInfoDialog QDialog Ui_EricSslCertificatesInfoDialog
+EricSslCertificatesInfoWidget QWidget Ui_EricSslCertificatesInfoWidget
+EricSslErrorHandler QObject
+EricSslErrorState enum.Enum
+EricSslInfoWidget QMenu
+EricStringListCompleter QCompleter
+EricStringListEditWidget QWidget Ui_EricStringListEditWidget
+EricTabWidget QTabWidget
+EricTableView QTableView
+EricTextEditSearchWidget QWidget
+EricTextEditType enum.Enum
+EricTextInputDialog QDialog
+EricTextSpinBox QSpinBox
+EricTldExtractor QObject
+EricToolBarDialog QDialog Ui_EricToolBarDialog
+EricToolBarManager QObject
+EricToolButton QToolButton
+EricToolButtonOptions enum.IntEnum
+EricTreeSortFilterProxyModel QSortFilterProxyModel
+EricTreeView QTreeView
+EricTreeWidget QTreeWidget
+EricTreeWidgetItemsState enum.Enum
+EricUrlPermission enum.IntEnum
+EricVerticalToolBox QToolBox
+EricWheelTabBar QTabBar
+EricZoomWidget QWidget Ui_EricZoomWidget
 EricapiConfigDialog QDialog Ui_EricapiConfigDialog
 EricapiExecDialog QDialog Ui_EricapiExecDialog
 EricapiPlugin QObject
@@ -313,11 +303,9 @@
 ExporterPDF ExporterBase
 ExporterRTF ExporterBase
 ExporterTEX ExporterBase
-ExtToken peg.Symbol
-ExtValue peg.List
 ExternalJsObject QObject
 FavIconLabel QLabel
-FeaturePermissionBar E5AnimatedWidget
+FeaturePermissionBar EricAnimatedWidget
 FeaturePermissionManager QObject
 FeaturePermissionsDialog QDialog Ui_FeaturePermissionsDialog
 FeedEditDialog QDialog Ui_FeedEditDialog
@@ -359,7 +347,7 @@
 GitDialog QDialog Ui_GitDialog
 GitDiffDialog QWidget Ui_GitDiffDialog
 GitDiffGenerator QObject
-GitDiffHighlighter E5GenericDiffHighlighter
+GitDiffHighlighter EricGenericDiffHighlighter
 GitFetchDialog QDialog Ui_GitFetchDialog
 GitListDialog QDialog Ui_GitListDialog
 GitLogBrowserDialog QWidget Ui_GitLogBrowserDialog
@@ -417,7 +405,7 @@
 HelpViewersPage ConfigurationPageBase Ui_HelpViewersPage
 HexEditCommand enum.Enum
 HexEditGotoWidget QWidget Ui_HexEditGotoWidget
-HexEditMainWindow E5MainWindow
+HexEditMainWindow EricMainWindow
 HexEditSearchReplaceWidget QWidget
 HexEditUndoCommand QUndoCommand
 HexEditUndoStack QUndoStack
@@ -444,7 +432,7 @@
 HgDialog QDialog Ui_HgDialog
 HgDiffDialog QWidget Ui_HgDiffDialog
 HgDiffGenerator QObject
-HgDiffHighlighter E5GenericDiffHighlighter
+HgDiffHighlighter EricGenericDiffHighlighter
 HgExportDialog QDialog Ui_HgExportDialog
 HgExtension QObject
 HgExtensionProjectBrowserHelper QObject
@@ -480,7 +468,7 @@
 HgRepoConfigDataDialog QDialog Ui_HgRepoConfigDataDialog
 HgRevisionSelectionDialog QDialog Ui_HgRevisionSelectionDialog
 HgRevisionsSelectionDialog QDialog Ui_HgRevisionsSelectionDialog
-HgServeDialog E5MainWindow
+HgServeDialog EricMainWindow
 HgShelveBrowserDialog QWidget Ui_HgShelveBrowserDialog
 HgShelveDataDialog QDialog Ui_HgShelveDataDialog
 HgShelvesSelectionDialog QDialog Ui_HgShelvesSelectionDialog
@@ -496,7 +484,6 @@
 HgUserConfigHostMinimumProtocolDialog QDialog Ui_HgUserConfigHostMinimumProtocolDialog
 HighlightingStylesFile QObject
 HighlightingStylesReader XMLStreamReaderBase
-HighlightingStylesWriter XMLStreamWriterBase
 Histedit HgExtension
 HisteditProjectHelper HgExtensionProjectHelper
 HistoryCompleter QCompleter
@@ -505,10 +492,10 @@
 HistoryDialog QDialog Ui_HistoryDialog
 HistoryFilterModel QAbstractProxyModel
 HistoryManager QObject
-HistoryMenu E5ModelMenu
+HistoryMenu EricModelMenu
 HistoryMenuModel QAbstractProxyModel
 HistoryModel QAbstractTableModel
-HistoryMostVisitedMenu E5ModelMenu
+HistoryMostVisitedMenu EricModelMenu
 HistoryMostVisitedMenuModel QSortFilterProxyModel
 HistoryTreeModel QAbstractProxyModel
 HtmlImporter BookmarksImporter
@@ -519,7 +506,8 @@
 IconEditCommand QUndoCommand
 IconEditorGrid QWidget
 IconEditorPalette QWidget
-IconEditorWindow E5MainWindow
+IconEditorTool enum.IntEnum
+IconEditorWindow EricMainWindow
 IconSizeDialog QDialog Ui_IconSizeDialog
 IconsPage ConfigurationPageBase Ui_IconsPage
 IconsPreviewDialog QDialog Ui_IconsPreviewDialog
@@ -536,12 +524,11 @@
 InstallInfoDialog QDialog Ui_InstallInfoDialog
 Interface ClbrBaseClasses.Class VisibilityMixin
 InterfacePage ConfigurationPageBase Ui_InterfacePage
-InvalidISO8859Error Exception
 InvalidModulePath Exception
 IrcChannelEditDialog QDialog Ui_IrcChannelEditDialog
 IrcChannelWidget QWidget Ui_IrcChannelWidget
 IrcIdentitiesEditDialog QDialog Ui_IrcIdentitiesEditDialog
-IrcMessageEdit E5ClearableLineEdit
+IrcMessageEdit QLineEdit
 IrcNetworkEditDialog QDialog Ui_IrcNetworkEditDialog
 IrcNetworkListDialog QDialog Ui_IrcNetworkListDialog
 IrcNetworkManager QObject
@@ -552,7 +539,6 @@
 IrcWidget QWidget Ui_IrcWidget
 JavaScriptIcon StatusBarIcon
 JavaScriptSettingsDialog QDialog Ui_JavaScriptSettingsDialog
-Language str
 Largefiles HgExtension
 LargefilesProjectBrowserHelper HgExtensionProjectBrowserHelper
 LargefilesProjectHelper HgExtensionProjectHelper
@@ -626,7 +612,7 @@
 MicrobitDevice MicroPythonDevice
 MicrosoftEngine TranslationEngine
 MimeTypesPage ConfigurationPageBase Ui_MimeTypesPage
-MiniEditor E5MainWindow
+MiniEditor EricMainWindow
 MiniScintilla QsciScintillaCompat
 Module ClbrBaseClasses.Module VisibilityMixin
 ModuleItem UMLItem
@@ -637,7 +623,6 @@
 MultiProjectFile QObject
 MultiProjectPage ConfigurationPageBase Ui_MultiProjectPage
 MultiProjectReader XMLStreamReaderBase
-MultiProjectWriter XMLStreamWriterBase
 MultiValueDictResolver DictResolver
 MyMemoryEngine TranslationEngine
 NameFinder ast.NodeVisitor
@@ -650,7 +635,6 @@
 NetworkUrlInterceptor QWebEngineUrlRequestInterceptor
 NewDialogClassDialog QDialog Ui_NewDialogClassDialog
 NewPythonPackageDialog QDialog Ui_NewPythonPackageDialog
-NoExtToken peg.Symbol
 NotificationFrame QFrame Ui_NotificationFrame
 NotificationTypes enum.Enum
 NotificationWidget QWidget
@@ -690,7 +674,7 @@
 PipPackagesInputDialog QDialog Ui_PipPackagesInputDialog
 PipPackagesWidget QWidget Ui_PipPackagesWidget
 PipPage ConfigurationPageBase Ui_PipPage
-PixmapDiagram E5MainWindow
+PixmapDiagram EricMainWindow
 PluginActivationError PluginError
 PluginClassFormatError PluginError
 PluginDetailsDialog QDialog Ui_PluginDetailsDialog
@@ -698,7 +682,7 @@
 PluginInfoDialog QDialog Ui_PluginInfoDialog
 PluginInstallDialog QDialog
 PluginInstallWidget QWidget Ui_PluginInstallDialog
-PluginInstallWindow E5MainWindow
+PluginInstallWindow EricMainWindow
 PluginLoadError PluginError
 PluginManager QObject
 PluginManagerPage ConfigurationPageBase Ui_PluginManagerPage
@@ -708,10 +692,10 @@
 PluginRepositoryDialog QDialog
 PluginRepositoryReader XMLStreamReaderBase
 PluginRepositoryWidget QWidget Ui_PluginRepositoryDialog
-PluginRepositoryWindow E5MainWindow
+PluginRepositoryWindow EricMainWindow
 PluginUninstallDialog QDialog
 PluginUninstallWidget QWidget Ui_PluginUninstallDialog
-PluginUninstallWindow E5MainWindow
+PluginUninstallWindow EricMainWindow
 PluginWizardDialog QDialog Ui_PluginWizardDialog
 PopenWrapper module.Popen
 PreferencesLexer QObject
@@ -730,7 +714,7 @@
 ProgramsDialog QDialog Ui_ProgramsDialog
 Project QObject
 ProjectBaseBrowser Browser
-ProjectBrowser E5TabWidget
+ProjectBrowser EricTabWidget
 ProjectBrowserDirectoryItem BrowserDirectoryItem ProjectBrowserItemMixin
 ProjectBrowserFileItem BrowserFileItem ProjectBrowserItemMixin
 ProjectBrowserModel BrowserModel
@@ -748,7 +732,6 @@
 ProjectSourcesBrowser ProjectBaseBrowser
 ProjectTaskExtractionThread QThread
 ProjectTranslationsBrowser ProjectBaseBrowser
-ProjectWriter XMLStreamWriterBase
 PromtEngine TranslationEngine
 PropertiesDialog QDialog Ui_PropertiesDialog
 ProtobufPage ConfigurationPageBase Ui_ProtobufPage
@@ -767,7 +750,7 @@
 PyRegExpWizardDialog QDialog
 PyRegExpWizardRepeatDialog QDialog Ui_PyRegExpWizardRepeatDialog
 PyRegExpWizardWidget QWidget Ui_PyRegExpWizardDialog
-PyRegExpWizardWindow E5MainWindow
+PyRegExpWizardWindow EricMainWindow
 PySvnProjectHelper VcsProjectHelper
 PypiSearchResultsParser html.parser.HTMLParser
 PythonAstViewer QWidget
@@ -780,7 +763,7 @@
 QRegularExpressionWizardDialog QDialog
 QRegularExpressionWizardRepeatDialog QDialog Ui_QRegularExpressionWizardRepeatDialog
 QRegularExpressionWizardWidget QWidget Ui_QRegularExpressionWizardDialog
-QRegularExpressionWizardWindow E5MainWindow
+QRegularExpressionWizardWindow EricMainWindow
 QRunnableWrapper module.QRunnable
 QThreadWrapper module.QThread
 QsciScintillaCompat QsciScintilla
@@ -793,7 +776,6 @@
 Queues HgExtension
 QueuesProjectHelper HgExtensionProjectHelper
 QuickFindFileDialog QWidget Ui_QuickFindFile
-QuotedString str
 RP2040Device MicroPythonDevice
 RbModule Class
 RccCompilerOptionsDialog QDialog Ui_RccCompilerOptionsDialog
@@ -801,7 +783,7 @@
 RebaseProjectHelper HgExtensionProjectHelper
 RecursionError OverflowError ValueError
 Redirector QObject
-ReloadStopButton E5ToolButton
+ReloadStopButton EricToolButton
 RemoveBookmarksCommand QUndoCommand
 RestructuredTextProvider MarkupBase
 ReturnVisitor ast.NodeVisitor
@@ -823,7 +805,6 @@
 SessionManager QObject
 SessionManagerDialog QDialog Ui_SessionManagerDialog
 SessionReader XMLStreamReaderBase
-SessionWriter XMLStreamWriterBase
 SetResolver BaseResolver
 SetupWizard QObject
 SetupWizardDialog QDialog Ui_SetupWizardDialog
@@ -832,7 +813,7 @@
 ShellHistoryDialog QDialog Ui_ShellHistoryDialog
 ShellHistoryStyle enum.Enum
 ShellPage ConfigurationPageBase Ui_ShellPage
-ShellWindow E5MainWindow
+ShellWindow EricMainWindow
 Shelve HgExtension
 ShelveProjectBrowserHelper HgExtensionProjectBrowserHelper
 ShelveProjectHelper HgExtensionProjectHelper
@@ -840,7 +821,6 @@
 ShortcutsDialog QDialog Ui_ShortcutsDialog
 ShortcutsFile QObject
 ShortcutsReader XMLStreamReaderBase
-ShortcutsWriter XMLStreamWriterBase
 SimplePatternExtension Extension
 SimplifyNodeVisitor ast.NodeVisitor
 SingleApplicationServer QLocalServer
@@ -864,20 +844,20 @@
 SpellingDictionaryEditDialog QDialog Ui_SpellingDictionaryEditDialog
 SpellingPropertiesDialog QDialog Ui_SpellingPropertiesDialog
 SplashScreen QSplashScreen
-SqlBrowser E5MainWindow
+SqlBrowser EricMainWindow
 SqlBrowserWidget QWidget Ui_SqlBrowserWidget
 SqlConnectionDialog QDialog Ui_SqlConnectionDialog
 SqlConnectionWidget QWidget
 SslErrorExceptionsDialog QDialog Ui_SslErrorExceptionsDialog
-SslLabel E5ClickableLabel
+SslLabel EricClickableLabel
 StackedUrlBar QStackedWidget
 StackedWidget QStackedWidget
 StandardReport BaseReport
 StartDialog QDialog
 StartHistoryEditDialog QDialog Ui_StartHistoryEditDialog
 StartPageJsObject QObject
-StatusBarIcon E5ClickableLabel
-StatusMonitorLed E5ClickableLed
+StatusBarIcon EricClickableLabel
+StatusMonitorLed EricClickableLed
 StatusMonitorLedWidget QWidget
 Strip HgExtension
 StripProjectHelper HgExtensionProjectHelper
@@ -885,7 +865,7 @@
 SubstyledLexer Lexer
 Subversion VersionControl
 SubversionPage ConfigurationPageBase Ui_SubversionPage
-SvgDiagram E5MainWindow
+SvgDiagram EricMainWindow
 SvnBlameDialog QDialog Ui_SvnBlameDialog
 SvnChangeListsDialog QDialog Ui_SvnChangeListsDialog
 SvnCommandDialog QDialog Ui_SvnCommandDialog
@@ -893,7 +873,7 @@
 SvnCopyDialog QDialog Ui_SvnCopyDialog
 SvnDialog QDialog Ui_SvnDialog
 SvnDiffDialog QWidget Ui_SvnDiffDialog
-SvnDiffHighlighter E5GenericDiffHighlighter
+SvnDiffHighlighter EricGenericDiffHighlighter
 SvnInfoDialog QDialog SvnDialogMixin Ui_VcsRepositoryInfoDialog
 SvnLogBrowserDialog QWidget Ui_SvnLogBrowserDialog
 SvnLoginDialog QDialog Ui_SvnLoginDialog
@@ -929,12 +909,12 @@
 SyntaxCheckerDialog QDialog Ui_SyntaxCheckerDialog
 SyntaxCheckerPlugin QObject
 SysVersionVisitor ast.NodeVisitor
-TRPreviewer E5MainWindow
+TRPreviewer EricMainWindow
 TRSingleApplicationClient SingleApplicationClient
 TRSingleApplicationServer SingleApplicationServer
-TabBar E5WheelTabBar
+TabBar EricWheelTabBar
 TabManagerWidget QWidget
-TabWidget E5TabWidget
+TabWidget EricTabWidget
 Tabview ViewManager
 TagError Exception
 Task QTreeWidgetItem
@@ -946,7 +926,6 @@
 TasksFile QObject
 TasksPage ConfigurationPageBase Ui_TasksPage
 TasksReader XMLStreamReaderBase
-TasksWriter XMLStreamWriterBase
 TemplateEntry QTreeWidgetItem
 TemplateGroup QTreeWidgetItem
 TemplateMultipleVariablesDialog QDialog
@@ -956,11 +935,9 @@
 TemplatesFile QObject
 TemplatesPage ConfigurationPageBase Ui_TemplatesPage
 TemplatesReader XMLStreamReaderBase
-TemplatesWriter XMLStreamWriterBase
 TextVisitor ast.NodeVisitor
 ThreadWrapper module.Thread
 TimerWrapper ThreadWrapper timer
-Token str
 ToolConfigurationDialog QDialog Ui_ToolConfigurationDialog
 ToolGroupConfigurationDialog QDialog Ui_ToolGroupConfigurationDialog
 TranslationEngine QObject
@@ -975,20 +952,19 @@
 TrayStarter QSystemTrayIcon
 TrayStarterPage ConfigurationPageBase Ui_TrayStarterPage
 UF2FlashDialog QDialog Ui_UF2FlashDialog
-UIPreviewer E5MainWindow
+UIPreviewer EricMainWindow
 UMLClassDiagramBuilder UMLDiagramBuilder
 UMLDiagramBuilder QObject
-UMLDialog E5MainWindow
+UMLDialog EricMainWindow
 UMLDialogType enum.Enum
-UMLGraphicsView E5GraphicsView
+UMLGraphicsView EricGraphicsView
 UMLItem QGraphicsRectItem
 UMLSceneSizeDialog QDialog Ui_UMLSceneSizeDialog
 UicCompilerOptionsDialog QDialog Ui_UicCompilerOptionsDialog
-UniqueNamespace peg.Namespace
 UnittestDialog QWidget Ui_UnittestDialog
-UnittestWindow E5MainWindow
+UnittestWindow EricMainWindow
 UnknownDevicesDialog QDialog Ui_UnknownDevicesDialog
-UrlBar E5LineEdit
+UrlBar EricLineEdit
 UrlInterceptor QObject
 UserAgentManager QObject
 UserAgentMenu QMenu
@@ -996,13 +972,10 @@
 UserAgentReader QXmlStreamReader
 UserAgentWriter QXmlStreamWriter
 UserAgentsDialog QDialog Ui_UserAgentsDialog
-UserInterface E5MainWindow
+UserInterface EricMainWindow
 UserProjectFile QObject
 UserProjectReader XMLStreamReaderBase
-UserProjectWriter XMLStreamWriterBase
 UserPropertiesDialog QDialog Ui_UserPropertiesDialog
-Value str
-ValueChars str
 VariableDetailDialog QDialog Ui_VariableDetailDialog
 VariablesFilterDialog QDialog Ui_VariablesFilterDialog
 VariablesModel QAbstractItemModel
@@ -1047,12 +1020,12 @@
 WebBrowserSingleApplicationClient SingleApplicationClient
 WebBrowserSingleApplicationServer SingleApplicationServer
 WebBrowserSpellCheckingPage ConfigurationPageBase Ui_WebBrowserSpellCheckingPage
-WebBrowserTabBar E5WheelTabBar
-WebBrowserTabWidget E5TabWidget
+WebBrowserTabBar EricWheelTabBar
+WebBrowserTabWidget EricTabWidget
 WebBrowserView QWebEngineView
 WebBrowserVirusTotalPage ConfigurationPageBase Ui_WebBrowserVirusTotalPage
-WebBrowserWebSearchWidget E5ClearableLineEdit
-WebBrowserWindow E5MainWindow
+WebBrowserWebSearchWidget EricClearableLineEdit
+WebBrowserWindow EricMainWindow
 WebIconDialog QDialog Ui_WebIconDialog
 WebIconLoader QObject
 WebIconProvider QObject
@@ -1061,7 +1034,6 @@
 WidgetView QWidget
 WizardEricPluginWizard QObject
 XMLStreamReaderBase QXmlStreamReader
-XMLStreamWriterBase QXmlStreamWriter
 XbelImporter BookmarksImporter
 XbelReader QXmlStreamReader
 XbelWriter QXmlStreamWriter