Sun, 19 Jun 2011 19:36:27 +0200
Changed the code to use super() to access the superclass.
--- a/CodeTemplates/impl.py.tmpl Sun Jun 19 17:50:39 2011 +0200 +++ b/CodeTemplates/impl.py.tmpl Sun Jun 19 19:36:27 2011 +0200 @@ -20,5 +20,5 @@ @param parent reference to the parent widget (QWidget) """ - $SUPERCLASS$.__init__(self, parent) + super().__init__(parent) self.setupUi(self)
--- a/Cooperation/ChatWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Cooperation/ChatWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -54,7 +54,7 @@ @param port port to be used for the cooperation server (integer) @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.shareButton.setIcon(
--- a/Cooperation/Connection.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Cooperation/Connection.py Sun Jun 19 19:36:27 2011 +0200 @@ -66,7 +66,7 @@ @param parent referenec to the parent object (QObject) """ - QTcpSocket.__init__(self, parent) + super().__init__(parent) self.__greetingMessage = self.trUtf8("undefined") self.__username = self.trUtf8("unknown")
--- a/Cooperation/CooperationClient.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Cooperation/CooperationClient.py Sun Jun 19 19:36:27 2011 +0200 @@ -44,7 +44,7 @@ @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.__server = CooperationServer(self) self.__peers = collections.defaultdict(list)
--- a/Cooperation/CooperationServer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Cooperation/CooperationServer.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param parent reference to the parent object (QObject) """ - QTcpServer.__init__(self, parent) + super().__init__(parent) def incomingConnection(self, socketDescriptor): """
--- a/DataViews/CodeMetricsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/DataViews/CodeMetricsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/DataViews/PyCoverageDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/DataViews/PyCoverageDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/DataViews/PyProfileDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/DataViews/PyProfileDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -60,7 +60,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/Debugger/BreakPointModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/BreakPointModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param reference to the parent widget (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.breakpoints = [] self.header = [
--- a/Debugger/BreakPointViewer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/BreakPointViewer.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param parent the parent (QWidget) """ - QTreeView.__init__(self, parent) + super().__init__(parent) self.setObjectName("BreakPointViewer") self.__model = None @@ -66,7 +66,7 @@ self.sortingModel = QSortFilterProxyModel() self.sortingModel.setSourceModel(self.__model) - QTreeView.setModel(self, self.sortingModel) + super().setModel(self.sortingModel) header = self.header() header.setSortIndicator(0, Qt.AscendingOrder)
--- a/Debugger/DebugServer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/DebugServer.py Sun Jun 19 19:36:27 2011 +0200 @@ -125,7 +125,7 @@ """ Constructor """ - QTcpServer.__init__(self) + super().__init__() # create our models self.breakpointModel = BreakPointModel(self)
--- a/Debugger/DebugUI.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/DebugUI.py Sun Jun 19 19:36:27 2011 +0200 @@ -65,7 +65,7 @@ @param debugViewer reference to the debug viewer widget @param project reference to the project object """ - QObject.__init__(self, ui) + super().__init__(ui) self.ui = ui self.viewmanager = vm
--- a/Debugger/DebugViewer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/DebugViewer.py Sun Jun 19 19:36:27 2011 +0200 @@ -66,7 +66,7 @@ have the file browser in a separate window or embedded in the project browser instead. """ - QWidget.__init__(self, parent) + super().__init__(parent) self.debugServer = debugServer self.debugUI = None
--- a/Debugger/DebuggerInterfaceNone.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/DebuggerInterfaceNone.py Sun Jun 19 19:36:27 2011 +0200 @@ -36,7 +36,7 @@ @param debugServer reference to the debug server (DebugServer) @param passive flag indicating passive connection mode (boolean) """ - QObject.__init__(self) + super().__init__() self.debugServer = debugServer self.passive = passive
--- a/Debugger/DebuggerInterfacePython.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/DebuggerInterfacePython.py Sun Jun 19 19:36:27 2011 +0200 @@ -60,7 +60,7 @@ @param debugServer reference to the debug server (DebugServer) @param passive flag indicating passive connection mode (boolean) """ - QObject.__init__(self) + super().__init__() self.__isNetworked = True self.__autoContinue = not passive
--- a/Debugger/DebuggerInterfacePython3.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/DebuggerInterfacePython3.py Sun Jun 19 19:36:27 2011 +0200 @@ -59,7 +59,7 @@ @param debugServer reference to the debug server (DebugServer) @param passive flag indicating passive connection mode (boolean) """ - QObject.__init__(self) + super().__init__() self.__isNetworked = True self.__autoContinue = not passive
--- a/Debugger/DebuggerInterfaceRuby.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/DebuggerInterfaceRuby.py Sun Jun 19 19:36:27 2011 +0200 @@ -53,7 +53,7 @@ @param debugServer reference to the debug server (DebugServer) @param passive flag indicating passive connection mode (boolean) """ - QObject.__init__(self) + super().__init__() self.__isNetworked = True self.__autoContinue = not passive
--- a/Debugger/EditBreakpointDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/EditBreakpointDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -38,7 +38,7 @@ @param name the widget name of this dialog @param modal flag indicating a modal dialog """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) if name: self.setObjectName(name)
--- a/Debugger/EditWatchpointDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/EditWatchpointDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param name the widget name of this dialog @param modal flag indicating a modal dialog """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) if name: self.setObjectName(name)
--- a/Debugger/ExceptionLogger.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/ExceptionLogger.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param parent the parent widget of this widget """ - QTreeWidget.__init__(self, parent) + super().__init__(parent) self.setObjectName("ExceptionLogger") self.setWindowTitle(self.trUtf8("Exceptions"))
--- a/Debugger/ExceptionsFilterDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/ExceptionsFilterDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param ignore flag indicating the ignore exceptions mode (boolean) @param parent the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.setModal(True)
--- a/Debugger/StartDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/StartDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -55,7 +55,7 @@ @keyparam autoFork flag indicating the automatic fork mode (boolean) @keyparam forkChild flag indicating to debug the child after forking (boolean) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setModal(True) self.type = type
--- a/Debugger/VariableDetailDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/VariableDetailDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param vtype the variables type (string) @param value the variables value (string) """ - QDialog.__init__(self) + super().__init__() self.setupUi(self) # set the different fields
--- a/Debugger/VariablesFilterDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/VariablesFilterDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param name name of this dialog (string) @param modal flag to indicate a modal dialog (boolean) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setModal(modal)
--- a/Debugger/VariablesViewer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/VariablesViewer.py Sun Jun 19 19:36:27 2011 +0200 @@ -39,7 +39,7 @@ dvalue = QApplication.translate("VariableItem", "<double click to show value>") - QTreeWidgetItem.__init__(self, parent, [dvar, dvalue, dtype]) + super().__init__(parent, [dvar, dvalue, dtype]) self.populated = True @@ -256,7 +256,7 @@ @param parent the parent (QWidget) @param scope flag indicating global (1) or local (0) variables """ - QTreeWidget.__init__(self, parent) + super().__init__(parent) self.indicators = {'list': '[]', 'tuple': '()', 'dict': '{}', # Python types 'Array': '[]', 'Hash': '{}'} # Ruby types @@ -675,7 +675,7 @@ parentItem.expand() self.__resort() except AttributeError: - QTreeWidget.expandItem(self, parentItem) + super().expandItem(parentItem) def collapseItem(self, parentItem): """ @@ -689,7 +689,7 @@ try: parentItem.collapse() except AttributeError: - QTreeWidget.collapseItem(self, parentItem) + super().collapseItem(parentItem) def __resort(self): """
--- a/Debugger/WatchPointModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/WatchPointModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param reference to the parent widget (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.watchpoints = [] self.header = [
--- a/Debugger/WatchPointViewer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Debugger/WatchPointViewer.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param parent the parent (QWidget) """ - QTreeView.__init__(self, parent) + super().__init__(parent) self.setObjectName("WatchExpressionViewer") self.__model = None @@ -61,7 +61,7 @@ self.sortingModel = QSortFilterProxyModel() self.sortingModel.setSourceModel(self.__model) - QTreeView.setModel(self, self.sortingModel) + super().setModel(self.sortingModel) header = self.header() header.setSortIndicator(0, Qt.AscendingOrder)
--- a/E5Graphics/E5ArrowItem.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Graphics/E5ArrowItem.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param type arrow type (NormalArrow, WideArrow) @keyparam parent reference to the parent object (QGraphicsItem) """ - QAbstractGraphicsShapeItem.__init__(self, parent) + super().__init__(parent) self._origin = origin self._end = end
--- a/E5Graphics/E5GraphicsView.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Graphics/E5GraphicsView.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param scene reference to the scene object (QGraphicsScene) @param parent parent widget (QWidget) """ - QGraphicsView.__init__(self, scene, parent) + super().__init__(scene, parent) self.setObjectName("E5GraphicsView") self.setBackgroundBrush(QBrush(Qt.white))
--- a/E5Gui/E5Action.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5Action.py Sun Jun 19 19:36:27 2011 +0200 @@ -81,7 +81,7 @@ 7 + incr, len(args))) parent = args[4 + incr] - QAction.__init__(self, parent) + super().__init__(parent) name = args[5 + incr] if name: self.setObjectName(name) @@ -138,7 +138,7 @@ @param shortcut the accelerator (QKeySequence) """ - QAction.setShortcut(self, shortcut) + super().setShortcut(shortcut) self.__ammendToolTip() def setShortcuts(self, shortcuts): @@ -149,7 +149,7 @@ or key for a platform dependent list of accelerators (QKeySequence.StandardKey) """ - QAction.setShortcuts(self, shortcuts) + super().setShortcuts(shortcuts) self.__ammendToolTip() def __ammendToolTip(self):
--- a/E5Gui/E5Application.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5Application.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ @param argv command line arguments """ - QApplication.__init__(self, argv) + super().__init__(argv) self.__objectRegistry = {} self.__pluginObjectRegistry = {}
--- a/E5Gui/E5Completers.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5Completers.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ completer (QCompleter.CompletionMode) @keyparam showHidden flag indicating to show hidden entries as well (boolean) """ - QCompleter.__init__(self, parent) + super().__init__(parent) self.__model = QDirModel(self) if showHidden: self.__model.setFilter( @@ -60,7 +60,7 @@ completer (QCompleter.CompletionMode) @keyparam showHidden flag indicating to show hidden entries as well (boolean) """ - QCompleter.__init__(self, parent) + super().__init__(parent) self.__model = QDirModel(self) if showHidden: self.__model.setFilter( @@ -90,7 +90,7 @@ @keyparam completionMode completion mode of the completer (QCompleter.CompletionMode) """ - QCompleter.__init__(self, parent) + super().__init__(parent) self.__model = QStringListModel(strings, parent) self.setModel(self.__model) self.setCompletionMode(completionMode)
--- a/E5Gui/E5Led.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5Led.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ @param shape shape of the LED (E5LedCircular, E5LedRectangular) @param rectRation ratio width to height, if shape is rectangular (float) """ - QWidget.__init__(self, parent) + super().__init__(parent) if color is None: color = QColor("green")
--- a/E5Gui/E5LineEdit.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5LineEdit.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) def event(self, evt): """ @@ -52,7 +52,7 @@ @param parent reference to the parent widget (QWidget) @param inactiveText text to be shown on inactivity (string) """ - QLineEdit.__init__(self, parent) + super().__init__(parent) self.setMinimumHeight(22) @@ -106,7 +106,7 @@ @param evt reference to the resize event (QResizeEvent) """ self.__updateSideWidgetLocations() - QLineEdit.resizeEvent(self, evt) + super().resizeEvent(evt) def paintEvent(self, evt): """ @@ -114,7 +114,7 @@ @param evt reference to the paint event (QPaintEvent) """ - QLineEdit.paintEvent(self, evt) + super().paintEvent(evt) if not self.text() and \ self.__inactiveText and \
--- a/E5Gui/E5LineEditButton.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5LineEditButton.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ @param parent reference to the parent widget (QWidget) """ - QAbstractButton.__init__(self, parent) + super().__init__(parent) self.__menu = None self.__image = None @@ -59,7 +59,7 @@ self.__image = None else: self.__image = icon.pixmap(16, 16).toImage() - QAbstractButton.setIcon(self, icon) + super().setIcon(icon) def __clicked(self): """
--- a/E5Gui/E5ListView.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5ListView.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ self.removeSelected() evt.setAccepted(True) else: - QListView.keyPressEvent(self, evt) + super().keyPressEvent(evt) def removeSelected(self): """
--- a/E5Gui/E5MessageBox.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5MessageBox.py Sun Jun 19 19:36:27 2011 +0200 @@ -77,7 +77,7 @@ @keyparam buttons set of standard buttons to generate (StandardButtons) @keyparam parent parent widget of the message box (QWidget) """ - QMessageBox.__init__(self, parent) + super().__init__(parent) self.setIcon(icon) if modal: if parent is not None:
--- a/E5Gui/E5ModelMenu.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5ModelMenu.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param parent reference to the parent widget (QWidget) """ - QMenu.__init__(self, parent) + super().__init__(parent) self.__maxRows = -1 self.__firstSeparator = -1 @@ -303,7 +303,7 @@ if evt.mimeData().hasFormat(mimeType): evt.acceptProposedAction() - QMenu.dragEnterEvent(self, evt) + super().dragEnterEvent(evt) def dropEvent(self, evt): """ @@ -319,7 +319,7 @@ else: idx = self.index(act) if not idx.isValid(): - QMenu.dropEvent(self, evt) + super().dropEvent(evt) return row = idx.row() @@ -334,7 +334,7 @@ row, 0, parentIndex) self.close() - QMenu.dropEvent(self, evt) + super().dropEvent(evt) def mousePressEvent(self, evt): """ @@ -344,7 +344,7 @@ """ if evt.button() == Qt.LeftButton: self.__dragStartPosition = evt.pos() - QMenu.mousePressEvent(self, evt) + super().mousePressEvent(evt) def mouseMoveEvent(self, evt): """ @@ -353,26 +353,26 @@ @param evt reference to the event (QMouseEvent) """ if self.__model is None: - QMenu.mouseMoveEvent(self, evt) + super().mouseMoveEvent(evt) return if not (evt.buttons() & Qt.LeftButton): - QMenu.mouseMoveEvent(self, evt) + super().mouseMoveEvent(evt) return manhattanLength = (evt.pos() - self.__dragStartPosition).manhattanLength() if manhattanLength <= QApplication.startDragDistance(): - QMenu.mouseMoveEvent(self, evt) + super().mouseMoveEvent(evt) return act = self.actionAt(self.__dragStartPosition) if act is None: - QMenu.mouseMoveEvent(self, evt) + super().mouseMoveEvent(evt) return idx = self.index(act) if not idx.isValid(): - QMenu.mouseMoveEvent(self, evt) + super().mouseMoveEvent(evt) return drag = QDrag(self) @@ -399,7 +399,7 @@ """ self._mouseButton = evt.button() self._keyboardModifiers = evt.modifiers() - QMenu.mouseReleaseEvent(self, evt) + super().mouseReleaseEvent(evt) def resetFlags(self): """
--- a/E5Gui/E5ModelToolBar.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5ModelToolBar.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,9 +29,9 @@ @param parent reference to the parent widget (QWidget) """ if title is not None: - QToolBar.__init__(self, title, parent) + super().__init__(title, parent) else: - QToolBar.__init__(self, parent) + super().__init__(parent) self.__model = None @@ -183,7 +183,7 @@ if evt.mimeData().hasFormat(mimeType): evt.acceptProposedAction() - QToolBar.dragEnterEvent(self, evt) + super().dragEnterEvent(evt) def dropEvent(self, evt): """ @@ -210,7 +210,7 @@ self.__model.dropMimeData(evt.mimeData(), evt.dropAction(), row, 0, parentIndex) - QToolBar.dropEvent(self, evt) + super().dropEvent(evt) def mouseMoveEvent(self, evt): """ @@ -219,21 +219,21 @@ @param evt reference to the event (QMouseEvent) """ if self.__model is None: - QToolBar.mouseMoveEvent(self, evt) + super().mouseMoveEvent(evt) return if not (evt.buttons() & Qt.LeftButton): - QToolBar.mouseMoveEvent(self, evt) + super().mouseMoveEvent(evt) return manhattanLength = (evt.pos() - self.__dragStartPosition).manhattanLength() if manhattanLength <= QApplication.startDragDistance(): - QToolBar.mouseMoveEvent(self, evt) + super().mouseMoveEvent(evt) return act = self.actionAt(self.__dragStartPosition) if act is None: - QToolBar.mouseMoveEvent(self, evt) + super().mouseMoveEvent(evt) return idx = self.index(act) @@ -257,7 +257,7 @@ @param evt reference to the hide event (QHideEvent) """ self.clear() - QToolBar.hideEvent(self, evt) + super().hideEvent(evt) def showEvent(self, evt): """ @@ -267,7 +267,7 @@ """ if len(self.actions()) == 0: self._build() - QToolBar.showEvent(self, evt) + super().showEvent(evt) def resetFlags(self): """
--- a/E5Gui/E5PassivePopup.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5PassivePopup.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param parent reference to the parent widget (QWidget) """ - QFrame.__init__(self, None) + super().__init__(None) self.__popupStyle = DEFAULT_POPUP_TYPE self.__msgView = None @@ -70,7 +70,7 @@ @param visible flag indicating the visibility status (boolean) """ if not visible: - QFrame.setVisible(self, visible) + super().setVisible(visible) return if self.size() != self.sizeHint(): @@ -80,7 +80,7 @@ self.__positionSelf() else: self.move(self.__fixedPosition) - QFrame.setVisible(self, True) + super().setVisible(True) delay = self.__hideDelay if delay < 0: @@ -96,7 +96,7 @@ """ if p is not None: self.__fixedPosition = p - QFrame.show(self) + super().show() def setTimeout(self, delay): """
--- a/E5Gui/E5SideBar.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5SideBar.py Sun Jun 19 19:36:27 2011 +0200 @@ -34,7 +34,7 @@ @param orientation orientation of the sidebar widget (North, East, South, West) @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.__tabBar = QTabBar() self.__tabBar.setDrawBase(True)
--- a/E5Gui/E5SqueezeLabels.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5SqueezeLabels.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent reference to the parent Widget (QWidget) """ - QLabel.__init__(self, parent) + super().__init__(parent) self.__text = '' self.__elided = '' @@ -37,10 +37,10 @@ fm = self.fontMetrics() if fm.width(self.__text) > self.contentsRect().width(): self.__elided = fm.elidedText(self.text(), Qt.ElideMiddle, self.width()) - QLabel.setText(self, self.__elided) + super().setText(self.__elided) else: - QLabel.setText(self, self.__text) - QLabel.paintEvent(self, event) + super().setText(self.__text) + super().paintEvent(event) def setText(self, txt): """ @@ -49,7 +49,7 @@ @param txt the text to be shown (string) """ self.__text = txt - QLabel.setText(self, self.__text) + super().setText(self.__text) class E5SqueezeLabelPath(QLabel): @@ -62,7 +62,7 @@ @param parent reference to the parent Widget (QWidget) """ - QLabel.__init__(self, parent) + super().__init__(parent) self.__path = '' self.__surrounding = "{0}" @@ -74,7 +74,7 @@ @param surrounding the a string containg placeholders for the path (string) """ self.__surrounding = surrounding - QLabel.setText(self, self.__surrounding.format(self.__path)) + super().setText(self.__surrounding.format(self.__path)) def setPath(self, path): """ @@ -83,7 +83,7 @@ @param path path to be shown (string) """ self.__path = path - QLabel.setText(self, self.__surrounding.format(self.__path)) + super().setText(self.__surrounding.format(self.__path)) def setTextPath(self, surrounding, path): """ @@ -94,7 +94,7 @@ """ self.__surrounding = surrounding self.__path = path - QLabel.setText(self, self.__surrounding.format(self.__path)) + super().setText(self.__surrounding.format(self.__path)) def paintEvent(self, event): """ @@ -104,14 +104,14 @@ """ fm = self.fontMetrics() if fm.width(self.__surrounding.format(self.__path)) > self.contentsRect().width(): - QLabel.setText(self, + super().setText( self.__surrounding.format(compactPath(self.__path, self.contentsRect().width(), self.length)) ) else: - QLabel.setText(self, self.__surrounding.format(self.__path)) - QLabel.paintEvent(self, event) + super().setText(self.__surrounding.format(self.__path)) + super().paintEvent(event) def length(self, txt): """
--- a/E5Gui/E5TabWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5TabWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ @param parent reference to the parent widget (QWidget) """ - QTabBar.__init__(self, parent) + super().__init__(parent) self._tabWidget = parent def wheelEvent(self, event): @@ -138,7 +138,7 @@ @param parent reference to the parent widget (QWidget) @keyparam dnd flag indicating the support for Drag & Drop (boolean) """ - QTabWidget.__init__(self, parent) + super().__init__(parent) if dnd: if not hasattr(self, 'setMovable'):
--- a/E5Gui/E5TableView.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5TableView.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ self.removeSelected() evt.setAccepted(True) else: - QTableView.keyPressEvent(self, evt) + super().keyPressEvent(evt) def removeSelected(self): """
--- a/E5Gui/E5TextSpinBox.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5TextSpinBox.py Sun Jun 19 19:36:27 2011 +0200 @@ -16,7 +16,7 @@ @param parent reference to the parent widget (QWidget) """ - QSpinBox.__init__(self, parent) + super().__init__(parent) self.__items = []
--- a/E5Gui/E5ToolBarDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5ToolBarDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -51,7 +51,7 @@ @param toolBarManager reference to a toolbar manager object (E5ToolBarManager) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__manager = toolBarManager
--- a/E5Gui/E5ToolBarManager.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5ToolBarManager.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param ui reference to the user interface object (UI.UserInterface) @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.__mainWindow = None self.__ui = ui
--- a/E5Gui/E5ToolBox.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5ToolBox.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param parent reference to the parent widget (QWidget) """ - QToolBox.__init__(self, parent) + super().__init__(parent) def wheelEvent(self, event): """
--- a/E5Gui/E5TreeSortFilterProxyModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5TreeSortFilterProxyModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param parent reference to the parent object (QObject) """ - QSortFilterProxyModel.__init__(self, parent) + super().__init__(parent) self.setFilterCaseSensitivity(Qt.CaseInsensitive)
--- a/E5Gui/E5TreeView.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Gui/E5TreeView.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ self.removeSelected() evt.setAccepted(True) else: - QTreeView.keyPressEvent(self, evt) + super().keyPressEvent(evt) def removeSelected(self): """
--- a/E5Network/E5NetworkHeaderDetailsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Network/E5NetworkHeaderDetailsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param parent reference to the parent object (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) def setData(self, name, value):
--- a/E5Network/E5NetworkMonitor.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Network/E5NetworkMonitor.py Sun Jun 19 19:36:27 2011 +0200 @@ -73,7 +73,7 @@ (QNetworkAccessManager) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) @@ -125,14 +125,14 @@ @param evt reference to the close event object (QCloseEvent) """ self.__class__._monitor = None - QDialog.closeEvent(self, evt) + super().closeEvent(evt) def reject(self): """ Public slot to close the dialog with a Reject status. """ self.__class__._monitor = None - QDialog.reject(self) + super().reject() def __currentChanged(self, current, previous): """ @@ -211,7 +211,7 @@ (QNetworkAccessManager) @param parent reference to the parent object (QObject) """ - QAbstractTableModel.__init__(self, parent) + super().__init__(parent) self.__headerData = [ self.trUtf8("Method"),
--- a/E5Network/E5NetworkProxyFactory.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5Network/E5NetworkProxyFactory.py Sun Jun 19 19:36:27 2011 +0200 @@ -73,7 +73,7 @@ """ Constructor """ - QNetworkProxyFactory.__init__(self) + super().__init__() def queryProxy(self, query): """
--- a/E5XML/XMLStreamReaderBase.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5XML/XMLStreamReaderBase.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param device reference to the I/O device to read from (QIODevice) """ - QXmlStreamReader.__init__(self, device) + super().__init__(device) def toBool(self, value): """
--- a/E5XML/XMLStreamWriterBase.py Sun Jun 19 17:50:39 2011 +0200 +++ b/E5XML/XMLStreamWriterBase.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param device reference to the I/O device to write to (QIODevice) """ - QXmlStreamWriter.__init__(self, device) + super().__init__(device) self.basics = { type(None): self._write_none,
--- a/Graphics/PixmapDiagram.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Graphics/PixmapDiagram.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param parent parent widget of the view (QWidget) @param name name of the view widget (string) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) else:
--- a/Graphics/SvgDiagram.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Graphics/SvgDiagram.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param parent parent widget of the view (QWidget) @param name name of the view widget (string) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) else:
--- a/Graphics/UMLDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Graphics/UMLDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param parent parent widget of the view (QWidget) @param name name of the view widget (string) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) if not name: self.setObjectName("UMLDialog")
--- a/Graphics/UMLItem.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Graphics/UMLItem.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param rounded flag indicating a rounded corner (boolean) @keyparam parent reference to the parent object (QGraphicsItem) """ - QGraphicsRectItem.__init__(self, parent) + super().__init__(parent) self.font = Preferences.getGraphics("Font") self.margin = 5 self.associations = [] @@ -101,7 +101,7 @@ @param dx relative movement in x-direction (float) @param dy relative movement in y-direction (float) """ - QGraphicsRectItem.moveBy(self, dx, dy) + super().moveBy(dx, dy) self.adjustAssociations() def setPos(self, x, y): @@ -111,7 +111,7 @@ @param x absolute x-position (float) @param y absolute y-position (float) """ - QGraphicsRectItem.setPos(self, x, y) + super().setPos(x, y) self.adjustAssociations() def itemChange(self, change, value):
--- a/Graphics/UMLSceneSizeDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Graphics/UMLSceneSizeDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param parent parent widget of this dialog (QWidget) @param name name of this widget (string) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setupUi(self)
--- a/Graphics/ZoomDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Graphics/ZoomDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param parent parent widget of this dialog (QWidget) @param name name of this dialog (string) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) else:
--- a/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param fileData reference to the data buffer (QByteArray) @param mimeType for the reply (string) """ - QNetworkReply.__init__(self, parent) + super().__init__(parent) self.setOperation(QNetworkAccessManager.GetOperation) self.setRequest(request) self.setUrl(request.url())
--- a/Helpviewer/AdBlock/AdBlockDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/AdBlock/AdBlockDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ """ Constructor """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png"))
--- a/Helpviewer/AdBlock/AdBlockManager.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/AdBlock/AdBlockManager.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.__loaded = False self.__subscriptionsLoaded = False
--- a/Helpviewer/AdBlock/AdBlockModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/AdBlock/AdBlockModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param parent reference to the parent object (QObject) """ - QAbstractItemModel.__init__(self, parent) + super().__init__(parent) self.__manager = Helpviewer.HelpWindow.HelpWindow.adblockManager() self.__manager.rulesChanged.connect(self.__rulesChanged)
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Sun Jun 19 19:36:27 2011 +0200 @@ -40,7 +40,7 @@ @param parent reference to the parent object (QObject) @param default flag indicating a default subscription (Boolean) """ - QObject.__init__(self, parent) + super().__init__(parent) self.__url = url.toEncoded() self.__enabled = False
--- a/Helpviewer/Bookmarks/AddBookmarkDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Bookmarks/AddBookmarkDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param parent reference to the parent object (QObject) """ - QSortFilterProxyModel.__init__(self, parent) + super().__init__(parent) def columnCount(self, parent): """ @@ -82,7 +82,7 @@ @param bookmarksManager reference to the bookmarks manager object (BookmarksManager) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__bookmarksManager = None @@ -206,7 +206,7 @@ """ if (not self.__addFolder and not self.addressEdit.text()) or \ not self.nameEdit.text(): - QDialog.accept(self) + super().accept() return idx = self.currentIndex() @@ -226,4 +226,4 @@ self.__bookmarksManager.addBookmark(parent, bookmark) self.__addedNode = bookmark - QDialog.accept(self) + super().accept()
--- a/Helpviewer/Bookmarks/BookmarksDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Bookmarks/BookmarksDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -38,7 +38,7 @@ @param parent reference to the parent widget (QWidget @param manager reference to the bookmarks manager object (BookmarksManager) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) @@ -84,7 +84,7 @@ Protected method called when the dialog is rejected. """ self.__shutdown() - QDialog.reject(self) + super().reject() def __shutdown(self): """
--- a/Helpviewer/Bookmarks/BookmarksManager.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Bookmarks/BookmarksManager.py Sun Jun 19 19:36:27 2011 +0200 @@ -108,7 +108,7 @@ @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.__loaded = False self.__saveTimer = AutoSaver(self, self.save) @@ -535,7 +535,7 @@ @param parent reference to the parent node (BookmarkNode) @param row row number of bookmark (integer) """ - QUndoCommand.__init__(self, + super().__init__( QApplication.translate("BookmarksManager", "Remove Bookmark")) self._row = row @@ -605,7 +605,7 @@ @param title flag indicating a change of the title (True) or the URL (False) (boolean) """ - QUndoCommand.__init__(self) + super().__init__() self._bookmarksManager = bookmarksManager self._title = title
--- a/Helpviewer/Bookmarks/BookmarksModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Bookmarks/BookmarksModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -37,7 +37,7 @@ @param manager reference to the bookmark manager object (BookmarksManager) @param parent reference to the parent object (QObject) """ - QAbstractItemModel.__init__(self, parent) + super().__init__(parent) self.__endMacro = False self.__bookmarksManager = manager
--- a/Helpviewer/Bookmarks/XbelReader.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Bookmarks/XbelReader.py Sun Jun 19 19:36:27 2011 +0200 @@ -37,7 +37,7 @@ """ Constructor """ - QXmlStreamReader.__init__(self) + super().__init__() self.__resolver = XmlEntityResolver() self.setEntityResolver(self.__resolver)
--- a/Helpviewer/Bookmarks/XbelWriter.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Bookmarks/XbelWriter.py Sun Jun 19 19:36:27 2011 +0200 @@ -20,7 +20,7 @@ """ Constructor """ - QXmlStreamWriter.__init__(self) + super().__init__() self.setAutoFormatting(True)
--- a/Helpviewer/CookieJar/CookieDetailsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/CookieJar/CookieDetailsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param parent reference to the parent object (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) def setData(self, domain, name, path, secure, expires, value):
--- a/Helpviewer/CookieJar/CookieExceptionsModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/CookieJar/CookieExceptionsModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param cookieJar reference to the cookie jar (CookieJar) @param parent reference to the parent object (QObject) """ - QAbstractTableModel.__init__(self, parent) + super().__init__(parent) self.__cookieJar = cookieJar self.__allowedCookies = self.__cookieJar.allowedCookies()
--- a/Helpviewer/CookieJar/CookieJar.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/CookieJar/CookieJar.py Sun Jun 19 19:36:27 2011 +0200 @@ -47,7 +47,7 @@ @param parent reference to the parent object (QObject) """ - QNetworkCookieJar.__init__(self, parent) + super().__init__(parent) self.__loaded = False self.__acceptCookies = self.AcceptOnlyFromSitesNavigatedTo
--- a/Helpviewer/CookieJar/CookieModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/CookieJar/CookieModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param cookieJar reference to the cookie jar (CookieJar) @param parent reference to the parent object (QObject) """ - QAbstractTableModel.__init__(self, parent) + super().__init__(parent) self.__headers = [ self.trUtf8("Website"),
--- a/Helpviewer/CookieJar/CookiesConfigurationDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/CookieJar/CookiesConfigurationDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ """ Constructor """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__mw = parent @@ -74,7 +74,7 @@ jar.setKeepPolicy(keepPolicy) jar.setFilterTrackingCookies(self.filterTrackingCookiesCheckbox.isChecked()) - QDialog.accept(self) + super().accept() @pyqtSlot() def on_exceptionsButton_clicked(self):
--- a/Helpviewer/CookieJar/CookiesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/CookieJar/CookiesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param cookieJar reference to the cookie jar (CookieJar) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png"))
--- a/Helpviewer/CookieJar/CookiesExceptionsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/CookieJar/CookiesExceptionsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param cookieJar reference to the cookie jar (CookieJar) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png"))
--- a/Helpviewer/Download/DownloadAskActionDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Download/DownloadAskActionDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.infoLabel.setText("<b>{0}</b>".format(fileName))
--- a/Helpviewer/Download/DownloadItem.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Download/DownloadItem.py Sun Jun 19 19:36:27 2011 +0200 @@ -50,7 +50,7 @@ @keyparam parent reference to the parent widget (QWidget) @keyparam mainWindow reference to the main window (HelpWindow) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) p = self.infoLabel.palette()
--- a/Helpviewer/Download/DownloadManager.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Download/DownloadManager.py Sun Jun 19 19:36:27 2011 +0200 @@ -37,7 +37,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__saveTimer = AutoSaver(self, self.save)
--- a/Helpviewer/Download/DownloadModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Download/DownloadModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ @param manager reference to the download manager (DownloadManager) @param parent reference to the parent object (QObject) """ - QAbstractListModel.__init__(self, parent) + super().__init__(parent) self.__manager = manager
--- a/Helpviewer/HelpBrowserWV.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/HelpBrowserWV.py Sun Jun 19 19:36:27 2011 +0200 @@ -56,7 +56,7 @@ @param mw reference to the main window 8HelpWindow) @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.__mw = mw @@ -105,7 +105,7 @@ @param mw reference to the main window 8HelpWindow) @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.__mw = mw @@ -161,7 +161,7 @@ @param parent parent widget of this window (QWidget) """ - QWebPage.__init__(self, parent) + super().__init__(parent) self.__lastRequest = None self.__lastRequestType = QWebPage.NavigationTypeOther @@ -398,7 +398,7 @@ @param parent parent widget of this window (QWidget) @param name name of this window (string) """ - QWebView.__init__(self, parent) + super().__init__(parent) self.setObjectName(name) self.setWhatsThis(self.trUtf8( """<b>Help Window</b>""" @@ -752,7 +752,7 @@ evt.accept() return - QWebView.wheelEvent(self, evt) + super().wheelEvent(evt) def hasSelection(self): """ @@ -1108,7 +1108,7 @@ evt.acceptProposedAction() if not evt.isAccepted(): - QWebView.dragMoveEvent(self, evt) + super().dragMoveEvent(evt) def dropEvent(self, evt): """ @@ -1116,7 +1116,7 @@ @param evt reference to the drop event (QDropEvent) """ - QWebView.dropEvent(self, evt) + super().dropEvent(evt) if not evt.isAccepted() and \ evt.source() != self and \ evt.possibleActions() & Qt.CopyAction: @@ -1143,7 +1143,7 @@ elif evt.button() == Qt.XButton2: self.pageAction(QWebPage.Forward).trigger() else: - QWebView.mousePressEvent(self, evt) + super().mousePressEvent(evt) def mouseReleaseEvent(self, evt): """ @@ -1185,7 +1185,7 @@ QTimer.singleShot(300, self.__accessKeyShortcut) self.ctrlPressed = (evt.key() == Qt.Key_Control) - QWebView.keyPressEvent(self, evt) + super().keyPressEvent(evt) def keyReleaseEvent(self, evt): """ @@ -1198,7 +1198,7 @@ self.__accessKeysPressed = evt.key() == Qt.Key_Control self.ctrlPressed = False - QWebView.keyReleaseEvent(self, evt) + super().keyReleaseEvent(evt) def focusOutEvent(self, evt): """ @@ -1211,7 +1211,7 @@ self.__hideAccessKeys() self.__accessKeysPressed = False - QWebView.focusOutEvent(self, evt) + super().focusOutEvent(evt) def clearHistory(self): """
--- a/Helpviewer/HelpClearPrivateDataDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/HelpClearPrivateDataDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) def getData(self):
--- a/Helpviewer/HelpDocsInstaller.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/HelpDocsInstaller.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param collection full pathname of the collection file (string) """ - QThread.__init__(self) + super().__init__() self.__abort = False self.__collection = collection
--- a/Helpviewer/HelpIndexWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/HelpIndexWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -34,7 +34,7 @@ @param mainWindow reference to the main window object (QMainWindow) @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.__engine = engine self.__mw = mainWindow
--- a/Helpviewer/HelpLanguagesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/HelpLanguagesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__model = QStringListModel() @@ -111,7 +111,7 @@ Preferences.Prefs.settings.remove("Help/AcceptLanguages") else: Preferences.Prefs.settings.setValue("Help/AcceptLanguages", result) - QDialog.accept(self) + super().accept() @classmethod def httpString(cls, languages):
--- a/Helpviewer/HelpSearchWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/HelpSearchWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ @param mainWindow reference to the main window object (QMainWindow) @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.__engine = engine self.__mw = mainWindow
--- a/Helpviewer/HelpTocWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/HelpTocWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ @param mainWindow reference to the main window object (QMainWindow) @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.__engine = engine self.__mw = mainWindow
--- a/Helpviewer/HelpTopicDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/HelpTopicDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param links dictionary with help topic as key (string) and URL as value (QUrl) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.label.setText(self.trUtf8("Choose a &topic for <b>{0}</b>:")\
--- a/Helpviewer/HelpWebSearchWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/HelpWebSearchWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -38,7 +38,7 @@ @param inactiveText text to be shown on inactivity (string) @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.mw = parent
--- a/Helpviewer/HelpWindow.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/HelpWindow.py Sun Jun 19 19:36:27 2011 +0200 @@ -102,7 +102,7 @@ shortcuts (boolean) @keyparam searchWord word to search for (string) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.setObjectName(name) self.setAttribute(Qt.WA_DeleteOnClose) self.setWindowTitle(self.trUtf8("eric5 Web Browser"))
--- a/Helpviewer/History/HistoryCompleter.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/History/HistoryCompleter.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param parent reference to the parent widget (QWidget) """ - QTableView.__init__(self, parent) + super().__init__(parent) self.horizontalHeader().hide() self.verticalHeader().hide() @@ -48,7 +48,7 @@ self.horizontalHeader().resizeSection(0, 0.65 * self.width()) self.horizontalHeader().setStretchLastSection(True) - QTableView.resizeEvent(self, evt) + super().resizeEvent(evt) def sizeHintForRow(self, row): """ @@ -72,7 +72,7 @@ @param parent reference to the parent object (QObject) """ - QSortFilterProxyModel.__init__(self, parent) + super().__init__(parent) self.__searchString = "" self.__searchMatcher = QRegExp("", Qt.CaseInsensitive, QRegExp.FixedString) @@ -218,7 +218,7 @@ @param model reference to the model (QAbstractItemModel) @param parent reference to the parent object (QObject) """ - QCompleter.__init__(self, model, parent) + super().__init__(model, parent) self.setPopup(HistoryCompletionView())
--- a/Helpviewer/History/HistoryDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/History/HistoryDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -37,7 +37,7 @@ @param parent reference to the parent widget (QWidget @param manager reference to the history manager object (HistoryManager) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png"))
--- a/Helpviewer/History/HistoryFilterModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/History/HistoryFilterModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -66,7 +66,7 @@ @param sourceModel reference to the source model (QAbstractItemModel) @param parent reference to the parent object (QObject) """ - QAbstractProxyModel.__init__(self, parent) + super().__init__(parent) self.__loaded = False self.__filteredRows = [] @@ -123,7 +123,7 @@ self.sourceModel().rowsInserted.disconnect(self.__sourceRowsInserted) self.sourceModel().rowsRemoved.disconnect(self.__sourceRowsRemoved) - QAbstractProxyModel.setSourceModel(self, sourceModel) + super().setSourceModel(sourceModel) if self.sourceModel() is not None: self.__loaded = False
--- a/Helpviewer/History/HistoryManager.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/History/HistoryManager.py Sun Jun 19 19:36:27 2011 +0200 @@ -98,7 +98,7 @@ @param parent reference to the parent object (QObject) """ - QWebHistoryInterface.__init__(self, parent) + super().__init__(parent) self.__saveTimer = AutoSaver(self, self.save) self.__daysToExpire = Preferences.getHelp("HistoryLimit") @@ -122,7 +122,7 @@ self.__historyFilterModel = HistoryFilterModel(self.__historyModel, self) self.__historyTreeModel = HistoryTreeModel(self.__historyFilterModel, self) - QWebHistoryInterface.setDefaultInterface(self) + super().setDefaultInterface() self.__startFrequencyTimer() def close(self):
--- a/Helpviewer/History/HistoryMenu.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/History/HistoryMenu.py Sun Jun 19 19:36:27 2011 +0200 @@ -38,7 +38,7 @@ @param sourceModel reference to the source model (QAbstractItemModel) @param parent reference to the parent object (QObject) """ - QAbstractProxyModel.__init__(self, parent) + super().__init__(parent) self.__treeModel = sourceModel
--- a/Helpviewer/History/HistoryModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/History/HistoryModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param historyManager reference to the history manager object (HistoryManager) @param parent reference to the parent object (QObject) """ - QAbstractTableModel.__init__(self, parent) + super().__init__(parent) self.__historyManager = historyManager
--- a/Helpviewer/History/HistoryTreeModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/History/HistoryTreeModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param sourceModel reference to the source model (QAbstractItemModel) @param parent reference to the parent object (QObject) """ - QAbstractProxyModel.__init__(self, parent) + super().__init__(parent) self.__sourceRowCache = [] self.__removingDown = False @@ -225,7 +225,7 @@ self.sourceModel().rowsInserted.disconnect(self.__sourceRowsInserted) self.sourceModel().rowsRemoved.disconnect(self.__sourceRowsRemoved) - QAbstractProxyModel.setSourceModel(self, sourceModel) + super().setSourceModel(sourceModel) if self.sourceModel() is not None: self.__loaded = False
--- a/Helpviewer/Network/FtpReply.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Network/FtpReply.py Sun Jun 19 19:36:27 2011 +0200 @@ -102,7 +102,7 @@ @param url requested FTP URL (QUrl) @param parent reference to the parent object (QObject) """ - QNetworkReply.__init__(self, parent) + super().__init__(parent) self.__manager = parent
--- a/Helpviewer/Network/NetworkAccessManager.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Network/NetworkAccessManager.py Sun Jun 19 19:36:27 2011 +0200 @@ -60,7 +60,7 @@ @param engine reference to the help engine (QHelpEngine) @param parent reference to the parent object (QObject) """ - QNetworkAccessManager.__init__(self, parent) + super().__init__(parent) self.__adblockNetwork = None
--- a/Helpviewer/Network/NetworkAccessManagerProxy.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Network/NetworkAccessManagerProxy.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param parent reference to the parent object (QObject) """ - QNetworkAccessManager.__init__(self, parent) + super().__init__(parent) self.__webPage = None def setWebPage(self, page):
--- a/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param protocol protocol name (string) @param parent reference to the parent object (QObject) """ - QNetworkReply.__init__(self, parent) + super().__init__(parent) self.setError(QNetworkReply.ProtocolUnknownError, self.trUtf8("Protocol '{0}' not supported.").format(protocol)) QTimer.singleShot(0, self.__fireSignals)
--- a/Helpviewer/Network/NetworkReply.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Network/NetworkReply.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param mimeType for the reply (string) @param parent reference to the parent object (QObject) """ - QNetworkReply.__init__(self, parent) + super().__init__(parent) self.__data = fileData
--- a/Helpviewer/Network/SchemeAccessHandler.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Network/SchemeAccessHandler.py Sun Jun 19 19:36:27 2011 +0200 @@ -20,7 +20,7 @@ @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) def createRequest(self, op, request, outgoingData=None): """
--- a/Helpviewer/OfflineStorage/OfflineStorageConfigDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/OfflineStorage/OfflineStorageConfigDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.databaseEnabledCheckBox.setChecked(
--- a/Helpviewer/OfflineStorage/WebDatabasesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/OfflineStorage/WebDatabasesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png"))
--- a/Helpviewer/OfflineStorage/WebDatabasesModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/OfflineStorage/WebDatabasesModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent reference to the parent object (QObject) """ - QAbstractItemModel.__init__(self, parent) + super().__init__(parent) self.__headers = [ self.trUtf8("Name"), self.trUtf8("Size")
--- a/Helpviewer/OpenSearch/OpenSearchDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ """ Constructor """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.setModal(True)
--- a/Helpviewer/OpenSearch/OpenSearchEditDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEditDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -20,7 +20,7 @@ """ Constructor """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__engine = engine @@ -41,4 +41,4 @@ self.__engine.setSearchUrlTemplate(self.searchEdit.text()) self.__engine.setSuggestionsUrlTemplate(self.suggestionsEdit.text()) - QDialog.accept(self) + super().accept()
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEngine.py Sun Jun 19 19:36:27 2011 +0200 @@ -38,7 +38,7 @@ @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.__suggestionsReply = None self.__networkAccessManager = None
--- a/Helpviewer/OpenSearch/OpenSearchEngineAction.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEngineAction.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param engine reference to the open search engine object (OpenSearchEngine) @param parent reference to the parent object (QObject) """ - QAction.__init__(self, parent) + super().__init__(parent) self.__engine = engine if self.__engine.networkAccessManager() is None:
--- a/Helpviewer/OpenSearch/OpenSearchEngineModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEngineModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param manager reference to the search engine manager (OpenSearchManager) @param parent reference to the parent object (QObject) """ - QAbstractTableModel.__init__(self, parent) + super().__init__(parent) self.__manager = manager manager.changed.connect(self.__enginesChanged) @@ -191,4 +191,4 @@ """ Private slot handling a change of the registered engines. """ - QAbstractTableModel.reset(self) + super().reset()
--- a/Helpviewer/OpenSearch/OpenSearchManager.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchManager.py Sun Jun 19 19:36:27 2011 +0200 @@ -45,7 +45,7 @@ """ if parent is None: parent = e5App() - QObject.__init__(self, parent) + super().__init__(parent) self.__replies = [] self.__engines = {}
--- a/Helpviewer/OpenSearch/OpenSearchWriter.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchWriter.py Sun Jun 19 19:36:27 2011 +0200 @@ -18,7 +18,7 @@ """ Constructor """ - QXmlStreamWriter.__init__(self) + super().__init__() self.setAutoFormatting(True)
--- a/Helpviewer/Passwords/PasswordManager.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Passwords/PasswordManager.py Sun Jun 19 19:36:27 2011 +0200 @@ -93,7 +93,7 @@ @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.__logins = {} self.__loginForms = {}
--- a/Helpviewer/Passwords/PasswordModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Passwords/PasswordModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ @param manager reference to the password manager (PasswordManager) @param parent reference to the parent object (QObject) """ - QAbstractTableModel.__init__(self, parent) + super().__init__(parent) self.__manager = manager manager.changed.connect(self.__passwordsChanged)
--- a/Helpviewer/Passwords/PasswordsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/Passwords/PasswordsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png"))
--- a/Helpviewer/QtHelpDocumentationDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/QtHelpDocumentationDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param engine reference to the help engine (QHelpEngine) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.removeButton.setEnabled(False)
--- a/Helpviewer/QtHelpFiltersDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/QtHelpFiltersDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param engine reference to the help engine (QHelpEngine) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__engine = engine
--- a/Helpviewer/SearchWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/SearchWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param mainWindow reference to the main window (QMainWindow) @param parent parent widget of this dialog (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__mainWindow = mainWindow
--- a/Helpviewer/SslCertificatesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/SslCertificatesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -39,7 +39,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__populateServerCertificatesTree()
--- a/Helpviewer/SslInfoDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/SslInfoDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param certificate reference to the SSL certificate (QSslCertificate) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.subjectCommonNameLabel.setText(self.__certificateString(
--- a/Helpviewer/UrlBar/BookmarkInfoDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/UrlBar/BookmarkInfoDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param bookmark reference to the bookmark to be shown (Bookmark) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__bookmark = bookmark
--- a/Helpviewer/UrlBar/FavIconLabel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/UrlBar/FavIconLabel.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent reference to the parent widget (QWidget) """ - QLabel.__init__(self, parent) + super().__init__(parent) self.__browser = None self.__dragStartPos = QPoint() @@ -65,7 +65,7 @@ """ if evt.button() == Qt.LeftButton: self.__dragStartPos = evt.pos() - QLabel.mousePressEvent(self, evt) + super().mousePressEvent(evt) def mouseMoveEvent(self, evt): """
--- a/Helpviewer/UrlBar/SslLabel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/UrlBar/SslLabel.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent reference to the parent widget (QWidget) """ - QLabel.__init__(self, parent) + super().__init__(parent) self.setFocusPolicy(Qt.NoFocus) self.setCursor(Qt.ArrowCursor) @@ -37,7 +37,7 @@ if evt.button() == Qt.LeftButton: self.clicked.emit() else: - QLabel.mouseReleaseEvent(self, evt) + super().mouseReleaseEvent(evt) def mouseDoubleClickEvent(self, evt): """ @@ -48,4 +48,4 @@ if evt.button() == Qt.LeftButton: self.clicked.emit() else: - QLabel.mouseDoubleClickEvent(self, evt) + super().mouseDoubleClickEvent(evt)
--- a/Helpviewer/UrlBar/StackedUrlBar.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/UrlBar/StackedUrlBar.py Sun Jun 19 19:36:27 2011 +0200 @@ -20,7 +20,7 @@ @param parent reference to the parent widget (QWidget) """ - QStackedWidget.__init__(self, parent) + super().__init__(parent) sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(6)
--- a/Helpviewer/UserAgent/UserAgentMenu.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/UserAgent/UserAgentMenu.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param title title of the menu (string) @param parent reference to the parent widget (QWidget) """ - QMenu.__init__(self, title, parent) + super().__init__(title, parent) self.aboutToShow.connect(self.__populateMenu)
--- a/Helpviewer/VirusTotalApi.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Helpviewer/VirusTotalApi.py Sun Jun 19 19:36:27 2011 +0200 @@ -57,7 +57,7 @@ @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.__replies = []
--- a/IconEditor/IconEditorGrid.py Sun Jun 19 17:50:39 2011 +0200 +++ b/IconEditor/IconEditorGrid.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param oldImage copy of the icon before the changes were applied (QImage) @param parent reference to the parent command (QUndoCommand) """ - QUndoCommand.__init__(self, text, parent) + super().__init__(text, parent) self.__grid = grid self.__imageBefore = QImage(oldImage) @@ -108,7 +108,7 @@ @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setAttribute(Qt.WA_StaticContents) self.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
--- a/IconEditor/IconEditorPalette.py Sun Jun 19 17:50:39 2011 +0200 +++ b/IconEditor/IconEditorPalette.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) if self.layoutDirection == Qt.Horizontal: direction = QBoxLayout.LeftToRight
--- a/IconEditor/IconEditorWindow.py Sun Jun 19 17:50:39 2011 +0200 +++ b/IconEditor/IconEditorWindow.py Sun Jun 19 19:36:27 2011 +0200 @@ -46,7 +46,7 @@ @keyparam initShortcutsOnly flag indicating to just initialize the keyboard shortcuts (boolean) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.setObjectName("eric5_icon_editor") self.setAttribute(Qt.WA_DeleteOnClose)
--- a/IconEditor/IconSizeDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/IconEditor/IconSizeDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ @param height height to be set (integer) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.widthSpin.setValue(width)
--- a/IconEditor/IconZoomDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/IconEditor/IconZoomDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param zoom zoom factor to show in the spinbox @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.zoomSpinBox.setValue(zoom * 100)
--- a/MultiProject/AddProjectDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/MultiProject/AddProjectDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param startdir start directory for the selection dialog (string) @param project dictionary containing project data """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.fileCompleter = E5FileCompleter(self.filenameEdit)
--- a/MultiProject/MultiProject.py Sun Jun 19 17:50:39 2011 +0200 +++ b/MultiProject/MultiProject.py Sun Jun 19 19:36:27 2011 +0200 @@ -68,7 +68,7 @@ @param parent parent widget (usually the ui object) (QWidget) @param filename optional filename of a multi project file to open (string) """ - QObject.__init__(self, parent) + super().__init__(parent) self.ui = parent self.projectObject = project
--- a/MultiProject/MultiProjectBrowser.py Sun Jun 19 17:50:39 2011 +0200 +++ b/MultiProject/MultiProjectBrowser.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param project reference to the multi project object @param parent parent widget (QWidget) """ - QListWidget.__init__(self, parent) + super().__init__(parent) self.multiProject = multiProject self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
--- a/MultiProject/PropertiesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/MultiProject/PropertiesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param new flag indicating the generation of a new multi project @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.multiProject = multiProject
--- a/PluginManager/PluginDetailsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/PluginManager/PluginDetailsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param details dictionary containing the info to be displayed @param parent parent of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__autoactivate = details["autoactivate"]
--- a/PluginManager/PluginInfoDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/PluginManager/PluginInfoDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param pluginManager reference to the plugin manager object @param parent parent of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.pm = pluginManager
--- a/PluginManager/PluginInstallDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/PluginManager/PluginInstallDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -42,7 +42,7 @@ installation (list of strings) @param parent parent of this dialog (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) if pluginManager is None: @@ -520,7 +520,7 @@ installation (list of strings) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setSizeGripEnabled(True) self.__layout = QVBoxLayout(self) @@ -556,7 +556,7 @@ installation (list of strings) @param parent reference to the parent widget (QWidget) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.cw = PluginInstallWidget(None, pluginFileNames, self) size = self.cw.size() self.setCentralWidget(self.cw)
--- a/PluginManager/PluginManager.py Sun Jun 19 17:50:39 2011 +0200 +++ b/PluginManager/PluginManager.py Sun Jun 19 19:36:27 2011 +0200 @@ -67,7 +67,7 @@ @keyparam develPlugin filename of a plugin to be loaded for development (string) """ - QObject.__init__(self, parent) + super().__init__(parent) self.__ui = parent self.__develPluginFile = develPlugin
--- a/PluginManager/PluginRepositoryDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/PluginManager/PluginRepositoryDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -57,7 +57,7 @@ @param parent parent of this dialog (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__updateButton = \ @@ -492,7 +492,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setSizeGripEnabled(True) self.__layout = QVBoxLayout(self) @@ -533,7 +533,7 @@ @param parent reference to the parent widget (QWidget) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.cw = PluginRepositoryWidget(self) size = self.cw.size() self.setCentralWidget(self.cw)
--- a/PluginManager/PluginUninstallDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/PluginManager/PluginUninstallDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param pluginManager reference to the plugin manager object @param parent parent of this dialog (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) if pluginManager is None: @@ -164,7 +164,7 @@ @param pluginManager reference to the plugin manager object @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setSizeGripEnabled(True) self.__layout = QVBoxLayout(self) @@ -190,7 +190,7 @@ @param parent reference to the parent widget (QWidget) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.cw = PluginUninstallWidget(None, self) size = self.cw.size() self.setCentralWidget(self.cw)
--- a/Plugins/AboutPlugin/AboutDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/AboutPlugin/AboutDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -735,7 +735,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.ericLabel.setText(titleText)
--- a/Plugins/CheckerPlugins/Pep8/Pep8CodeSelectionDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/CheckerPlugins/Pep8/Pep8CodeSelectionDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ issues (boolean) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) codeList = [code.strip() for code in codes.split(",") if code.strip()]
--- a/Plugins/CheckerPlugins/Pep8/Pep8Dialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/CheckerPlugins/Pep8/Pep8Dialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -47,7 +47,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.statisticsButton = self.buttonBox.addButton(
--- a/Plugins/CheckerPlugins/Pep8/Pep8Fixer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/CheckerPlugins/Pep8/Pep8Fixer.py Sun Jun 19 19:36:27 2011 +0200 @@ -38,7 +38,7 @@ string (string) @param inPlace flag indicating to modify the file in place (boolean) """ - QObject.__init__(self) + super().__init__() self.__project = project self.__filename = filename
--- a/Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ @param dictionary with the statistical data @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) stats = statistics.copy()
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -41,7 +41,7 @@ @param parent The parent widget. (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.showButton = self.buttonBox.addButton(
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -36,7 +36,7 @@ @param parent The parent widget (QWidget). """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -36,7 +36,7 @@ @param parms parameters to set in the dialog @param parent parent widget of this dialog """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) @@ -260,4 +260,4 @@ self.parameters['languages'].append(itm.text()) # call the accept slot of the base class - QDialog.accept(self) + super().accept()
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param cmdname name of the ericapi generator (string) @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setModal(True) self.setupUi(self)
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -36,7 +36,7 @@ @param parms parameters to set in the dialog @param parent parent widget of this dialog """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok) @@ -527,4 +527,4 @@ self.qtHelpGenerateCollectionCheckBox.isChecked() # call the accept slot of the base class - QDialog.accept(self) + super().accept()
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param cmdname name of the documentation generator (string) @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setModal(True) self.setupUi(self)
--- a/Plugins/PluginAbout.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginAbout.py Sun Jun 19 19:36:27 2011 +0200 @@ -43,7 +43,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/PluginEricapi.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginEricapi.py Sun Jun 19 19:36:27 2011 +0200 @@ -76,7 +76,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui self.__initialize()
--- a/Plugins/PluginEricdoc.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginEricdoc.py Sun Jun 19 19:36:27 2011 +0200 @@ -111,7 +111,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui self.__initialize()
--- a/Plugins/PluginPep8Checker.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginPep8Checker.py Sun Jun 19 19:36:27 2011 +0200 @@ -47,7 +47,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui self.__initialize()
--- a/Plugins/PluginSyntaxChecker.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginSyntaxChecker.py Sun Jun 19 19:36:27 2011 +0200 @@ -46,7 +46,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui self.__initialize()
--- a/Plugins/PluginTabnanny.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginTabnanny.py Sun Jun 19 19:36:27 2011 +0200 @@ -46,7 +46,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui self.__initialize()
--- a/Plugins/PluginVcsMercurial.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginVcsMercurial.py Sun Jun 19 19:36:27 2011 +0200 @@ -147,7 +147,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui self.__mercurialDefaults = {
--- a/Plugins/PluginVcsPySvn.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginVcsPySvn.py Sun Jun 19 19:36:27 2011 +0200 @@ -145,7 +145,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui self.__subversionDefaults = {
--- a/Plugins/PluginVcsSubversion.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginVcsSubversion.py Sun Jun 19 19:36:27 2011 +0200 @@ -147,7 +147,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui self.__subversionDefaults = {
--- a/Plugins/PluginVmListspace.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginVmListspace.py Sun Jun 19 19:36:27 2011 +0200 @@ -52,7 +52,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/PluginVmMdiArea.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginVmMdiArea.py Sun Jun 19 19:36:27 2011 +0200 @@ -52,7 +52,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/PluginVmTabview.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginVmTabview.py Sun Jun 19 19:36:27 2011 +0200 @@ -52,7 +52,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/PluginWizardE5MessageBox.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginWizardE5MessageBox.py Sun Jun 19 19:36:27 2011 +0200 @@ -43,7 +43,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/PluginWizardPyRegExp.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginWizardPyRegExp.py Sun Jun 19 19:36:27 2011 +0200 @@ -43,7 +43,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/PluginWizardQColorDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginWizardQColorDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -43,7 +43,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/PluginWizardQFileDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginWizardQFileDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -43,7 +43,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/PluginWizardQFontDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginWizardQFontDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -43,7 +43,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/PluginWizardQInputDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginWizardQInputDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -43,7 +43,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/PluginWizardQMessageBox.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginWizardQMessageBox.py Sun Jun 19 19:36:27 2011 +0200 @@ -43,7 +43,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/PluginWizardQRegExp.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/PluginWizardQRegExp.py Sun Jun 19 19:36:27 2011 +0200 @@ -43,7 +43,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super().__init__(ui) self.__ui = ui def activate(self):
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param bookmarksList list of bookmarks (list of strings) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkRenameDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param bookmarksList list of bookmarks (list of strings) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -36,7 +36,7 @@ HgBookmarksInOutDialog.OUTGOING) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) @@ -277,4 +277,4 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) @@ -276,4 +276,4 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param plugin reference to the plugin object """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("MercurialPage")
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.recentCommitMessages = Preferences.toList(
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param bookmarksList list of bookmarks (list of strings) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param vcs reference to the vcs object @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.clearRxEditButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) @@ -337,4 +337,4 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) @@ -264,4 +264,4 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param bookmarksList list of bookmarks (list of strings) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param bookmarksList list of bookmarks (list of strings) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param ppath pathname of the project directory (string) @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent, Qt.WindowFlags(Qt.Window)) + super().__init__(parent, Qt.WindowFlags(Qt.Window)) self.setupUi(self) def showEvent(self, evt):
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param move flag indicating a move operation @param force flag indicating a forced operation (boolean) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.source = source
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -34,7 +34,7 @@ @param text text to be shown by the label (string) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) @@ -247,7 +247,7 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) + super().keyPressEvent(evt) def hasAddOrDelete(self): """
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Save).setEnabled(False) @@ -353,4 +353,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgExtension.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExtension.py Sun Jun 19 19:36:27 2011 +0200 @@ -20,7 +20,7 @@ @param vcs reference to the Mercurial vcs object """ - QObject.__init__(self, vcs) + super().__init__(vcs) self.vcs = vcs
--- a/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ """ Constructor """ - QObject.__init__(self) + super().__init__() self.actions = []
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -12,7 +12,7 @@ from PyQt4.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \ QSize, QPoint from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QApplication, QCursor, QWidget, QLineEdit, QColor, \ + QTreeWidgetItem, QApplication, QCursor, QLineEdit, QColor, \ QPixmap, QPainter, QPen, QBrush, QIcon from E5Gui.E5Application import e5App @@ -52,7 +52,7 @@ @param bundle name of a bundle file (string) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) if mode == "log": @@ -1192,4 +1192,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -39,7 +39,7 @@ @param bundle name of a bundle file (string) @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) @@ -434,4 +434,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param bookmarksList list of bookmarks (list of strings) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param vcs reference to the version control object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit)
--- a/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param project reference to the project object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) def getData(self):
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param showNone flag influencing the label of the 'None' selection (boolean) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param bookmarksList list of bookmarks (list of strings) @param parent parent widget of the dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param path path of the repository to serve (string) @param parent reference to the parent widget (QWidget) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.vcs = vcs self.__repoPath = path
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -34,7 +34,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__toBeCommittedColumn = 0 @@ -364,7 +364,7 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) + super().keyPressEvent(evt) @pyqtSlot() def on_refreshButton_clicked(self):
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) @@ -295,4 +295,4 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ @param taglist list of previously entered tags (list of strings) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param entries list of entries to be shown (list of strings) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.purgeList.addItems(sorted(entries))
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param patchesList list of patches (list of strings) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.process = QProcess()
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param patchesList list of patches to select from (list of strings) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.addButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param listOnly flag indicating to only list the guards (boolean) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) for guard in guards:
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param vcs reference to the vcs object @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.process = QProcess()
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) @@ -373,4 +373,4 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param patchesList list of patches (list of strings) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.process = QProcess()
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ @param message text to set as the commit message (string) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__mode = mode
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -37,7 +37,7 @@ @param repodir name of the repository directory (string) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) if mode not in (HgQueuesQueueManagementDialog.NO_INPUT,
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param patchesList list of patches to select from (list of strings) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.currentButton.setText(
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param bookmarksList list of bookmarks (list of strings) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.tag1Combo.addItems(sorted(tagsList))
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param multiRevsAllowed flag indicating, if multi revs are allowed (boolean) @param parent reference to the parent object (QObject) """ - QValidator.__init__(self, parent) + super().__init__(parent) self.__multiRevsAllowed = multiRevsAllowed @@ -78,7 +78,7 @@ @param branchesList list of available branch names (list of strings) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.branchesCombo.addItems(["", "default"] + sorted(branchesList))
--- a/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param plugin reference to the plugin object """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("SubversionPage")
--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param ppath pathname of the project directory (string) @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.workdirCompleter = E5DirCompleter(self.workdirCombo)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent, Qt.WindowFlags(Qt.Window)) + super().__init__(parent, Qt.WindowFlags(Qt.Window)) self.setupUi(self) if pysvn.svn_version < (1, 5, 0) or pysvn.version < (1, 6, 0):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param move flag indicating a move operation (boolean) @param force flag indicating a forced operation (boolean) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.source = source
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -34,7 +34,7 @@ @keyparam parent parent widget (QWidget) @keyparam log optional log message (string) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) SvnDialogMixin.__init__(self, log)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -37,7 +37,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -37,7 +37,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param may_save flag indicating, that subversion is willing to save the answers returned (boolean) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.realmLabel.setText(self.trUtf8("<b>Enter login data for realm {0}.</b>")\
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param force flag indicating a forced merge (boolean) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.forceCheckBox.setChecked(force)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param vcs reference to the version control object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param project reference to the project object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param recursive flag indicating a recursive set is requested @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param recursive flag indicating a recursive set is requested @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.recurseCheckBox.setChecked(recursive)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param currUrl current repository URL (string) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.currUrlLabel.setText(currUrl)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param mode mode of the dialog (string, "browse" or "select") @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) SvnDialogMixin.__init__(self) @@ -277,7 +277,7 @@ if self.focusWidget() == self.urlCombo: return - QDialog.accept(self) + super().accept() def getSelectedUrl(self): """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of the dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.date1Edit.setDate(QDate.currentDate())
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -40,7 +40,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ repository (boolean) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.tagCombo.clear()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -34,7 +34,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) SvnDialogMixin.__init__(self)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ repository (boolean) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -34,7 +34,7 @@ @param path pathname to determine the repository URL from (string) @param parent parent widget of the dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) if not hasattr(pysvn.Client(), 'diff_summarize'):
--- a/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param plugin reference to the plugin object """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("SubversionPage")
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) @@ -247,4 +247,4 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param ppath pathname of the project directory (string) @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.workdirCompleter = E5DirCompleter(self.workdirCombo)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent, Qt.WindowFlags(Qt.Window)) + super().__init__(parent, Qt.WindowFlags(Qt.Window)) self.setupUi(self) if vcs.versionStr < '1.5.0':
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param move flag indicating a move operation @param force flag indicating a forced operation (boolean) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.source = source
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -34,7 +34,7 @@ @param text text to be shown by the label (string) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) @@ -234,7 +234,7 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) + super().keyPressEvent(evt) def hasAddOrDelete(self): """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Save).setEnabled(False) @@ -358,4 +358,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -10,7 +10,7 @@ import os from PyQt4.QtCore import QTimer, QDate, QProcess, QRegExp, Qt, pyqtSlot -from PyQt4.QtGui import QWidget, QCursor, QHeaderView, QLineEdit, QDialog, \ +from PyQt4.QtGui import QCursor, QHeaderView, QLineEdit, QDialog, \ QApplication, QDialogButtonBox, QTreeWidgetItem from E5Gui import E5MessageBox @@ -35,7 +35,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) @@ -642,4 +642,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) @@ -320,4 +320,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param force flag indicating a forced merge (boolean) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.forceCheckBox.setChecked(force)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param vcs reference to the version control object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param project reference to the project object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlEdit)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.propFileCompleter = E5FileCompleter(self.propFileEdit)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param currUrl current repository URL (string) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.currUrlLabel.setText(currUrl)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -9,7 +9,7 @@ import os -from PyQt4.QtGui import QWidget, QCursor, QHeaderView, QLineEdit, QDialog, \ +from PyQt4.QtGui import QCursor, QHeaderView, QLineEdit, QDialog, \ QApplication, QDialogButtonBox, QTreeWidgetItem from PyQt4.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot @@ -34,7 +34,7 @@ @param mode mode of the dialog (string, "browse" or "select") @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.repoTree.headerItem().setText(self.repoTree.columnCount(), "") @@ -318,7 +318,7 @@ if self.focusWidget() == self.urlCombo: return - QDialog.accept(self) + super().accept() def getSelectedUrl(self): """ @@ -455,4 +455,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of the dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.date1Edit.setDate(QDate.currentDate())
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -36,7 +36,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__toBeCommittedColumn = 0 @@ -543,7 +543,7 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) + super().keyPressEvent(evt) @pyqtSlot() def on_refreshButton_clicked(self):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ repository (boolean) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.tagCombo.clear()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) @@ -315,4 +315,4 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) + super().keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ repository (boolean) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param path pathname to determine the repository URL from (string) @param parent parent widget of the dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) if vcs.versionStr < "1.4.0":
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param parent parent widget (QWidget) """ - QStackedWidget.__init__(self, parent) + super().__init__(parent) self.setAttribute(Qt.WA_DeleteOnClose, True) self.editors = [] @@ -42,7 +42,7 @@ @param editor the editor object to be added (QScintilla.Editor.Editor) """ - QStackedWidget.addWidget(self, editor) + super().addWidget(editor) if not editor in self.editors: self.editors.append(editor) @@ -52,7 +52,7 @@ @param widget widget to be removed (QWidget) """ - QStackedWidget.removeWidget(self, widget) + super().removeWidget(widget) if isinstance(widget, QScintilla.Editor.Editor): self.editors.remove(widget) @@ -65,7 +65,7 @@ if isinstance(widget, QScintilla.Editor.Editor): self.editors.remove(widget) self.editors.insert(0, widget) - QStackedWidget.setCurrentWidget(self, widget) + super().setCurrentWidget(widget) def setCurrentIndex(self, index): """
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.bTest = \
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) # keep the following three lists in sync
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.eStartWithCompleter = E5FileCompleter(self.eStartWith)
--- a/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.bTest = \
--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) # set the validators for the double line edots
--- a/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) # keep the following three lists in sync
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.comboItems = []
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -37,7 +37,7 @@ @param parent parent widget (QWidget) @param fromEric flag indicating a call from within eric5 """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) # initialize icons of the tool buttons @@ -637,7 +637,7 @@ @param parent parent widget (QWidget) @param fromEric flag indicating a call from within eric5 """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setModal(fromEric) self.setSizeGripEnabled(True) @@ -674,7 +674,7 @@ @param parent reference to the parent widget (QWidget) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.cw = PyRegExpWizardWidget(self, fromEric=False) size = self.cw.size() self.setCentralWidget(self.cw)
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.unlimitedButton.setChecked(True)
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.comboItems = []
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -36,7 +36,7 @@ @param parent parent widget (QWidget) @param fromEric flag indicating a call from within eric5 """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) # initialize icons of the tool buttons @@ -485,7 +485,7 @@ @param parent parent widget (QWidget) @param fromEric flag indicating a call from within eric5 """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setModal(fromEric) self.setSizeGripEnabled(True) @@ -522,7 +522,7 @@ @param parent reference to the parent widget (QWidget) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.cw = QRegExpWizardWidget(self, fromEric=False) size = self.cw.size() self.setCentralWidget(self.cw)
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.unlimitedButton.setChecked(True)
--- a/Preferences/ConfigurationDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -41,7 +41,7 @@ @param pageName name of the configuration page (string) @param iconFile file name of the icon to be shown (string) """ - QTreeWidgetItem.__init__(self, parent, [text]) + super().__init__(parent, [text]) self.setIcon(0, UI.PixmapCache.getIcon(iconFile)) self.__pageName = pageName @@ -86,7 +86,7 @@ ConfigurationWidget.TrayStarterMode ) - QWidget.__init__(self, parent) + super().__init__(parent) self.fromEric = fromEric self.displayMode = displayMode @@ -675,7 +675,7 @@ @keyparam displayMode mode of the configuration dialog (DefaultMode, HelpBrowserMode, TrayStarterMode) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setModal(modal) @@ -742,7 +742,7 @@ @param parent reference to the parent widget (QWidget) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.cw = ConfigurationWidget(self, fromEric=False) size = self.cw.size()
--- a/Preferences/ConfigurationPages/ApplicationPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/ApplicationPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("ApplicationPage")
--- a/Preferences/ConfigurationPages/ConfigurationPageBase.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/ConfigurationPageBase.py Sun Jun 19 19:36:27 2011 +0200 @@ -18,7 +18,7 @@ """ Constructor """ - QWidget.__init__(self) + super().__init__() def polishPage(self): """
--- a/Preferences/ConfigurationPages/CooperationPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/CooperationPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("CooperationPage")
--- a/Preferences/ConfigurationPages/CorbaPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/CorbaPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("CorbaPage")
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("DebuggerGeneralPage")
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPython3Page.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("DebuggerPython3Page")
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPythonPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("DebuggerPythonPage")
--- a/Preferences/ConfigurationPages/DebuggerRubyPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/DebuggerRubyPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("DebuggerRubyPage")
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorAPIsPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorAPIsPage")
--- a/Preferences/ConfigurationPages/EditorAutocompletionPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorAutocompletionPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorAutocompletionPage")
--- a/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorAutocompletionQScintillaPage")
--- a/Preferences/ConfigurationPages/EditorCalltipsPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorCalltipsPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorCalltipsPage")
--- a/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorCalltipsQScintillaPage")
--- a/Preferences/ConfigurationPages/EditorExportersPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorExportersPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorExportersPage")
--- a/Preferences/ConfigurationPages/EditorFilePage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorFilePage.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorFilePage")
--- a/Preferences/ConfigurationPages/EditorGeneralPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorGeneralPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorGeneralPage")
--- a/Preferences/ConfigurationPages/EditorHighlightersPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorHighlightersPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param lexers reference to the lexers dictionary """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorHighlightersPage")
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -38,7 +38,7 @@ @param lexers reference to the lexers dictionary """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorHighlightingStylesPage")
--- a/Preferences/ConfigurationPages/EditorKeywordsPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorKeywordsPage")
--- a/Preferences/ConfigurationPages/EditorPropertiesPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorPropertiesPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param lexers reference to the lexers dictionary """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorPropertiesPage")
--- a/Preferences/ConfigurationPages/EditorSearchPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorSearchPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorSearchPage")
--- a/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorSpellCheckingPage")
--- a/Preferences/ConfigurationPages/EditorStylesPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorStylesPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorStylesPage")
--- a/Preferences/ConfigurationPages/EditorTypingPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EditorTypingPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EditorTypingPage")
--- a/Preferences/ConfigurationPages/EmailPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/EmailPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("EmailPage")
--- a/Preferences/ConfigurationPages/GraphicsPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/GraphicsPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("GraphicsPage")
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("HelpAppearancePage")
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("HelpDocumentationPage")
--- a/Preferences/ConfigurationPages/HelpViewersPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/HelpViewersPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("HelpViewersPage")
--- a/Preferences/ConfigurationPages/HelpVirusTotalPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/HelpVirusTotalPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param parent reference to the parent widget (QWidget) """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("HelpVirusTotalPage")
--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param configDialog reference to the configuration dialog (ConfigurationDialog) """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("HelpWebBrowserPage")
--- a/Preferences/ConfigurationPages/IconsPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/IconsPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("IconsPage")
--- a/Preferences/ConfigurationPages/IconsPreviewDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/IconsPreviewDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param parent parent widget (QWidget) @param dirName name of directory to show (string) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) dir = QDir(dirName)
--- a/Preferences/ConfigurationPages/InterfacePage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/InterfacePage.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("InterfacePage")
--- a/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param oldPasswordHash hash of the current password (string) @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__oldPasswordHash = oldPasswordHash
--- a/Preferences/ConfigurationPages/MultiProjectPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/MultiProjectPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("MultiProjectPage")
--- a/Preferences/ConfigurationPages/NetworkPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/NetworkPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("NetworkPage")
--- a/Preferences/ConfigurationPages/PluginManagerPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/PluginManagerPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("PluginManagerPage")
--- a/Preferences/ConfigurationPages/PrinterPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/PrinterPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("PrinterPage")
--- a/Preferences/ConfigurationPages/ProjectBrowserPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/ProjectBrowserPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("ProjectBrowserPage")
--- a/Preferences/ConfigurationPages/ProjectPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/ProjectPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("ProjectPage")
--- a/Preferences/ConfigurationPages/Py3FlakesPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/Py3FlakesPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("Py3FlakesPage")
--- a/Preferences/ConfigurationPages/PythonPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/PythonPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("PythonPage")
--- a/Preferences/ConfigurationPages/QtPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/QtPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("QtPage")
--- a/Preferences/ConfigurationPages/ShellPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/ShellPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("ShellPage")
--- a/Preferences/ConfigurationPages/TasksPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/TasksPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("TasksPage")
--- a/Preferences/ConfigurationPages/TemplatesPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/TemplatesPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -21,7 +21,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("TemplatesPage")
--- a/Preferences/ConfigurationPages/TerminalPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/TerminalPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("TerminalPage")
--- a/Preferences/ConfigurationPages/TrayStarterPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/TrayStarterPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param parent reference to the parent widget (QWidget) """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("Py3FlakesPage")
--- a/Preferences/ConfigurationPages/VcsPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/VcsPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("VcsPage")
--- a/Preferences/ConfigurationPages/ViewmanagerPage.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ConfigurationPages/ViewmanagerPage.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ """ Constructor """ - ConfigurationPageBase.__init__(self) + super().__init__() self.setupUi(self) self.setObjectName("ViewmanagerPage")
--- a/Preferences/PreferencesLexer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/PreferencesLexer.py Sun Jun 19 19:36:27 2011 +0200 @@ -69,7 +69,7 @@ @param language The lexer language. (string) @param parent The parent widget of this lexer. (QextScintilla) """ - QsciLexer.__init__(self, parent) + super().__init__(parent) # instantiate a lexer object for the given language lex = QScintilla.Lexers.getLexer(language)
--- a/Preferences/ProgramsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ProgramsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param parent The parent widget of this dialog. (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.setObjectName("ProgramsDialog")
--- a/Preferences/ShortcutDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ShortcutDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param name The name of this dialog. (string) @param modal Flag indicating a modal dialog. (boolean) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setModal(modal)
--- a/Preferences/ShortcutsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ShortcutsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -42,7 +42,7 @@ @param name The name of this dialog. (string) @param modal Flag indicating a modal dialog. (boolean) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setModal(modal)
--- a/Preferences/ToolConfigurationDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ToolConfigurationDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param toollist list of configured tools @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.iconCompleter = E5FileCompleter(self.iconEdit)
--- a/Preferences/ToolGroupConfigurationDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ToolGroupConfigurationDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ @param currentGroup number of the active group (integer) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.currentGroup = currentGroup
--- a/Preferences/ViewProfileDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Preferences/ViewProfileDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ is a separate window (boolean) @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.__layout = layout if self.__layout == "Toolboxes":
--- a/Project/AddDirectoryDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/AddDirectoryDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param name name of this dialog (string) @param startdir start directory for the selection dialog """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setupUi(self)
--- a/Project/AddFileDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/AddFileDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param name name of this dialog (string) @param startdir start directory for the selection dialog """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setupUi(self)
--- a/Project/AddFoundFilesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/AddFoundFilesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param parent parent widget of this dialog (QWidget) @param name name of this dialog (string) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setupUi(self)
--- a/Project/AddLanguageDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/AddLanguageDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this dialog (QWidget) @param name name of this dialog (string) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setupUi(self)
--- a/Project/CreateDialogCodeDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/CreateDialogCodeDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -43,7 +43,7 @@ @param project reference to the project object @param parent parent widget if the dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Project/DebuggerPropertiesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/DebuggerPropertiesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param parent parent widget of this dialog (QWidget) @param name name of this dialog (string) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setupUi(self)
--- a/Project/FiletypeAssociationDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/FiletypeAssociationDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param project reference to the project object @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.filetypeAssociationList.headerItem().setText(
--- a/Project/LexerAssociationDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/LexerAssociationDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param project reference to the project object @param parent reference to the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.editorLexerList.headerItem().setText(self.editorLexerList.columnCount(), "")
--- a/Project/NewDialogClassDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/NewDialogClassDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param defaultPath default path for the new file (string) @param parent parent widget if the dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Project/NewPythonPackageDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/NewPythonPackageDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param relPath initial package path relative to the project root (string) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/Project/Project.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/Project.py Sun Jun 19 19:36:27 2011 +0200 @@ -190,7 +190,7 @@ @param parent parent widget (usually the ui object) (QWidget) @param filename optional filename of a project file to open (string) """ - QObject.__init__(self, parent) + super().__init__(parent) self.ui = parent
--- a/Project/ProjectBaseBrowser.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/ProjectBaseBrowser.py Sun Jun 19 19:36:27 2011 +0200 @@ -39,7 +39,7 @@ @param type project browser type (string) @param parent parent widget of this browser """ - QTreeView.__init__(self, parent) + super().__init__(parent) self.project = project
--- a/Project/ProjectBrowserModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/ProjectBrowserModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -222,7 +222,7 @@ @param parent reference to parent object (Project.Project) """ - QAbstractItemModel.__init__(self, parent) + super().__init__(parent) rootData = self.trUtf8("Name") self.rootItem = BrowserItem(None, rootData)
--- a/Project/PropertiesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/PropertiesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -38,7 +38,7 @@ @param parent parent widget of this dialog (QWidget) @param name name of this dialog (string) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setupUi(self)
--- a/Project/SpellingPropertiesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/SpellingPropertiesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -35,7 +35,7 @@ @param new flag indicating the generation of a new project @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.project = project
--- a/Project/TranslationPropertiesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/TranslationPropertiesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ @param new flag indicating the generation of a new project @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.project = project
--- a/Project/UserPropertiesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Project/UserPropertiesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param parent parent widget of this dialog (QWidget) @param name name of this dialog (string) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setupUi(self)
--- a/PyUnit/UnittestDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/PyUnit/UnittestDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -51,7 +51,7 @@ @param parent parent widget of this dialog (QWidget) @param name name of this dialog (string) """ - QWidget.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setupUi(self) @@ -580,7 +580,7 @@ @param prog filename of the program to open @param parent reference to the parent widget (QWidget) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.cw = UnittestDialog(prog=prog, parent=self) self.cw.installEventFilter(self) size = self.cw.size()
--- a/QScintilla/APIsManager.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/APIsManager.py Sun Jun 19 19:36:27 2011 +0200 @@ -38,7 +38,7 @@ for a preparation process (boolean) @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.setObjectName("APIs_{0}".format(language)) self.__inPreparation = False @@ -205,7 +205,7 @@ @param parent reference to the parent object (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.setObjectName("APIsManager") self.__apis = {}
--- a/QScintilla/Editor.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Editor.py Sun Jun 19 19:36:27 2011 +0200 @@ -140,7 +140,7 @@ @param editor reference to an Editor object, if this is a cloned view @param tv reference to the task viewer object """ - QsciScintillaCompat.__init__(self) + super().__init__() self.setAttribute(Qt.WA_DeleteOnClose) self.setAttribute(Qt.WA_KeyCompression) self.setUtf8(True) @@ -3755,7 +3755,7 @@ if self.__ctHookFunction is not None: self.__callTip() else: - QsciScintillaCompat.callTip(self) + super().callTip() def __callTip(self): """ @@ -3803,7 +3803,7 @@ if len(callTips) == 0: if Preferences.getEditor("CallTipsScintillaOnFail"): # try QScintilla calltips - QsciScintillaCompat.callTip(self) + super().callTip() return ctshift = 0 @@ -5025,7 +5025,7 @@ """ Public method to undo the last recorded change. """ - QsciScintillaCompat.undo(self) + super().undo() self.undoAvailable.emit(self.isUndoAvailable()) self.redoAvailable.emit(self.isRedoAvailable()) @@ -5033,7 +5033,7 @@ """ Public method to redo the last recorded change. """ - QsciScintillaCompat.redo(self) + super().redo() self.undoAvailable.emit(self.isUndoAvailable()) self.redoAvailable.emit(self.isRedoAvailable()) @@ -5074,7 +5074,7 @@ self.project.projectPropertiesChanged.disconnect( self.__projectPropertiesChanged) - QsciScintillaCompat.close(self) + super().close() def keyPressEvent(self, ev): """ @@ -5086,7 +5086,7 @@ # See it is text to insert. if len(txt) and txt >= " ": - QsciScintillaCompat.keyPressEvent(self, ev) + super().keyPressEvent(ev) else: ev.ignore() @@ -5141,7 +5141,7 @@ self.setCursorFlashTime(QApplication.cursorFlashTime()) - QsciScintillaCompat.focusInEvent(self, event) + super().focusInEvent(event) def focusOutEvent(self, event): """ @@ -5152,7 +5152,7 @@ self.vm.editorActGrp.setEnabled(False) self.setCaretWidth(0) - QsciScintillaCompat.focusOutEvent(self, event) + super().focusOutEvent(event) def changeEvent(self, evt): """ @@ -5177,7 +5177,7 @@ cap = self.trUtf8("{0} (ro)").format(cap) self.setWindowTitle(cap) - QsciScintillaCompat.changeEvent(self, evt) + super().changeEvent(evt) def mousePressEvent(self, event): """ @@ -5186,7 +5186,7 @@ @param event the mouse press event (QMouseEvent) """ self.vm.eventFilter(self, event) - QsciScintillaCompat.mousePressEvent(self, event) + super().mousePressEvent(event) def __updateReadOnly(self, bForce=True): """ @@ -5286,7 +5286,7 @@ if self.inDragDrop: event.acceptProposedAction() else: - QsciScintillaCompat.dragEnterEvent(self, event) + super().dragEnterEvent(event) def dragMoveEvent(self, event): """ @@ -5297,7 +5297,7 @@ if self.inDragDrop: event.accept() else: - QsciScintillaCompat.dragMoveEvent(self, event) + super().dragMoveEvent(event) def dragLeaveEvent(self, event): """ @@ -5309,7 +5309,7 @@ self.inDragDrop = False event.accept() else: - QsciScintillaCompat.dragLeaveEvent(self, event) + super().dragLeaveEvent(event) def dropEvent(self, event): """ @@ -5330,7 +5330,7 @@ .format(fname)) event.acceptProposedAction() else: - QsciScintillaCompat.dropEvent(self, event) + super().dropEvent(event) self.inDragDrop = False @@ -5556,7 +5556,7 @@ for t in templateNames]) return - QsciScintillaCompat.editorCommand(self, cmd) + super().editorCommand(cmd) def __completionListSelected(self, id, txt): """
--- a/QScintilla/Exporters/ExporterBase.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Exporters/ExporterBase.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param editor reference to the editor object (QScintilla.Editor.Editor) @param parent parent object of the exporter (QObject) """ - QObject.__init__(self, parent) + super().__init__(parent) self.editor = editor def _getFileName(self, filter):
--- a/QScintilla/GotoDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/GotoDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param name name of this dialog (string) @param modal flag indicating a modal dialog (boolean) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setupUi(self)
--- a/QScintilla/Lexers/LexerBash.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerBash.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerBash.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "#"
--- a/QScintilla/Lexers/LexerBatch.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerBatch.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param parent parent widget of this lexer """ - QsciLexerBatch.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "REM "
--- a/QScintilla/Lexers/LexerCMake.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerCMake.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerCMake.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "#"
--- a/QScintilla/Lexers/LexerCPP.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerCPP.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerCPP.__init__(self, parent, caseInsensitiveKeywords) + super().__init__(parent, caseInsensitiveKeywords) Lexer.__init__(self) self.commentString = "//"
--- a/QScintilla/Lexers/LexerCSS.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerCSS.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerCSS.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "#"
--- a/QScintilla/Lexers/LexerCSharp.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerCSharp.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerCSharp.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "//"
--- a/QScintilla/Lexers/LexerContainer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerContainer.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param parent parent widget of this lexer """ - QsciLexer.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.editor = parent
--- a/QScintilla/Lexers/LexerD.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerD.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerD.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "//"
--- a/QScintilla/Lexers/LexerDiff.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerDiff.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param parent parent widget of this lexer """ - QsciLexerDiff.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) def isCommentStyle(self, style):
--- a/QScintilla/Lexers/LexerFortran.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerFortran.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerFortran.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "!"
--- a/QScintilla/Lexers/LexerFortran77.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerFortran77.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerFortran77.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "c"
--- a/QScintilla/Lexers/LexerHTML.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerHTML.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerHTML.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.streamCommentString = {
--- a/QScintilla/Lexers/LexerIDL.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerIDL.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerIDL.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "//"
--- a/QScintilla/Lexers/LexerJava.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerJava.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerJava.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "//"
--- a/QScintilla/Lexers/LexerJavaScript.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerJavaScript.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerJavaScript.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "//"
--- a/QScintilla/Lexers/LexerLua.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerLua.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerLua.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "--"
--- a/QScintilla/Lexers/LexerMakefile.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerMakefile.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param parent parent widget of this lexer """ - QsciLexerMakefile.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "#"
--- a/QScintilla/Lexers/LexerMatlab.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerMatlab.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param parent parent widget of this lexer """ - QsciLexerMatlab.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "%~"
--- a/QScintilla/Lexers/LexerOctave.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerOctave.py Sun Jun 19 19:36:27 2011 +0200 @@ -22,7 +22,7 @@ @param parent parent widget of this lexer """ - QsciLexerOctave.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "#"
--- a/QScintilla/Lexers/LexerPOV.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerPOV.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerPOV.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "//"
--- a/QScintilla/Lexers/LexerPascal.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerPascal.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerPascal.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "//"
--- a/QScintilla/Lexers/LexerPerl.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerPerl.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerPerl.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "#"
--- a/QScintilla/Lexers/LexerPostScript.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerPostScript.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerPostScript.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "%"
--- a/QScintilla/Lexers/LexerProperties.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerProperties.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerProperties.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "#"
--- a/QScintilla/Lexers/LexerPython.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerPython.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param variant name of the language variant (string) @param parent parent widget of this lexer """ - QsciLexerPython.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.variant = variant
--- a/QScintilla/Lexers/LexerRuby.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerRuby.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerRuby.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "#"
--- a/QScintilla/Lexers/LexerSQL.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerSQL.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerSQL.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "--"
--- a/QScintilla/Lexers/LexerTCL.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerTCL.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param parent parent widget of this lexer """ - QsciLexerTCL.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "#"
--- a/QScintilla/Lexers/LexerTeX.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerTeX.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerTeX.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "%"
--- a/QScintilla/Lexers/LexerVHDL.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerVHDL.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerVHDL.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "--"
--- a/QScintilla/Lexers/LexerXML.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerXML.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerXML.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.streamCommentString = {
--- a/QScintilla/Lexers/LexerYAML.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Lexers/LexerYAML.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent parent widget of this lexer """ - QsciLexerYAML.__init__(self, parent) + super().__init__(parent) Lexer.__init__(self) self.commentString = "---"
--- a/QScintilla/MiniEditor.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/MiniEditor.py Sun Jun 19 19:36:27 2011 +0200 @@ -45,7 +45,7 @@ @param name name of this instance (string) @param flags window flags """ - QsciScintillaCompat.__init__(self, parent) + super().__init__(parent) self.mw = parent @@ -75,7 +75,7 @@ self.setCursorFlashTime(QApplication.cursorFlashTime()) - QsciScintillaCompat.focusInEvent(self, event) + super().focusInEvent(event) def focusOutEvent(self, event): """ @@ -86,7 +86,7 @@ self.mw.editorActGrp.setEnabled(False) self.setCaretWidth(0) - QsciScintillaCompat.focusOutEvent(self, event) + super().focusOutEvent(event) class MiniEditor(QMainWindow): @@ -106,7 +106,7 @@ @param parent reference to the parent widget (QWidget) @param name object name of the window (string) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) if name is not None: self.setObjectName(name) self.setAttribute(Qt.WA_DeleteOnClose)
--- a/QScintilla/Printer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Printer.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param mode mode of the printer (QPrinter.PrinterMode) """ - QsciPrinter.__init__(self, mode) + super().__init__(mode) self.setMagnification(Preferences.getPrinter("Magnification")) if Preferences.getPrinter("ColorMode"):
--- a/QScintilla/QsciScintillaCompat.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/QsciScintillaCompat.py Sun Jun 19 19:36:27 2011 +0200 @@ -53,7 +53,7 @@ @param name name of this instance (string) @param flags window flags """ - QsciScintilla.__init__(self, parent) + super().__init__(parent) self.zoom = 0 @@ -69,7 +69,7 @@ @param lex the lexer to be set or None to reset it. """ - QsciScintilla.setLexer(self, lex) + super().setLexer(lex) if lex is None: self.clearStyles() @@ -306,7 +306,7 @@ @param zoom zoom factor increment """ self.zoom += zoom - QsciScintilla.zoomIn(self, zoom) + super().zoomIn(zoom) def zoomOut(self, zoom=1): """ @@ -315,7 +315,7 @@ @param zoom zoom factor decrement """ self.zoom -= zoom - QsciScintilla.zoomOut(self, zoom) + super().zoomOut(zoom) def zoomTo(self, zoom): """ @@ -324,7 +324,7 @@ @param zoom zoom factor """ self.zoom = zoom - QsciScintilla.zoomTo(self, zoom) + super().zoomTo(zoom) def getZoom(self): """ @@ -878,10 +878,10 @@ @param margin margin number (integer) """ if style < self.ArrowFoldStyle: - QsciScintilla.setFolding(self, style, margin) + super().setFolding(style, margin) else: - QsciScintilla.setFolding( - self, QsciScintilla.PlainFoldStyle, margin) + super().setFolding( + QsciScintilla.PlainFoldStyle, margin) if style == self.ArrowFoldStyle: self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDER, @@ -984,7 +984,7 @@ if self.isListActive(): self.cancelList() - QsciScintilla.focusOutEvent(self, event) + super().focusOutEvent(event) ########################################################################### # interface methods to the mini editor
--- a/QScintilla/SearchReplaceWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/SearchReplaceWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -39,7 +39,7 @@ @param vm reference to the viewmanager object @param parent parent widget of this widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.viewmanager = vm self.replace = replace @@ -611,7 +611,7 @@ self.__showReplace(text) else: self.__showFind(text) - QWidget.show(self) + super().show() self.activateWindow() @pyqtSlot()
--- a/QScintilla/Shell.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Shell.py Sun Jun 19 19:36:27 2011 +0200 @@ -44,7 +44,7 @@ @param vm reference to the viewmanager object @param parent parent widget (QWidget) """ - QsciScintillaCompat.__init__(self, parent) + super().__init__(parent) self.setUtf8(True) self.vm = vm @@ -534,7 +534,7 @@ @param platform platform of the remote interpreter (string) @param dbgclient debug client variant used (string) """ - QsciScintillaCompat.clear(self) + super().clear() if self.passive and not self.dbs.isConnected(): self.__write(self.trUtf8('Passive Debug Mode')) self.__write(self.trUtf8('\nNot connected')) @@ -722,7 +722,7 @@ if event.button() == Qt.MidButton: self.__middleMouseButton() else: - QsciScintillaCompat.mousePressEvent(self, event) + super().mousePressEvent(event) def editorCommand(self, cmd): """ @@ -760,7 +760,7 @@ self.prline, self.prcol = self.getCursorPosition() if self.echoInput: ac = self.isListActive() - QsciScintillaCompat.keyPressEvent(self, ev) + super().keyPressEvent(ev) self.incrementalSearchActive = True if ac and \ self.racEnabled: @@ -1334,7 +1334,7 @@ if self.inDragDrop: event.acceptProposedAction() else: - QsciScintillaCompat.dragEnterEvent(self, event) + super().dragEnterEvent(event) def dragMoveEvent(self, event): """ @@ -1345,7 +1345,7 @@ if self.inDragDrop: event.accept() else: - QsciScintillaCompat.dragMoveEvent(self, event) + super().dragMoveEvent(event) def dragLeaveEvent(self, event): """ @@ -1357,7 +1357,7 @@ self.inDragDrop = False event.accept() else: - QsciScintillaCompat.dragLeaveEvent(self, event) + super().dragLeaveEvent(event) def dropEvent(self, event): """ @@ -1384,7 +1384,7 @@ self.executeLines(s) del s else: - QsciScintillaCompat.dropEvent(self, event) + super().dropEvent(event) self.inDragDrop = False @@ -1410,7 +1410,7 @@ self.setCaretWidth(self.caretWidth) self.setCursorFlashTime(QApplication.cursorFlashTime()) - QsciScintillaCompat.focusInEvent(self, event) + super().focusInEvent(event) def focusOutEvent(self, event): """ @@ -1423,7 +1423,7 @@ except AttributeError: pass self.setCaretWidth(0) - QsciScintillaCompat.focusOutEvent(self, event) + super().focusOutEvent(event) def insert(self, txt): """
--- a/QScintilla/ShellHistoryDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/ShellHistoryDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param vm reference to the viewmanager object @param shell reference to the shell object """ - QDialog.__init__(self, shell) + super().__init__(shell) self.setupUi(self) self.historyList.addItems(history)
--- a/QScintilla/SpellChecker.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/SpellChecker.py Sun Jun 19 19:36:27 2011 +0200 @@ -40,7 +40,7 @@ The string should be in language locale format (e.g. en_US, de). @keyparam checkRegion reference to a function to check for a valid region """ - QObject.__init__(self, editor) + super().__init__(editor) self.editor = editor self.indicator = indicator
--- a/QScintilla/SpellCheckingDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/SpellCheckingDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ """ Constructor """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__spell = spellChecker
--- a/QScintilla/Terminal.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/Terminal.py Sun Jun 19 19:36:27 2011 +0200 @@ -41,7 +41,7 @@ @param vm reference to the viewmanager object @param parent parent widget (QWidget) """ - QsciScintillaCompat.__init__(self, parent) + super().__init__(parent) self.setUtf8(True) self.vm = vm @@ -199,7 +199,7 @@ """ Private method called, when the shell process has finished. """ - QsciScintilla.clear(self) + super().clear() self.__startAct.setEnabled(True) self.__stopAct.setEnabled(False) @@ -481,7 +481,7 @@ @param event the mouse press event (QMouseEvent) """ self.setFocus() - QsciScintillaCompat.mousePressEvent(self, event) + super().mousePressEvent(event) def editorCommand(self, cmd): """ @@ -517,7 +517,7 @@ line, col = self.__getEndPos() self.setCursorPosition(line, col) self.prline, self.prcol = self.getCursorPosition() - QsciScintillaCompat.keyPressEvent(self, ev) + super().keyPressEvent(ev) self.incrementalSearchActive = True else: ev.ignore() @@ -830,7 +830,7 @@ """ Public slot to clear the display. """ - QsciScintillaCompat.clear(self) + super().clear() self.__send("\n") def __reset(self): @@ -907,7 +907,7 @@ self.setCaretWidth(self.caretWidth) self.setCursorFlashTime(QApplication.cursorFlashTime()) - QsciScintillaCompat.focusInEvent(self, event) + super().focusInEvent(event) def focusOutEvent(self, event): """ @@ -920,7 +920,7 @@ except AttributeError: pass self.setCaretWidth(0) - QsciScintillaCompat.focusOutEvent(self, event) + super().focusOutEvent(event) def insert(self, txt): """
--- a/QScintilla/TypingCompleters/CompleterBase.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/TypingCompleters/CompleterBase.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ if parent is None: parent = editor - QObject.__init__(self, parent) + super().__init__(parent) self.editor = editor self.enabled = False
--- a/QScintilla/ZoomDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/QScintilla/ZoomDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param parent parent widget of this dialog (QWidget) @param name name of this dialog (string) """ - QDialog.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setupUi(self)
--- a/SqlBrowser/SqlBrowser.py Sun Jun 19 17:50:39 2011 +0200 +++ b/SqlBrowser/SqlBrowser.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param connections list of database connections to add (list of strings) @param reference to the parent widget (QWidget) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.setObjectName("SqlBrowser") self.setWindowTitle(self.trUtf8("SQL Browser"))
--- a/SqlBrowser/SqlBrowserWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/SqlBrowser/SqlBrowserWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -33,7 +33,7 @@ @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.table.addAction(self.insertRowAction)
--- a/SqlBrowser/SqlConnectionDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/SqlBrowser/SqlConnectionDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ """ Constructor """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.databaseFileCompleter = E5FileCompleter()
--- a/SqlBrowser/SqlConnectionWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/SqlBrowser/SqlConnectionWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -31,7 +31,7 @@ @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) layout = QVBoxLayout(self) layout.setMargin(0)
--- a/Tasks/TaskFilterConfigDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Tasks/TaskFilterConfigDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param taskFilter the task filter object to be configured @param parent the parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) if taskFilter.descriptionFilter is None or \
--- a/Tasks/TaskPropertiesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Tasks/TaskPropertiesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -28,7 +28,7 @@ @param parent the parent widget (QWidget) @param projectOpen flag indicating status of the project (boolean) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.filenameCompleter = E5FileCompleter(self.filenameEdit)
--- a/Tasks/TaskViewer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Tasks/TaskViewer.py Sun Jun 19 19:36:27 2011 +0200 @@ -71,7 +71,7 @@ if isProjectTask: self.filename = self.project.getRelativePath(self.filename) - QTreeWidgetItem.__init__(self, ["", "", self.description, self.filename, + super().__init__(["", "", self.description, self.filename, (self.lineno and "{0:6d}".format(self.lineno) or "")]) if self.completed: @@ -358,7 +358,7 @@ @param parent the parent (QWidget) @param project reference to the project object """ - QTreeWidget.__init__(self, parent) + super().__init__(parent) self.setRootIsDecorated(False) self.setItemsExpandable(False)
--- a/Templates/TemplateMultipleVariablesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Templates/TemplateMultipleVariablesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param variables list of template variable names (list of strings) @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.TemplateMultipleVariablesDialogLayout = QVBoxLayout(self) self.TemplateMultipleVariablesDialogLayout.setMargin(6)
--- a/Templates/TemplatePropertiesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Templates/TemplatePropertiesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param itm item (TemplateEntry or TemplateGroup) to read the data from """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) if not groupMode:
--- a/Templates/TemplateSingleVariableDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Templates/TemplateSingleVariableDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param variable template variable name (string) @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.variableLabel.setText(variable)
--- a/Templates/TemplateViewer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Templates/TemplateViewer.py Sun Jun 19 19:36:27 2011 +0200 @@ -46,7 +46,7 @@ self.language = language self.entries = {} - QTreeWidgetItem.__init__(self, parent, [name]) + super().__init__(parent, [name]) if Preferences.getTemplates("ShowTooltip"): self.setToolTip(0, language) @@ -196,7 +196,7 @@ self.template = templateText self.__extractVariables() - QTreeWidgetItem.__init__(self, parent, [self.__displayText()]) + super().__init__(parent, [self.__displayText()]) if Preferences.getTemplates("ShowTooltip"): self.setToolTip(0, self.template) @@ -377,7 +377,7 @@ @param parent the parent (QWidget) @param viewmanager reference to the viewmanager object """ - QTreeWidget.__init__(self, parent) + super().__init__(parent) self.viewmanager = viewmanager self.groups = {}
--- a/Tools/TRPreviewer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Tools/TRPreviewer.py Sun Jun 19 19:36:27 2011 +0200 @@ -42,7 +42,7 @@ self.mainWidget = None self.currentFile = QDir.currentPath() - QMainWindow.__init__(self, parent) + super().__init__(parent) if not name: self.setObjectName("TRPreviewer") else: @@ -116,7 +116,7 @@ the main window has been shown. This way, previewing a dialog doesn't interfere with showing the main window. """ - QMainWindow.show(self) + super().show() if self.filesToLoad: filenames, self.filesToLoad = (self.filesToLoad[:], []) first = True @@ -425,7 +425,7 @@ available languages (QComboBox) @param parent parent widget (QWidget) """ - QObject.__init__(self, parent) + super().__init__(parent) self.selector = selector self.currentTranslator = None @@ -643,7 +643,7 @@ @param parent parent widget (QWidget) @param name name of this widget (string) """ - QWidget.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.setWindowTitle(name) @@ -726,7 +726,7 @@ @param parent parent widget (QWidget) """ - QMdiArea.__init__(self, parent) + super().__init__(parent) self.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded) self.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
--- a/Tools/TrayStarter.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Tools/TrayStarter.py Sun Jun 19 19:36:27 2011 +0200 @@ -32,7 +32,7 @@ """ Constructor """ - QSystemTrayIcon.__init__(self, + super().__init__( UI.PixmapCache.getIcon(Preferences.getTrayStarter("TrayStarterIcon"))) self.maxMenuFilePathLen = 75
--- a/Tools/UIPreviewer.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Tools/UIPreviewer.py Sun Jun 19 19:36:27 2011 +0200 @@ -36,7 +36,7 @@ self.mainWidget = None self.currentFile = QDir.currentPath() - QMainWindow.__init__(self, parent) + super().__init__(parent) if not name: self.setObjectName("UIPreviewer") else: @@ -107,7 +107,7 @@ the main window has been shown. This way, previewing a dialog doesn't interfere with showing the main window. """ - QMainWindow.show(self) + super().show() if self.fileToLoad is not None: fn, self.fileToLoad = (self.fileToLoad, None) self.__loadFile(fn)
--- a/UI/AuthenticationDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/AuthenticationDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param showSave flag to indicate to show the save checkbox (boolean) @param saveIt flag indicating the value for the save checkbox (boolean) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.infoLabel.setText(info)
--- a/UI/Browser.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/Browser.py Sun Jun 19 19:36:27 2011 +0200 @@ -64,7 +64,7 @@ @param parent parent widget (QWidget) """ - QTreeView.__init__(self, parent) + super().__init__(parent) self.setWindowTitle(QApplication.translate('Browser', 'File-Browser')) self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
--- a/UI/BrowserModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/BrowserModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -42,7 +42,7 @@ @param parent reference to parent object (QObject) """ - QAbstractItemModel.__init__(self, parent) + super().__init__(parent) rootData = QApplication.translate("BrowserModel", "Name") self.rootItem = BrowserItem(None, rootData)
--- a/UI/BrowserSortFilterProxyModel.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/BrowserSortFilterProxyModel.py Sun Jun 19 19:36:27 2011 +0200 @@ -23,7 +23,7 @@ @param parent reference to the parent object (QObject) """ - QSortFilterProxyModel.__init__(self, parent) + super().__init__(parent) self.hideNonPublic = Preferences.getUI("BrowsersHideNonPublic") def sort(self, column, order): @@ -35,7 +35,7 @@ """ self.__sortColumn = column self.__sortOrder = order - QSortFilterProxyModel.sort(self, column, order) + super().sort(column, order) def lessThan(self, left, right): """
--- a/UI/CompareDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/CompareDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -86,7 +86,7 @@ (list of two tuples of two strings) @param parent parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.file1Completer = E5FileCompleter(self.file1Edit) @@ -168,7 +168,7 @@ """ if filename: self.file1Edit.setText(filename) - QWidget.show(self) + super().show() def __appendText(self, pane, linenumber, line, format, interLine=False): """ @@ -435,7 +435,7 @@ (list of two tuples of two strings) @param parent reference to the parent widget (QWidget) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.cw = CompareDialog(files, self) self.cw.installEventFilter(self) size = self.cw.size()
--- a/UI/DeleteFilesConfirmationDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/DeleteFilesConfirmationDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param cancelLabel label for the Cancel button (string) @param files list of filenames to be shown (list of strings) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.setModal(True)
--- a/UI/DiffDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/DiffDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -199,7 +199,7 @@ """ Constructor """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.file1Completer = E5FileCompleter(self.file1Edit) @@ -248,7 +248,7 @@ """ if filename: self.file1Edit.setText(filename) - QWidget.show(self) + super().show() def on_buttonBox_clicked(self, button): """ @@ -497,7 +497,7 @@ @param parent reference to the parent widget (QWidget) """ - QMainWindow.__init__(self, parent) + super().__init__(parent) self.cw = DiffDialog(self) self.cw.installEventFilter(self) size = self.cw.size()
--- a/UI/EmailDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/EmailDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -67,7 +67,7 @@ @param mode mode of this dialog (string, "bug" or "feature") @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.__mode = mode
--- a/UI/FindFileDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/FindFileDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -51,7 +51,7 @@ @param project reference to the project object @param parent parent widget of this dialog (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.setWindowFlags(Qt.WindowFlags(Qt.Window)) @@ -181,7 +181,7 @@ self.findList.clear() self.replacetextCombo.setEditText("") - QDialog.show(self) + super().show() def on_findtextCombo_editTextChanged(self, text): """
--- a/UI/FindFileNameDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/FindFileNameDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -43,7 +43,7 @@ @param project reference to the project object @param parent parent widget of this dialog (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.searchDirCompleter = E5DirCompleter(self.searchDirEdit) @@ -247,4 +247,4 @@ self.fileNameEdit.selectAll() self.fileNameEdit.setFocus() - QWidget.show(self) + super().show()
--- a/UI/LogView.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/LogView.py Sun Jun 19 19:36:27 2011 +0200 @@ -26,7 +26,7 @@ @param parent reference to the parent widget (QWidget) """ - QTextEdit.__init__(self, parent) + super().__init__(parent) self.setAcceptRichText(False) self.setLineWrapMode(QTextEdit.NoWrap) self.setReadOnly(True)
--- a/UI/NumbersWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/NumbersWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ @param parent reference to the parent widget (QWidget) """ - QAbstractTableModel.__init__(self, parent) + super().__init__(parent) self.__bits = 0 self.__value = 0 @@ -162,7 +162,7 @@ @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
--- a/UI/SplashScreen.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/SplashScreen.py Sun Jun 19 19:36:27 2011 +0200 @@ -27,7 +27,7 @@ ericPic = QPixmap(os.path.join(getConfig('ericPixDir'), 'ericSplash.png')) self.labelAlignment = \ Qt.Alignment(Qt.AlignBottom | Qt.AlignRight | Qt.AlignAbsolute) - QSplashScreen.__init__(self, ericPic) + super().__init__(ericPic) self.show() QApplication.flush() @@ -38,14 +38,14 @@ @param msg message to be shown (string) """ logging.debug(msg) - QSplashScreen.showMessage(self, msg, self.labelAlignment, QColor(Qt.white)) + super().showMessage(msg, self.labelAlignment, QColor(Qt.white)) QApplication.processEvents() def clearMessage(self): """ Public method to clear the message shown. """ - QSplashScreen.clearMessage(self) + super().clearMessage() QApplication.processEvents()
--- a/UI/SymbolsWidget.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/SymbolsWidget.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param parent reference to the parent object (QObject) """ - QAbstractTableModel.__init__(self, parent) + super().__init__(parent) self.__headerData = [ self.trUtf8("Code"), @@ -330,7 +330,7 @@ @param parent reference to the parent widget (QWidget) """ - QWidget.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
--- a/UI/UserInterface.py Sun Jun 19 17:50:39 2011 +0200 +++ b/UI/UserInterface.py Sun Jun 19 19:36:27 2011 +0200 @@ -128,7 +128,7 @@ @param stderr flag indicating stderr is being redirected """ - QObject.__init__(self) + super().__init__() self.stderr = stderr self.buffer = '' @@ -207,7 +207,7 @@ @param restartArguments list of command line parameters to be used for a restart (list of strings) """ - QMainWindow.__init__(self) + super().__init__() self.setAttribute(Qt.WA_DeleteOnClose) self.__restartArgs = restartArguments[:]
--- a/Utilities/AutoSaver.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Utilities/AutoSaver.py Sun Jun 19 19:36:27 2011 +0200 @@ -24,7 +24,7 @@ @param parent reference to the parent object (QObject) @param save slot to be called to perform the save operation """ - QObject.__init__(self, parent) + super().__init__(parent) if parent is None: raise RuntimeError("AutoSaver: parent must not be None.") @@ -55,7 +55,7 @@ if evt.timerId() == self.__timer.timerId(): self.saveIfNeccessary() else: - QObject.timerEvent(self, evt) + super().timerEvent(evt) def saveIfNeccessary(self): """
--- a/Utilities/SingleApplication.py Sun Jun 19 17:50:39 2011 +0200 +++ b/Utilities/SingleApplication.py Sun Jun 19 19:36:27 2011 +0200 @@ -20,7 +20,7 @@ @param name name this server is listening to (string) """ - QLocalServer.__init__(self) + super().__init__() res = self.listen(name) if not res:
--- a/VCS/CommandOptionsDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/VCS/CommandOptionsDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -25,7 +25,7 @@ @param vcs reference to the vcs object @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) if Utilities.isWindowsPlatform():
--- a/VCS/ProjectBrowserHelper.py Sun Jun 19 17:50:39 2011 +0200 +++ b/VCS/ProjectBrowserHelper.py Sun Jun 19 19:36:27 2011 +0200 @@ -41,7 +41,7 @@ @param parent parent widget (QWidget) @param name name of this object (string) """ - QObject.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name)
--- a/VCS/ProjectHelper.py Sun Jun 19 17:50:39 2011 +0200 +++ b/VCS/ProjectHelper.py Sun Jun 19 19:36:27 2011 +0200 @@ -37,7 +37,7 @@ @param parent parent widget (QWidget) @param name name of this object (string) """ - QObject.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name)
--- a/VCS/RepositoryInfoDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/VCS/RepositoryInfoDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -17,6 +17,6 @@ Class implemting a dialog to show repository information. """ def __init__(self, parent, info): - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.infoBrowser.setHtml(info)
--- a/VCS/StatusMonitorThread.py Sun Jun 19 17:50:39 2011 +0200 +++ b/VCS/StatusMonitorThread.py Sun Jun 19 19:36:27 2011 +0200 @@ -30,7 +30,7 @@ @param vcs reference to the version control object @param parent reference to the parent object (QObject) """ - QThread.__init__(self, parent) + super().__init__(parent) self.setObjectName("VcsStatusMonitorThread") self.setTerminationEnabled(True)
--- a/VCS/VersionControl.py Sun Jun 19 17:50:39 2011 +0200 +++ b/VCS/VersionControl.py Sun Jun 19 19:36:27 2011 +0200 @@ -44,7 +44,7 @@ @param parent parent widget (QWidget) @param name name of this object (string) """ - QObject.__init__(self, parent) + super().__init__(parent) if name: self.setObjectName(name) self.defaultOptions = {
--- a/ViewManager/BookmarkedFilesDialog.py Sun Jun 19 17:50:39 2011 +0200 +++ b/ViewManager/BookmarkedFilesDialog.py Sun Jun 19 19:36:27 2011 +0200 @@ -29,7 +29,7 @@ @param bookmarks list of bookmarked files (list of strings) @param parent parent widget (QWidget) """ - QDialog.__init__(self, parent) + super().__init__(parent) self.setupUi(self) self.fileCompleter = E5FileCompleter(self.fileEdit)
--- a/ViewManager/ViewManager.py Sun Jun 19 17:50:39 2011 +0200 +++ b/ViewManager/ViewManager.py Sun Jun 19 19:36:27 2011 +0200 @@ -81,7 +81,7 @@ if evt.key() == Qt.Key_Escape: self.escPressed.emit() else: - QLineEdit.keyPressEvent(self, evt) # pass it on + super().keyPressEvent(evt) # pass it on def focusInEvent(self, evt): """ @@ -90,7 +90,7 @@ @param evt focus event (QFocusEvent) """ self.gotFocus.emit() - QLineEdit.focusInEvent(self, evt) # pass it on + super().focusInEvent(evt) # pass it on class ViewManager(QObject): @@ -132,7 +132,7 @@ @param ui reference to the main user interface @param dbs reference to the debug server object """ - QObject.__init__(self) + super().__init__() # initialize the instance variables self.editors = []