Skip to content

Commit ca49110

Browse files
committed
Simplify sending of system events in MythScreenType.
Now that MythSystemEvents can be sent via gCoreContext, we don't need to post these directly inside MythScreenType. Instead, just #include mythcorecontext.h and send via gCoreContext->SendSystemEvent(). Should have done this in the last commit.
1 parent 87b89de commit ca49110

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

mythtv/libs/libmythui/mythscreentype.cpp

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <QDomDocument>
66
#include <QRunnable>
77

8+
#include "mythcorecontext.h"
89
#include "mythobservable.h"
910
#include "mthreadpool.h"
1011

@@ -50,9 +51,8 @@ MythScreenType::MythScreenType(MythScreenStack *parent, const QString &name,
5051
// Can be overridden, of course, but default to full sized.
5152
m_Area = GetMythMainWindow()->GetUIScreenRect();
5253

53-
MythEvent me(QString("GLOBAL_SYSTEM_EVENT SCREEN_TYPE CREATED %1").arg(name));
54-
QCoreApplication::postEvent(
55-
GetMythMainWindow()->GetSystemEventHandler(), me.clone());
54+
gCoreContext->SendSystemEvent(
55+
QString("SCREEN_TYPE CREATED %1").arg(name));
5656
}
5757

5858
MythScreenType::MythScreenType(MythUIType *parent, const QString &name,
@@ -71,17 +71,14 @@ MythScreenType::MythScreenType(MythUIType *parent, const QString &name,
7171

7272
m_Area = GetMythMainWindow()->GetUIScreenRect();
7373

74-
MythEvent me(QString("GLOBAL_SYSTEM_EVENT SCREEN_TYPE CREATED %1").arg(name));
75-
QCoreApplication::postEvent(
76-
GetMythMainWindow()->GetSystemEventHandler(), me.clone());
74+
gCoreContext->SendSystemEvent(
75+
QString("SCREEN_TYPE CREATED %1").arg(name));
7776
}
7877

7978
MythScreenType::~MythScreenType()
8079
{
81-
MythEvent me(QString("GLOBAL_SYSTEM_EVENT SCREEN_TYPE DESTROYED %1")
82-
.arg(objectName()));
83-
QCoreApplication::postEvent(
84-
GetMythMainWindow()->GetSystemEventHandler(), me.clone());
80+
gCoreContext->SendSystemEvent(
81+
QString("SCREEN_TYPE DESTROYED %1").arg(objectName()));
8582

8683
m_CurrentFocusWidget = NULL;
8784
emit Exiting();
@@ -472,12 +469,7 @@ bool MythScreenType::keyPressEvent(QKeyEvent *event)
472469
else if (action == "MENU")
473470
ShowMenu();
474471
else if (action.startsWith("SYSEVENT"))
475-
{
476-
MythEvent me(QString("GLOBAL_SYSTEM_EVENT KEY_%1")
477-
.arg(action.mid(8)));
478-
QCoreApplication::postEvent(
479-
GetMythMainWindow()->GetSystemEventHandler(), me.clone());
480-
}
472+
gCoreContext->SendSystemEvent(QString("KEY_%1").arg(action.mid(8)));
481473
else if (action == ACTION_SCREENSHOT)
482474
{
483475
GetMythMainWindow()->ScreenShot();

0 commit comments

Comments
 (0)