diff -r 0e5421d679e7 -r ea526b78ee6c HexEdit/HexEditGotoWidget.py
--- a/HexEdit/HexEditGotoWidget.py Tue Mar 07 18:46:09 2017 +0100
+++ b/HexEdit/HexEditGotoWidget.py Tue Mar 07 18:53:18 2017 +0100
@@ -48,9 +48,9 @@
self.closeButton.setIcon(UI.PixmapCache.getIcon("close.png"))
- for format in formatOrder:
- formatStr, validator = self.__formatAndValidators[format]
- self.formatCombo.addItem(formatStr, format)
+ for dataFormat in formatOrder:
+ formatStr, validator = self.__formatAndValidators[dataFormat]
+ self.formatCombo.addItem(formatStr, dataFormat)
self.formatCombo.setCurrentIndex(0)
@@ -71,16 +71,16 @@
@type int
"""
if idx >= 0:
- format = self.formatCombo.itemData(idx)
+ dataFormat = self.formatCombo.itemData(idx)
- if format != self.__currentFormat:
+ if dataFormat != self.__currentFormat:
txt = self.offsetEdit.text()
newTxt = self.__convertText(
- txt, self.__currentFormat, format)
- self.__currentFormat = format
+ txt, self.__currentFormat, dataFormat)
+ self.__currentFormat = dataFormat
self.offsetEdit.setValidator(
- self.__formatAndValidators[format][1])
+ self.__formatAndValidators[dataFormat][1])
self.offsetEdit.setText(newTxt)
@@ -99,8 +99,8 @@
"""
Private slot to move the cursor and extend the selection.
"""
- format = self.formatCombo.itemData(self.formatCombo.currentIndex())
- if format == "hex":
+ dataFormat = self.formatCombo.itemData(self.formatCombo.currentIndex())
+ if dataFormat == "hex":
offset = self.offsetEdit.text().replace(":", "")
# get rid of ':' address separators
offset = int(offset, 16)
