Skip to content

Commit

Permalink
Fix method name aliasing.
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-kristjansson committed Dec 4, 2012
1 parent bef061f commit 8210c1d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions mythtv/libs/libmythui/myththemedmenu.cpp
Expand Up @@ -107,7 +107,7 @@ MythThemedMenu::MythThemedMenu(const QString &cdir, const QString &menufile,
m_allocedstate = true;
}

Init(menufile);
SetMenuTheme(menufile);
}

/** \brief Loads the main UI theme, and a menu theme.
Expand All @@ -117,7 +117,7 @@ MythThemedMenu::MythThemedMenu(const QString &cdir, const QString &menufile,
*
* \param menufile name of menu item xml file
*/
void MythThemedMenu::Init(const QString &menufile)
void MythThemedMenu::SetMenuTheme(const QString &menufile)
{
if (!m_state->m_loaded)
{
Expand Down Expand Up @@ -147,7 +147,8 @@ MythThemedMenu::~MythThemedMenu(void)
delete m_state;
}

/// \brief Returns true iff a theme has been found by a previous call to Init()
/// \brief Returns true iff a theme has been
/// found by a previous call to SetMenuTheme().
bool MythThemedMenu::foundTheme(void)
{
return m_foundtheme;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/myththemedmenu.h
Expand Up @@ -91,7 +91,7 @@ class MUI_PUBLIC MythThemedMenu : public MythThemedMenuState
void buttonAction(MythUIButtonListItem* item, bool skipPass = false);

private:
void Init(const QString &menufile);
void SetMenuTheme(const QString &menufile);

bool parseMenu(const QString &menuname);
void parseThemeButton(QDomElement &element);
Expand Down

0 comments on commit 8210c1d

Please sign in to comment.