← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~mahfiaz/openlp/qtobjectinit into lp:openlp

 

mahfiaz has proposed merging lp:~mahfiaz/openlp/qtobjectinit into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~mahfiaz/openlp/qtobjectinit/+merge/50484

These seemed to be missing. Don't know if these do any good, but don't hurt either.
-- 
https://code.launchpad.net/~mahfiaz/openlp/qtobjectinit/+merge/50484
Your team OpenLP Core is requested to review the proposed merge of lp:~mahfiaz/openlp/qtobjectinit into lp:openlp.
=== modified file 'openlp/core/lib/imagemanager.py'
--- openlp/core/lib/imagemanager.py	2011-02-17 12:53:07 +0000
+++ openlp/core/lib/imagemanager.py	2011-02-20 00:11:39 +0000
@@ -69,6 +69,7 @@
     log.info(u'Image Manager loaded')
 
     def __init__(self):
+        QtCore.QObject.__init__(self)
         self._cache = {}
         self._thread_running = False
         self._cache_dirty = False

=== modified file 'openlp/plugins/songs/lib/songimport.py'
--- openlp/plugins/songs/lib/songimport.py	2011-02-18 17:34:43 +0000
+++ openlp/plugins/songs/lib/songimport.py	2011-02-20 00:11:39 +0000
@@ -54,6 +54,7 @@
 
         """
         self.manager = manager
+        QtCore.QObject.__init__(self)
         if kwargs.has_key(u'filename'):
             self.import_source = kwargs[u'filename']
         elif kwargs.has_key(u'filenames'):


Follow ups