Permalink
Browse files

Rename a couple of methods in MythUIButtonList to avoid confusion wit…

…h other similarly named methods elsewhere.
  • Loading branch information...
1 parent a20b125 commit 6cfda0c46b06df0a1bf49e914eb4533063947a6e @stuartm stuartm committed Jun 16, 2012
@@ -12,7 +12,7 @@
/// Update this whenever the plug-in API changes.
/// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
/// libmythui class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.26.20120614-1"
+#define MYTH_BINARY_VERSION "0.26.20120616-1"
/** \brief Increment this whenever the MythTV network protocol changes.
*
@@ -1250,7 +1250,7 @@ bool MythUIButtonList::DistributeButtons(void)
return true;
}
-void MythUIButtonList::SetPosition(void)
+void MythUIButtonList::CalculateButtonPositions(void)
{
if (m_ButtonList.size() == 0)
return;
@@ -1380,7 +1380,7 @@ void MythUIButtonList::SanitizePosition(void)
m_selPosition = (m_wrapStyle > WrapNone) ? 0 : m_itemList.size() - 1;
}
-void MythUIButtonList::SetPositionArrowStates()
+void MythUIButtonList::CalculateArrowStates()
{
if (!m_initialized)
Init();
@@ -1398,7 +1398,7 @@ void MythUIButtonList::SetPositionArrowStates()
m_ButtonToItem.clear();
if (m_arrange == ArrangeFixed)
- SetPosition();
+ CalculateButtonPositions();
else
DistributeButtons();
@@ -1621,7 +1621,7 @@ uint MythUIButtonList::GetVisibleCount()
{
if (m_needsUpdate)
{
- SetPositionArrowStates();
+ CalculateArrowStates();
SetScrollBarPosition();
}
@@ -2720,7 +2720,7 @@ void MythUIButtonList::DrawSelf(MythPainter *, int, int, int, QRect)
{
if (m_needsUpdate)
{
- SetPositionArrowStates();
+ CalculateArrowStates();
SetScrollBarPosition();
}
}
@@ -232,8 +232,8 @@ class MUI_PUBLIC MythUIButtonList : public MythUIType
int & top_height, int & bottom_height,
bool & wrapped);
bool DistributeButtons(void);
- void SetPosition(void);
- void SetPositionArrowStates(void);
+ void CalculateButtonPositions(void);
+ void CalculateArrowStates(void);
void SetScrollBarPosition(void);
void ItemVisible(MythUIButtonListItem *item);
@@ -80,7 +80,7 @@ void MythUISpinBox::SetRange(int low, int high, int step, uint pageMultiple)
value = value + step;
}
- SetPositionArrowStates();
+ CalculateArrowStates();
}
/**

0 comments on commit 6cfda0c

Please sign in to comment.