From 07ab1cf2173a265480d592a158df3207a9828570 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 1 Aug 2013 17:11:03 +0200 Subject: [PATCH] changes calls to super calls --- openlp/plugins/presentations/presentationplugin.py | 4 ++-- openlp/plugins/remotes/remoteplugin.py | 4 ++-- openlp/plugins/songs/songsplugin.py | 4 ++-- openlp/plugins/songusage/songusageplugin.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index cc1516b69..23a432998 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -82,7 +82,7 @@ class PresentationPlugin(Plugin): Initialise the plugin. Determine which controllers are enabled are start their processes. """ log.info(u'Presentations Initialising') - Plugin.initialise(self) + super(PresentationPlugin, self).initialise() for controller in self.controllers: if self.controllers[controller].enabled(): try: @@ -103,7 +103,7 @@ class PresentationPlugin(Plugin): controller = self.controllers[key] if controller.enabled(): controller.kill() - Plugin.finalise(self) + super(PresentationPlugin, self).finalise() def create_media_manager_item(self): """ diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py index 11feee4df..434428d58 100644 --- a/openlp/plugins/remotes/remoteplugin.py +++ b/openlp/plugins/remotes/remoteplugin.py @@ -66,7 +66,7 @@ class RemotesPlugin(Plugin): Initialise the remotes plugin, and start the http server """ log.debug(u'initialise') - Plugin.initialise(self) + super(RemotePlugin, self).initialise() self.server = HttpServer() self.server.start_server() @@ -75,7 +75,7 @@ class RemotesPlugin(Plugin): Tidy up and close down the http server """ log.debug(u'finalise') - Plugin.finalise(self) + super(RemotePlugin, self).finalise() if self.server: self.server.close() self.server = None diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 0e1cb69df..bc16fafc8 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -94,7 +94,7 @@ class SongsPlugin(Plugin): def initialise(self): log.info(u'Songs Initialising') - Plugin.initialise(self) + super(SongsPlugin, self).initialise() self.song_import_item.setVisible(True) self.song_export_item.setVisible(True) self.tools_reindex_item.setVisible(True) @@ -308,7 +308,7 @@ class SongsPlugin(Plugin): action_list.remove_action(self.song_export_item, UiStrings().Export) action_list.remove_action(self.tools_reindex_item, UiStrings().Tools) action_list.remove_action(self.tools_find_duplicates, UiStrings().Tools) - Plugin.finalise(self) + super(SongsPlugin, self).finalise() def new_service_created(self): """ diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index 4173d5d9d..ba09c6258 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -122,7 +122,7 @@ class SongUsagePlugin(Plugin): def initialise(self): log.info(u'SongUsage Initialising') - Plugin.initialise(self) + super(SongUsagePlugin, self).initialise() Registry().register_function(u'slidecontroller_live_started', self.display_song_usage) Registry().register_function(u'print_service_started', self.print_song_usage) self.song_usage_active = Settings().value(self.settings_section + u'/active') @@ -143,7 +143,7 @@ class SongUsagePlugin(Plugin): """ log.info(u'Plugin Finalise') self.manager.finalise() - Plugin.finalise(self) + super(SongUsagePlugin, self).finalise() self.song_usage_menu.menuAction().setVisible(False) action_list = ActionList.get_instance() action_list.remove_action(self.song_usage_status, translate('SongUsagePlugin', 'Song Usage'))