From 59be78f20a20746eb5a23a973d1f5a671f08f7c6 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 18 Jul 2013 16:28:03 +0200 Subject: [PATCH] changed constructors --- openlp/plugins/presentations/lib/pptviewlib/ppttest.py | 2 +- openlp/plugins/songs/forms/editverseform.py | 2 +- openlp/plugins/songs/forms/mediafilesform.py | 2 +- openlp/plugins/songs/forms/songexportform.py | 2 +- openlp/plugins/songs/forms/songreviewwidget.py | 2 +- openlp/plugins/songs/lib/xml.py | 2 +- openlp/plugins/songusage/forms/songusagedeleteform.py | 2 +- openlp/plugins/songusage/forms/songusagedetailform.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py index f07468bb8..198bf0593 100644 --- a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py +++ b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py @@ -37,7 +37,7 @@ class PPTViewer(QtGui.QWidget): Standalone Test Harness for the pptviewlib library """ def __init__(self, parent=None): - QtGui.QWidget.__init__(self, parent) + super(PPTViewer, self).__init__(parent) self.pptid = -1 self.setWindowTitle(u'PowerPoint Viewer Test') diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index b3a5a332d..319c2ddd8 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -48,7 +48,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): """ Constructor """ - QtGui.QDialog.__init__(self, parent) + super(EditVerseForm, self).__init__(parent) self.setupUi(self) self.verse_text_edit.customContextMenuRequested.connect(self.context_menu) self.insert_button.clicked.connect(self.on_insert_button_clicked) diff --git a/openlp/plugins/songs/forms/mediafilesform.py b/openlp/plugins/songs/forms/mediafilesform.py index 6010f7606..de6ce26fc 100644 --- a/openlp/plugins/songs/forms/mediafilesform.py +++ b/openlp/plugins/songs/forms/mediafilesform.py @@ -44,7 +44,7 @@ class MediaFilesForm(QtGui.QDialog, Ui_MediaFilesDialog): log.info(u'%s MediaFilesForm loaded', __name__) def __init__(self, parent): - QtGui.QDialog.__init__(self) + super(MediaFilesForm, self).__init__() self.setupUi(self) def populateFiles(self, files): diff --git a/openlp/plugins/songs/forms/songexportform.py b/openlp/plugins/songs/forms/songexportform.py index 36ed50cee..41e0b86f9 100644 --- a/openlp/plugins/songs/forms/songexportform.py +++ b/openlp/plugins/songs/forms/songexportform.py @@ -60,7 +60,7 @@ class SongExportForm(OpenLPWizard): ``plugin`` The songs plugin. """ - OpenLPWizard.__init__(self, parent, plugin, u'song_export_wizard', u':/wizards/wizard_exportsong.bmp') + super(SongExportForm, self).__init__(parent, plugin, u'song_export_wizard', u':/wizards/wizard_exportsong.bmp') self.stop_export_flag = False Registry().register_function(u'openlp_stop_wizard', self.stop_export) diff --git a/openlp/plugins/songs/forms/songreviewwidget.py b/openlp/plugins/songs/forms/songreviewwidget.py index 7b24563f9..6314721b2 100644 --- a/openlp/plugins/songs/forms/songreviewwidget.py +++ b/openlp/plugins/songs/forms/songreviewwidget.py @@ -64,7 +64,7 @@ class SongReviewWidget(QtGui.QWidget): ``song`` The Song which this SongReviewWidget should represent. """ - QtGui.QWidget.__init__(self, parent) + super(SongReviewWidget, self).__init__(parent) self.song = song self.setupUi() self.retranslateUi() diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py index 454ae209a..6715b6407 100644 --- a/openlp/plugins/songs/lib/xml.py +++ b/openlp/plugins/songs/lib/xml.py @@ -820,7 +820,7 @@ class OpenLyricsError(Exception): VerseError = 2 def __init__(self, type, log_message, display_message): - Exception.__init__(self) + super(OpenLyricsError, self).__init__() self.type = type self.log_message = log_message self.display_message = display_message diff --git a/openlp/plugins/songusage/forms/songusagedeleteform.py b/openlp/plugins/songusage/forms/songusagedeleteform.py index 8ae2fa020..e17e33e18 100644 --- a/openlp/plugins/songusage/forms/songusagedeleteform.py +++ b/openlp/plugins/songusage/forms/songusagedeleteform.py @@ -43,7 +43,7 @@ class SongUsageDeleteForm(QtGui.QDialog, Ui_SongUsageDeleteDialog): Constructor """ self.manager = manager - QtGui.QDialog.__init__(self, parent) + super(SongUsageDeleteForm, self).__init__(parent) self.setupUi(self) self.button_box.clicked.connect(self.on_button_box_clicked) diff --git a/openlp/plugins/songusage/forms/songusagedetailform.py b/openlp/plugins/songusage/forms/songusagedetailform.py index edb007421..83a86c61a 100644 --- a/openlp/plugins/songusage/forms/songusagedetailform.py +++ b/openlp/plugins/songusage/forms/songusagedetailform.py @@ -50,7 +50,7 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog): """ Initialise the form """ - QtGui.QDialog.__init__(self, parent) + super(SongUsageDetailForm, self).__init__(parent) self.plugin = plugin self.setupUi(self)