- removed depreciated warnings

- clean up

bzr-revno: 2262

openlp/core/lib/serviceitem.py

@@ -485,6 +485,12 @@ class ServiceItem(object):
         """
         return self.unique_identifier != other.unique_identifier
 
+    def __hash__(self):
+        """
+        Return the hash for the service item.
+        """
+        return self.unique_identifier
+
     def is_media(self):
         """
         Confirms if the ServiceItem is media

openlp/plugins/custom/forms/editcustomform.py

@@ -100,8 +100,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
             self.credit_edit.setText(self.custom_slide.credits)
             custom_XML = CustomXMLParser(self.custom_slide.text)
             slide_list = custom_XML.get_verses()
-            for slide in slide_list:
+            self.slide_list_view.addItems([slide[1] for slide in slide_list])
-                self.slide_list_view.addItem(slide[1])
             theme = self.custom_slide.theme_name
             find_and_set_in_combo_box(self.theme_combo_box, theme)
         self.title_edit.setFocus()

openlp/plugins/custom/lib/db.py

@@ -41,14 +41,19 @@ class CustomSlide(BaseModel):
     """
     CustomSlide model
     """
-    # By default sort the customs by its title considering language specific
+    # By default sort the customs by its title considering language specific characters.
-    # characters.
     def __lt__(self, other):
         return get_locale_key(self.title) < get_locale_key(other.title)
 
     def __eq__(self, other):
         return get_locale_key(self.title) == get_locale_key(other.title)
 
+    def __hash__(self):
+        """
+        Return the hash for a custom slide.
+        """
+        return self.id
+
 
 def init_schema(url):
     """