Permalink
Browse files

Fix an overloaded-virtual warning.

  • Loading branch information...
daniel-kristjansson committed Nov 26, 2012
1 parent 4c4eb44 commit de0cd124a2dbcb6639321ec45bdb06267c181241
Showing with 29 additions and 14 deletions.
  1. +27 −12 mythtv/programs/mythfrontend/scheduleeditor.cpp
  2. +2 −2 mythtv/programs/mythfrontend/scheduleeditor.h
@@ -928,8 +928,8 @@ bool SchedEditChild::keyPressEvent(QKeyEvent *event)
return handled;
}
bool SchedEditChild::Create(const QString xmlfile, const QString winname,
bool isTemplate)
bool SchedEditChild::CreateEditChild(
const QString xmlfile, const QString winname, bool isTemplate)
{
if (!LoadWindowFromXML(xmlfile, winname, this))
return false;
@@ -996,9 +996,12 @@ SchedOptEditor::~SchedOptEditor(void)
bool SchedOptEditor::Create()
{
if (!SchedEditChild::Create("schedule-ui.xml", "scheduleoptionseditor",
m_recordingRule->m_isTemplate))
if (!SchedEditChild::CreateEditChild(
"schedule-ui.xml", "scheduleoptionseditor",
m_recordingRule->m_isTemplate))
{
return false;
}
bool err = false;
@@ -1064,9 +1067,12 @@ SchedFilterEditor::~SchedFilterEditor(void)
bool SchedFilterEditor::Create()
{
if (!SchedEditChild::Create("schedule-ui.xml", "schedulefiltereditor",
m_recordingRule->m_isTemplate))
if (!SchedEditChild::CreateEditChild(
"schedule-ui.xml", "schedulefiltereditor",
m_recordingRule->m_isTemplate))
{
return false;
}
bool err = false;
@@ -1175,9 +1181,12 @@ StoreOptEditor::~StoreOptEditor(void)
bool StoreOptEditor::Create()
{
if (!SchedEditChild::Create("schedule-ui.xml", "storageoptionseditor",
m_recordingRule->m_isTemplate))
if (!SchedEditChild::CreateEditChild(
"schedule-ui.xml", "storageoptionseditor",
m_recordingRule->m_isTemplate))
{
return false;
}
bool err = false;
@@ -1261,9 +1270,12 @@ PostProcEditor::~PostProcEditor(void)
bool PostProcEditor::Create()
{
if (!SchedEditChild::Create("schedule-ui.xml", "postproceditor",
m_recordingRule->m_isTemplate))
if (!SchedEditChild::CreateEditChild(
"schedule-ui.xml", "postproceditor",
m_recordingRule->m_isTemplate))
{
return false;
}
bool err = false;
@@ -1350,9 +1362,12 @@ MetadataOptions::~MetadataOptions(void)
bool MetadataOptions::Create()
{
if (!SchedEditChild::Create("schedule-ui.xml", "metadataoptions",
m_recordingRule->m_isTemplate))
if (!SchedEditChild::CreateEditChild(
"schedule-ui.xml", "metadataoptions",
m_recordingRule->m_isTemplate))
{
return false;
}
bool err = false;
@@ -219,8 +219,8 @@ class SchedEditChild : public MythScreenType
~SchedEditChild();
virtual bool keyPressEvent(QKeyEvent *event);
virtual bool Create(const QString xmlfile, const QString winname,
bool isTemplate);
virtual bool CreateEditChild(
QString xmlfile, QString winname, bool isTemplate);
signals:
void Closing(void);

0 comments on commit de0cd12

Please sign in to comment.