raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unused var and standardise loop vars

Browse Source
This commit is contained in:
Jon Tibble 2010-07-30 17:13:17 +01:00
parent 8480da6e08
commit 003cfd1e68
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp.pyw
View File

@ -122,7 +122,7 @@ class OpenLP(QtGui.QApplication):
show_splash = QtCore.QSettings().value( show_splash = QtCore.QSettings().value(
u'general/show splash', QtCore.QVariant(True)).toBool() u'general/show splash', QtCore.QVariant(True)).toBool()
if show_splash: if show_splash:
self.splash = SplashScreen(self.applicationVersion()) self.splash = SplashScreen()
self.splash.show() self.splash.show()
# make sure Qt really display the splash screen # make sure Qt really display the splash screen
self.processEvents() self.processEvents()

2
openlp/core/ui/splashscreen.py
View File

@ -27,7 +27,7 @@
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
class SplashScreen(object): class SplashScreen(object):
def __init__(self, version): def __init__(self):
self.splash_screen = QtGui.QSplashScreen() self.splash_screen = QtGui.QSplashScreen()
self.setupUi() self.setupUi()

12
openlp/plugins/bibles/lib/__init__.py
View File

@ -118,11 +118,11 @@ def parse_reference(reference):
unified_ref_list.append((book, chapter, vr1_start, vr1_end)) unified_ref_list.append((book, chapter, vr1_start, vr1_end))
vr2_end = check_end(match.group(6)) vr2_end = check_end(match.group(6))
if int(match.group(4)) > chapter: if int(match.group(4)) > chapter:
for x in range(chapter + 1, int(match.group(4)) + 1): for i in range(chapter + 1, int(match.group(4)) + 1):
if x == int(match.group(4)): if i == int(match.group(4)):
unified_ref_list.append((book, x, 1, vr2_end)) unified_ref_list.append((book, i, 1, vr2_end))
else: else:
unified_ref_list.append((book, x, 1, -1)) unified_ref_list.append((book, i, 1, -1))
elif match.group(4): elif match.group(4):
# Chapter range or chapter and verse range # Chapter range or chapter and verse range
if match.group(3): if match.group(3):
@ -134,8 +134,8 @@ def parse_reference(reference):
log.debug(u'Ambiguous reference: %s' % reference) log.debug(u'Ambiguous reference: %s' % reference)
return None return None
elif match.group(4) != u'end': elif match.group(4) != u'end':
for x in range(chapter, int(match.group(4)) + 1): for i in range(chapter, int(match.group(4)) + 1):
unified_ref_list.append((book, x, 1, -1)) unified_ref_list.append((book, i, 1, -1))
else: else:
log.debug(u'Unsupported reference: %s' % reference) log.debug(u'Unsupported reference: %s' % reference)
return None return None

2
openlp/plugins/custom/forms/editcustomform.py
View File

@ -158,7 +158,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
sxml.new_document() sxml.new_document()
sxml.add_lyrics_to_song() sxml.add_lyrics_to_song()
count = 1 count = 1
for i in range (0, self.verseListView.count()): for i in range(0, self.verseListView.count()):
sxml.add_verse_to_lyrics(u'custom', unicode(count), sxml.add_verse_to_lyrics(u'custom', unicode(count),
unicode(self.verseListView.item(i).text())) unicode(self.verseListView.item(i).text()))
count += 1 count += 1

2
openlp/plugins/songs/forms/editsongform.py
View File

@ -663,7 +663,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
sxml = SongXMLBuilder() sxml = SongXMLBuilder()
text = u'' text = u''
multiple = [] multiple = []
for i in range (0, self.VerseListWidget.rowCount()): for i in range(0, self.VerseListWidget.rowCount()):
item = self.VerseListWidget.item(i, 0) item = self.VerseListWidget.item(i, 0)
verseId = unicode(item.data(QtCore.Qt.UserRole).toString()) verseId = unicode(item.data(QtCore.Qt.UserRole).toString())
bits = verseId.split(u':') bits = verseId.split(u':')