From c099e6f8083bad8fdbaa4aca0abbd41788175b55 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Wed, 28 Jul 2010 14:32:12 +0100
Subject: [PATCH] Naming cleanup

---
 openlp/plugins/custom/lib/customtab.py | 38 +++++++++++++-------------
 openlp/plugins/songs/lib/__init__.py   | 12 ++++----
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/openlp/plugins/custom/lib/customtab.py b/openlp/plugins/custom/lib/customtab.py
index 0081524b6..77ef0f3f6 100644
--- a/openlp/plugins/custom/lib/customtab.py
+++ b/openlp/plugins/custom/lib/customtab.py
@@ -38,29 +38,29 @@ class CustomTab(SettingsTab):
     def setupUi(self):
         self.setObjectName(u'CustomTab')
         self.tabTitleVisible = translate('CustomPlugin.CustomTab', 'Custom')
-        self.CustomLayout = QtGui.QFormLayout(self)
-        self.CustomLayout.setSpacing(8)
-        self.CustomLayout.setMargin(8)
-        self.CustomLayout.setObjectName(u'CustomLayout')
-        self.CustomModeGroupBox = QtGui.QGroupBox(self)
-        self.CustomModeGroupBox.setObjectName(u'CustomModeGroupBox')
-        self.CustomModeLayout = QtGui.QVBoxLayout(self.CustomModeGroupBox)
-        self.CustomModeLayout.setSpacing(8)
-        self.CustomModeLayout.setMargin(8)
-        self.CustomModeLayout.setObjectName(u'CustomModeLayout')
-        self.DisplayFooterCheckBox = QtGui.QCheckBox(self.CustomModeGroupBox)
-        self.DisplayFooterCheckBox.setObjectName(u'DisplayFooterCheckBox')
-        self.CustomModeLayout.addWidget(self.DisplayFooterCheckBox)
-        self.CustomLayout.setWidget(
-            0, QtGui.QFormLayout.LabelRole, self.CustomModeGroupBox)
-        QtCore.QObject.connect(self.DisplayFooterCheckBox,
+        self.customLayout = QtGui.QFormLayout(self)
+        self.customLayout.setSpacing(8)
+        self.customLayout.setMargin(8)
+        self.customLayout.setObjectName(u'customLayout')
+        self.customModeGroupBox = QtGui.QGroupBox(self)
+        self.customModeGroupBox.setObjectName(u'customModeGroupBox')
+        self.customModeLayout = QtGui.QVBoxLayout(self.customModeGroupBox)
+        self.customModeLayout.setSpacing(8)
+        self.customModeLayout.setMargin(8)
+        self.customModeLayout.setObjectName(u'customModeLayout')
+        self.displayFooterCheckBox = QtGui.QCheckBox(self.customModeGroupBox)
+        self.displayFooterCheckBox.setObjectName(u'displayFooterCheckBox')
+        self.customModeLayout.addWidget(self.displayFooterCheckBox)
+        self.customLayout.setWidget(
+            0, QtGui.QFormLayout.LabelRole, self.customModeGroupBox)
+        QtCore.QObject.connect(self.displayFooterCheckBox,
             QtCore.SIGNAL(u'stateChanged(int)'),
             self.onDisplayFooterCheckBoxChanged)
 
     def retranslateUi(self):
-        self.CustomModeGroupBox.setTitle(translate('CustomPlugin.CustomTab',
+        self.customModeGroupBox.setTitle(translate('CustomPlugin.CustomTab',
             'Custom Display'))
-        self.DisplayFooterCheckBox.setText(
+        self.displayFooterCheckBox.setText(
             translate('CustomPlugin.CustomTab', 'Display footer'))
 
     def onDisplayFooterCheckBoxChanged(self, check_state):
@@ -73,7 +73,7 @@ class CustomTab(SettingsTab):
         self.displayFooter = QtCore.QSettings().value(
             self.settingsSection + u'/display footer',
             QtCore.QVariant(True)).toBool()
-        self.DisplayFooterCheckBox.setChecked(self.displayFooter)
+        self.displayFooterCheckBox.setChecked(self.displayFooter)
 
     def save(self):
         QtCore.QSettings().setValue(self.settingsSection + u'/display footer',
diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 23bbc2a52..b8f4d9a05 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -42,20 +42,20 @@ class SongFormat(object):
     CSV = 3
 
     @staticmethod
-    def get_class(id):
+    def get_class(format):
         """
         Return the appropriate imeplementation class.
 
-        ``id``
+        ``format``
             The song format.
         """
-#        if id == SongFormat.OpenLyrics:
+#        if format == SongFormat.OpenLyrics:
 #            return OpenLyricsSong
-#        elif id == SongFormat.OpenSong:
+#        elif format == SongFormat.OpenSong:
 #            return OpenSongSong
-#        elif id == SongFormat.CCLI:
+#        elif format == SongFormat.CCLI:
 #            return CCLISong
-#        elif id == SongFormat.CSV:
+#        elif format == SongFormat.CSV:
 #            return CSVSong
 #        else:
         return None