From 4a616c74b70eedb4dba22cf268d4b582b79ebe01 Mon Sep 17 00:00:00 2001 From: Jean-Yves Avenard Date: Thu, 25 Jul 2013 09:52:35 +1000 Subject: [PATCH] Rename MythUINotificationCenter into MythNotificationCenter This is to make naming consisten with other myth libraries, and using MythUI prefix only for MythUI widgets. Make distclean required --- mythtv/libs/libmyth/mythcontext.cpp | 2 +- mythtv/libs/libmyth/mythmediamonitor.cpp | 2 +- .../libmythtv/AirPlay/mythairplayserver.cpp | 18 +- .../libmythtv/AirPlay/mythraopconnection.cpp | 8 +- .../libs/libmythtv/AirPlay/mythraopdevice.cpp | 6 +- mythtv/libs/libmythtv/audioplayer.cpp | 2 +- mythtv/libs/libmythtv/osd.cpp | 14 +- mythtv/libs/libmythtv/tv_play.cpp | 2 +- mythtv/libs/libmythui/libmythui.pro | 6 +- mythtv/libs/libmythui/mythmainwindow.cpp | 14 +- mythtv/libs/libmythui/mythmainwindow.h | 6 +- mythtv/libs/libmythui/mythnotification.h | 4 +- ...ncenter.cpp => mythnotificationcenter.cpp} | 172 +++++++++--------- ...ationcenter.h => mythnotificationcenter.h} | 24 +-- ...ate.h => mythnotificationcenter_private.h} | 50 ++--- mythtv/libs/libmythui/mythudplistener.cpp | 2 +- mythtv/programs/mythfrontend/main.cpp | 2 +- .../programs/mythfrontend/networkcontrol.cpp | 4 +- mythtv/programs/mythfrontend/playbackbox.cpp | 2 +- .../mythfrontend/services/frontend.cpp | 2 +- 20 files changed, 171 insertions(+), 171 deletions(-) rename mythtv/libs/libmythui/{mythuinotificationcenter.cpp => mythnotificationcenter.cpp} (87%) rename mythtv/libs/libmythui/{mythuinotificationcenter.h => mythnotificationcenter.h} (88%) rename mythtv/libs/libmythui/{mythuinotificationcenter_private.h => mythnotificationcenter_private.h} (82%) diff --git a/mythtv/libs/libmyth/mythcontext.cpp b/mythtv/libs/libmyth/mythcontext.cpp index da6e7f52fbc..dd49c2608c1 100644 --- a/mythtv/libs/libmyth/mythcontext.cpp +++ b/mythtv/libs/libmyth/mythcontext.cpp @@ -39,7 +39,7 @@ using namespace std; #include "mythlogging.h" #include "mythsystemlegacy.h" #include "mythmiscutil.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #include "mythplugin.h" diff --git a/mythtv/libs/libmyth/mythmediamonitor.cpp b/mythtv/libs/libmyth/mythmediamonitor.cpp index 4b2861cd49b..7b35b7b2947 100644 --- a/mythtv/libs/libmyth/mythmediamonitor.cpp +++ b/mythtv/libs/libmyth/mythmediamonitor.cpp @@ -33,7 +33,7 @@ using namespace std; #else #include "mediamonitor-unix.h" #endif -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" static const QString _Location = QObject::tr("Media Monitor"); diff --git a/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp index ff3b5dec6e2..9de6bf6758e 100644 --- a/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp +++ b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp @@ -18,7 +18,7 @@ #include "mythuistatetracker.h" #include "plist.h" #include "tv_play.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #include "bonjourregister.h" #include "mythairplayserver.h" @@ -401,7 +401,7 @@ MythAirplayServer::~MythAirplayServer() m_lock = NULL; if (m_id > 0) { - MythUINotificationCenter::GetInstance()->UnRegister(this, m_id); + MythNotificationCenter::GetInstance()->UnRegister(this, m_id); m_id = -1; } } @@ -434,7 +434,7 @@ void MythAirplayServer::Teardown(void) if (m_id > 0) { - MythUINotificationCenter::GetInstance()->UnRegister(this, m_id); + MythNotificationCenter::GetInstance()->UnRegister(this, m_id); m_id = -1; } } @@ -561,14 +561,14 @@ void MythAirplayServer::deleteConnection(QTcpSocket *socket) if (m_id > 0) { // close any photos that could be displayed - MythUINotificationCenter::GetInstance()->UnRegister(this, m_id); + MythNotificationCenter::GetInstance()->UnRegister(this, m_id); m_id = -1; } MythNotification n(tr("Client disconnected"), tr("AirPlay"), tr("from %1").arg(socket->peerAddress().toString())); // Don't show it during playback n.SetVisibility(n.GetVisibility() & ~MythNotification::kPlayback); - MythUINotificationCenter::GetInstance()->Queue(n); + MythNotificationCenter::GetInstance()->Queue(n); } socket->deleteLater(); @@ -710,7 +710,7 @@ void MythAirplayServer::HandleResponse(APHTTPRequest *req, tr("from %1").arg(socket->peerAddress().toString())); // Don't show it during playback n.SetVisibility(n.GetVisibility() & ~MythNotification::kPlayback); - MythUINotificationCenter::GetInstance()->Queue(n); + MythNotificationCenter::GetInstance()->Queue(n); } double position = 0.0f; @@ -834,14 +834,14 @@ void MythAirplayServer::HandleResponse(APHTTPRequest *req, if (m_id < 0) { - m_id = MythUINotificationCenter::GetInstance()->Register(this); + m_id = MythNotificationCenter::GetInstance()->Register(this); } // send full screen display notification MythImageNotification n(MythNotification::New, image); n.SetId(m_id); n.SetParent(this); n.SetFullScreen(true); - MythUINotificationCenter::GetInstance()->Queue(n); + MythNotificationCenter::GetInstance()->Queue(n); } } else if (req->GetURI() == "/slideshow-features") @@ -1157,7 +1157,7 @@ void MythAirplayServer::StartPlayback(const QString &pathname) if (TV::IsTVRunning() && m_id > 0) { // playback has started, dismiss the photo is we were showing one - MythUINotificationCenter::GetInstance()->UnRegister(this, m_id); + MythNotificationCenter::GetInstance()->UnRegister(this, m_id); m_id = -1; } LOG(VB_PLAYBACK, LOG_DEBUG, LOC + diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp b/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp index c7335678e6f..a76c85a6e03 100644 --- a/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp +++ b/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp @@ -15,7 +15,7 @@ #include "mythraopconnection.h" #include "mythairplayserver.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #define LOC QString("RAOP Conn: ") #define MAX_PACKET_SIZE 2048 @@ -85,7 +85,7 @@ MythRAOPConnection::MythRAOPConnection(QObject *parent, QTcpSocket *socket, m_progressStart(0), m_progressCurrent(0), m_progressEnd(0), m_firstsend(false), m_playbackStarted(false) { - m_id = MythUINotificationCenter::GetInstance()->Register(this); + m_id = MythNotificationCenter::GetInstance()->Register(this); } MythRAOPConnection::~MythRAOPConnection() @@ -124,7 +124,7 @@ MythRAOPConnection::~MythRAOPConnection() if (m_id > 0) { - MythUINotificationCenter::GetInstance()->UnRegister(this, m_id); + MythNotificationCenter::GetInstance()->UnRegister(this, m_id); } } @@ -1792,7 +1792,7 @@ void MythRAOPConnection::SendNotification(bool update) n->SetParent(this); n->SetDuration(5); n->SetFullScreen(gCoreContext->GetNumSetting("AirPlayFullScreen")); - MythUINotificationCenter::GetInstance()->Queue(*n); + MythNotificationCenter::GetInstance()->Queue(*n); m_firstsend = true; delete n; } diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp index 040383241a5..404729df9c6 100644 --- a/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp +++ b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp @@ -7,7 +7,7 @@ #include "mthread.h" #include "mythlogging.h" #include "mythcorecontext.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #include "bonjourregister.h" #include "mythraopconnection.h" @@ -213,7 +213,7 @@ void MythRAOPDevice::newConnection(QTcpSocket *client) tr("from %1:%2").arg(client->peerAddress().toString()).arg(client->peerPort())); // Don't show it during playback n.SetVisibility(n.GetVisibility() & ~MythNotification::kPlayback); - MythUINotificationCenter::GetInstance()->Queue(n); + MythNotificationCenter::GetInstance()->Queue(n); MythRAOPConnection *obj = new MythRAOPConnection(this, client, m_hardwareId, 6000); @@ -242,7 +242,7 @@ void MythRAOPDevice::deleteClient(void) MythNotification n(tr("Client disconnected"), tr("AirTunes")); // Don't show it during playback n.SetVisibility(n.GetVisibility() & ~MythNotification::kPlayback); - MythUINotificationCenter::GetInstance()->Queue(n); + MythNotificationCenter::GetInstance()->Queue(n); while (it != m_clients.end()) { diff --git a/mythtv/libs/libmythtv/audioplayer.cpp b/mythtv/libs/libmythtv/audioplayer.cpp index 2768dd8cad3..ca39012ad3b 100644 --- a/mythtv/libs/libmythtv/audioplayer.cpp +++ b/mythtv/libs/libmythtv/audioplayer.cpp @@ -1,7 +1,7 @@ #include "mythplayer.h" #include "audiooutput.h" #include "audioplayer.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #define LOC QString("AudioPlayer: ") diff --git a/mythtv/libs/libmythtv/osd.cpp b/mythtv/libs/libmythtv/osd.cpp index 17e0a837219..dcb8f269e6a 100644 --- a/mythtv/libs/libmythtv/osd.cpp +++ b/mythtv/libs/libmythtv/osd.cpp @@ -15,7 +15,7 @@ #include "mythuibutton.h" #include "mythuieditbar.h" #include "mythuistatetype.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" // libmythtv #include "channelutil.h" @@ -269,7 +269,7 @@ bool OSD::Reinit(const QRect &rect, float font_aspect) bool OSD::IsVisible(void) { - if (MythUINotificationCenter::GetInstance()->DisplayedNotifications() > 0) + if (MythNotificationCenter::GetInstance()->DisplayedNotifications() > 0) return true; foreach(MythScreenType* child, m_Children) @@ -289,7 +289,7 @@ void OSD::HideAll(bool keepsubs, MythScreenType* except, bool dropnotification) { if (dropnotification) { - if (MythUINotificationCenter::GetInstance()->RemoveFirst()) + if (MythNotificationCenter::GetInstance()->RemoveFirst()) return; // we've removed the top window, don't process any further } QMutableMapIterator it(m_Children); @@ -642,13 +642,13 @@ bool OSD::DrawDirect(MythPainter* painter, QSize size, bool repaint) } } - MythUINotificationCenter *nc = MythUINotificationCenter::GetInstance(); + MythNotificationCenter *nc = MythNotificationCenter::GetInstance(); QList notifications; nc->GetNotificationScreens(notifications); QList::iterator it2 = notifications.begin(); while (it2 != notifications.end()) { - if (!MythUINotificationCenter::GetInstance()->ScreenCreated(*it2)) + if (!MythNotificationCenter::GetInstance()->ScreenCreated(*it2)) { if (!m_UIScaleOverride) { @@ -760,13 +760,13 @@ QRegion OSD::Draw(MythPainter* painter, QPaintDevice *device, QSize size, } } - MythUINotificationCenter *nc = MythUINotificationCenter::GetInstance(); + MythNotificationCenter *nc = MythNotificationCenter::GetInstance(); QList notifications; nc->GetNotificationScreens(notifications); QList::iterator it2 = notifications.begin(); while (it2 != notifications.end()) { - if (!MythUINotificationCenter::GetInstance()->ScreenCreated(*it2)) + if (!MythNotificationCenter::GetInstance()->ScreenCreated(*it2)) { if (!m_UIScaleOverride) { diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp index 92d340c4ff5..421a490dc34 100644 --- a/mythtv/libs/libmythtv/tv_play.cpp +++ b/mythtv/libs/libmythtv/tv_play.cpp @@ -51,7 +51,7 @@ using namespace std; #include "channelutil.h" #include "compat.h" #include "mythuihelper.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #include "mythdialogbox.h" #include "mythmainwindow.h" #include "mythscreenstack.h" diff --git a/mythtv/libs/libmythui/libmythui.pro b/mythtv/libs/libmythui/libmythui.pro index 061e3ee77df..589639cecdd 100644 --- a/mythtv/libs/libmythui/libmythui.pro +++ b/mythtv/libs/libmythui/libmythui.pro @@ -41,7 +41,7 @@ HEADERS += mythrender_base.h mythfontmanager.h mythuieditbar.h HEADERS += mythdisplay.h mythuivideo.h mythudplistener.h HEADERS += mythuiexp.h mythuisimpletext.h mythuistatetracker.h HEADERS += mythuianimation.h mythuiscrollbar.h -HEADERS += mythuinotificationcenter.h mythuinotificationcenter_private.h +HEADERS += mythnotificationcenter.h mythnotificationcenter_private.h HEADERS += mythuicomposite.h mythnotification.h SOURCES = mythmainwindow.cpp mythpainter.cpp mythimage.cpp mythrect.cpp @@ -62,7 +62,7 @@ SOURCES += mythfontmanager.cpp mythuieditbar.cpp SOURCES += mythdisplay.cpp mythuivideo.cpp mythudplistener.cpp SOURCES += mythuisimpletext.cpp mythuistatetracker.cpp SOURCES += mythuianimation.cpp mythuiscrollbar.cpp -SOURCES += mythuinotificationcenter.cpp mythnotification.cpp +SOURCES += mythnotificationcenter.cpp mythnotification.cpp SOURCES += mythuicomposite.cpp contains(QT_VERSION, ^4\\.[0-9]\\..*) { @@ -85,7 +85,7 @@ inc.files += mythvirtualkeyboard.h mythuishape.h mythuiguidegrid.h inc.files += mythuieditbar.h mythuifilebrowser.h mythuivideo.h inc.files += mythuiexp.h mythuisimpletext.h mythuiactions.h inc.files += mythuistatetracker.h mythuianimation.h mythuiscrollbar.h -inc.files += mythuinotificationcenter.h mythnotification.h mythuicomposite.h +inc.files += mythnotificationcenter.h mythnotification.h mythuicomposite.h INSTALLS += inc diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp index f66d679e35b..7bcb3ac53c4 100644 --- a/mythtv/libs/libmythui/mythmainwindow.cpp +++ b/mythtv/libs/libmythui/mythmainwindow.cpp @@ -83,7 +83,7 @@ using namespace std; #include "mythpainter_d3d9.h" #endif -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #define GESTURE_TIMEOUT 1000 #define STANDBY_TIMEOUT 90 // Minutes @@ -287,7 +287,7 @@ class MythMainWindowPrivate QTimer *idleTimer; bool standby; bool enteringStandby; - MythUINotificationCenter *NC; + MythNotificationCenter *NC; }; // Make keynum in QKeyEvent be equivalent to what's in QKeySequence @@ -375,7 +375,7 @@ MythPainter *GetMythPainter(void) return MythMainWindow::getMainWindow()->GetCurrentPainter(); } -MythUINotificationCenter *GetNotificationCenter(void) +MythNotificationCenter *GetNotificationCenter(void) { if (!mainWin || !mainWin->GetCurrentNotificationCenter()) @@ -606,7 +606,7 @@ MythPainter *MythMainWindow::GetCurrentPainter(void) return d->painter; } -MythUINotificationCenter *MythMainWindow::GetCurrentNotificationCenter(void) +MythNotificationCenter *MythMainWindow::GetCurrentNotificationCenter(void) { return d->NC; } @@ -1109,7 +1109,7 @@ void MythMainWindow::Init(QString forcedpainter) if (!d->NC) { - d->NC = new MythUINotificationCenter(); + d->NC = new MythNotificationCenter(); } } @@ -2427,9 +2427,9 @@ void MythMainWindow::customEvent(QEvent *ce) if (!message.isEmpty()) ShowOkPopup(message); } - else if ((MythEvent::Type)(ce->type()) == MythUINotificationCenterEvent::kEventType) + else if ((MythEvent::Type)(ce->type()) == MythNotificationCenterEvent::kEventType) { - MythUINotificationCenter::GetInstance()->ProcessQueue(); + MythNotificationCenter::GetInstance()->ProcessQueue(); } } diff --git a/mythtv/libs/libmythui/mythmainwindow.h b/mythtv/libs/libmythui/mythmainwindow.h index 699f7fa30db..3cdd8ea0514 100644 --- a/mythtv/libs/libmythui/mythmainwindow.h +++ b/mythtv/libs/libmythui/mythmainwindow.h @@ -27,7 +27,7 @@ class MythPainterWindowQt; class MythPainterWindowVDPAU; class MythPainterWindowD3D9; class MythRender; -class MythUINotificationCenter; +class MythNotificationCenter; class MUI_PUBLIC MythMainWindow : public QWidget { @@ -95,7 +95,7 @@ class MUI_PUBLIC MythMainWindow : public QWidget MythPainter *GetCurrentPainter(); QWidget *GetPaintWindow(); MythRender *GetRenderDevice(); - MythUINotificationCenter *GetCurrentNotificationCenter(); + MythNotificationCenter *GetCurrentNotificationCenter(); void ShowPainterWindow(); void HidePainterWindow(); void ResizePainterWindow(const QSize &size); @@ -182,6 +182,6 @@ MUI_PUBLIC void DestroyMythMainWindow(); MUI_PUBLIC MythPainter *GetMythPainter(); -MUI_PUBLIC MythUINotificationCenter *GetNotificationCenter(); +MUI_PUBLIC MythNotificationCenter *GetNotificationCenter(); #endif diff --git a/mythtv/libs/libmythui/mythnotification.h b/mythtv/libs/libmythui/mythnotification.h index a1d05b53706..4c1820b4440 100644 --- a/mythtv/libs/libmythui/mythnotification.h +++ b/mythtv/libs/libmythui/mythnotification.h @@ -123,7 +123,7 @@ class MUI_PUBLIC MythNotification : public MythEvent /** * contains the parent address. Required if id is set * Id provided must match the parent address as provided during the - * MythUINotificationCenter registration, otherwise the id value will be + * MythNotificationCenter registration, otherwise the id value will be * ignored */ void SetParent(void *parent) { m_parent = parent; } @@ -145,7 +145,7 @@ class MUI_PUBLIC MythNotification : public MythEvent void SetMetaData(const DMAP &data) { m_metadata = data; } /** * contains a duration during which the notification will be displayed for. - * The duration is informative only as the MythUINotificationCenter will + * The duration is informative only as the MythNotificationCenter will * determine automatically how long a notification can be displayed for * and will depend on priority, visibility and other factors */ diff --git a/mythtv/libs/libmythui/mythuinotificationcenter.cpp b/mythtv/libs/libmythui/mythnotificationcenter.cpp similarity index 87% rename from mythtv/libs/libmythui/mythuinotificationcenter.cpp rename to mythtv/libs/libmythui/mythnotificationcenter.cpp index b966492037a..56725ec0b5a 100644 --- a/mythtv/libs/libmythui/mythuinotificationcenter.cpp +++ b/mythtv/libs/libmythui/mythnotificationcenter.cpp @@ -1,5 +1,5 @@ // -// mythuinotificationcenter.cpp +// mythnotificationcenter.cpp // MythTV // // Created by Jean-Yves Avenard on 25/06/13. @@ -15,8 +15,8 @@ #include "mythcorecontext.h" #include "mythmainwindow.h" -#include "mythuinotificationcenter.h" -#include "mythuinotificationcenter_private.h" +#include "mythnotificationcenter.h" +#include "mythnotificationcenter_private.h" #include "mythpainter.h" #include "mythscreenstack.h" @@ -31,9 +31,9 @@ #define HGAP 5 #define DEFAULT_DURATION 5000 // in ms -//// MythUINotificationCenterEvent +//// MythNotificationCenterEvent -QEvent::Type MythUINotificationCenterEvent::kEventType = +QEvent::Type MythNotificationCenterEvent::kEventType = (QEvent::Type) QEvent::registerEventType(); //// class MythNotificationScreenStack @@ -132,7 +132,7 @@ MythScreenType *MythNotificationScreenStack::GetTopScreen(void) const // loop from last to 2nd for (; it != m_Children.begin(); --it) { - MythUINotificationScreen *s = dynamic_cast(*it); + MythNotificationScreen *s = dynamic_cast(*it); if (!s) { @@ -149,11 +149,11 @@ MythScreenType *MythNotificationScreenStack::GetTopScreen(void) const return top; } -//// class MythUINotificationScreen +//// class MythNotificationScreen -MythUINotificationScreen::MythUINotificationScreen(MythScreenStack *stack, +MythNotificationScreen::MythNotificationScreen(MythScreenStack *stack, int id) - : MythScreenType(stack, "mythuinotification"), m_id(id), + : MythScreenType(stack, "mythnotification"), m_id(id), m_duration(-1), m_progress(-1.0), m_fullscreen(false), m_added(false), m_created(false), m_content(kNone), m_update(kAll), @@ -172,9 +172,9 @@ MythUINotificationScreen::MythUINotificationScreen(MythScreenStack *stack, connect(m_timer, SIGNAL(timeout()), this, SLOT(ProcessTimer())); } -MythUINotificationScreen::MythUINotificationScreen(MythScreenStack *stack, +MythNotificationScreen::MythNotificationScreen(MythScreenStack *stack, MythNotification ¬ification) - : MythScreenType(stack, "mythuinotification"), m_id(notification.GetId()), + : MythScreenType(stack, "mythnotification"), m_id(notification.GetId()), m_duration(notification.GetDuration()), m_progress(-1.0), m_fullscreen(false), m_added(false), m_created(false), m_content(kNone), @@ -192,9 +192,9 @@ MythUINotificationScreen::MythUINotificationScreen(MythScreenStack *stack, connect(m_timer, SIGNAL(timeout()), this, SLOT(ProcessTimer())); } -MythUINotificationScreen::MythUINotificationScreen(MythScreenStack *stack, - const MythUINotificationScreen &s) - : MythScreenType(stack, "mythuinotification"), +MythNotificationScreen::MythNotificationScreen(MythScreenStack *stack, + const MythNotificationScreen &s) + : MythScreenType(stack, "mythnotification"), m_duration(-1), m_progress(-1.0), m_fullscreen(false), m_added(false), m_created(false), m_content(kNone), m_update(kAll), @@ -211,17 +211,17 @@ MythUINotificationScreen::MythUINotificationScreen(MythScreenStack *stack, connect(m_timer, SIGNAL(timeout()), this, SLOT(ProcessTimer())); } -MythUINotificationScreen::~MythUINotificationScreen() +MythNotificationScreen::~MythNotificationScreen() { m_timer->stop(); - LOG(VB_GUI, LOG_DEBUG, LOC + "MythUINotificationScreen dtor"); + LOG(VB_GUI, LOG_DEBUG, LOC + "MythNotificationScreen dtor"); // We can't rely on Exiting() default MythScreenType signal as // by the time it is emitted, the destructor would have already been called // making the members unusable emit ScreenDeleted(); } -void MythUINotificationScreen::SetNotification(MythNotification ¬ification) +void MythNotificationScreen::SetNotification(MythNotification ¬ification) { bool update; m_update = kNone; @@ -317,7 +317,7 @@ void MythUINotificationScreen::SetNotification(MythNotification ¬ification) m_refresh = true; } -bool MythUINotificationScreen::Create(void) +bool MythNotificationScreen::Create(void) { bool foundtheme = false; @@ -389,9 +389,9 @@ bool MythUINotificationScreen::Create(void) } /** - * Update the various fields of a MythUINotificationScreen. + * Update the various fields of a MythNotificationScreen. */ -void MythUINotificationScreen::Init(void) +void MythNotificationScreen::Init(void) { if (!m_refresh) // nothing got changed so far, return return; @@ -512,7 +512,7 @@ void MythUINotificationScreen::Init(void) m_refresh = false; } -void MythUINotificationScreen::SetErrorState(void) +void MythNotificationScreen::SetErrorState(void) { if (!m_errorState) return; @@ -543,7 +543,7 @@ void MythUINotificationScreen::SetErrorState(void) * Update artwork image. * must call Init() for screen to be updated. */ -void MythUINotificationScreen::UpdateArtwork(const QImage &image) +void MythNotificationScreen::UpdateArtwork(const QImage &image) { m_image = image; // We need to re-run init @@ -554,7 +554,7 @@ void MythUINotificationScreen::UpdateArtwork(const QImage &image) * Update artwork image via URL or file path. * must call Init() for screen to be updated. */ -void MythUINotificationScreen::UpdateArtwork(const QString &image) +void MythNotificationScreen::UpdateArtwork(const QString &image) { m_imagePath = image; // We need to re-run init @@ -567,7 +567,7 @@ void MythUINotificationScreen::UpdateArtwork(const QString &image) * If metadata update flag is set; a Null string means to leave the text field * unchanged. */ -void MythUINotificationScreen::UpdateMetaData(const DMAP &data) +void MythNotificationScreen::UpdateMetaData(const DMAP &data) { QString tmp; @@ -599,7 +599,7 @@ void MythUINotificationScreen::UpdateMetaData(const DMAP &data) * Update playback position information. * must call Init() for screen to be updated. */ -void MythUINotificationScreen::UpdatePlayback(float progress, const QString &text) +void MythNotificationScreen::UpdatePlayback(float progress, const QString &text) { m_progress = progress; m_progresstext = text; @@ -611,7 +611,7 @@ void MythUINotificationScreen::UpdatePlayback(float progress, const QString &tex * Update Y position of the screen * All children elements will be relocated. */ -void MythUINotificationScreen::AdjustYPosition(void) +void MythNotificationScreen::AdjustYPosition(void) { MythPoint point = m_position; point.setY(m_position.getY().toInt() + (GetHeight() + HGAP) * m_index); @@ -624,7 +624,7 @@ void MythUINotificationScreen::AdjustYPosition(void) m_refresh = true; } -void MythUINotificationScreen::AdjustIndex(int by, bool set) +void MythNotificationScreen::AdjustIndex(int by, bool set) { if (set) { @@ -640,7 +640,7 @@ void MythUINotificationScreen::AdjustIndex(int by, bool set) /** * set index, without recalculating coordinates */ -void MythUINotificationScreen::SetIndex(int index) +void MythNotificationScreen::SetIndex(int index) { if (index != m_index) { @@ -649,19 +649,19 @@ void MythUINotificationScreen::SetIndex(int index) } } -int MythUINotificationScreen::GetHeight(void) +int MythNotificationScreen::GetHeight(void) { return GetArea().getHeight().toInt(); } -void MythUINotificationScreen::ProcessTimer(void) +void MythNotificationScreen::ProcessTimer(void) { LOG(VB_GUI, LOG_DEBUG, LOC + "ProcessTimer()"); // delete screen GetScreenStack()->PopScreen(this, true, true); } -MythUINotificationScreen &MythUINotificationScreen::operator=(const MythUINotificationScreen &s) +MythNotificationScreen &MythNotificationScreen::operator=(const MythNotificationScreen &s) { // check if anything have changed m_refresh = !( @@ -709,7 +709,7 @@ MythUINotificationScreen &MythUINotificationScreen::operator=(const MythUINotifi return *this; } -void MythUINotificationScreen::SetSingleShotTimer(int s, bool update) +void MythNotificationScreen::SetSingleShotTimer(int s, bool update) { // only registered application can display non-expiring notification if (m_id > 0 && s < 0) @@ -730,7 +730,7 @@ void MythUINotificationScreen::SetSingleShotTimer(int s, bool update) } // Public event handling -bool MythUINotificationScreen::keyPressEvent(QKeyEvent *event) +bool MythNotificationScreen::keyPressEvent(QKeyEvent *event) { QStringList actions; bool handled = GetMythMainWindow()->TranslateKeyPress("Global", event, actions); @@ -758,7 +758,7 @@ NCPrivate::NCPrivate() : m_currentId(0) { m_screenStack = new MythNotificationScreenStack(GetMythMainWindow(), - "mythuinotification", + "mythnotificationcenter", this); m_originalScreenStack = m_screenStack; } @@ -796,8 +796,8 @@ NCPrivate::~NCPrivate() */ void NCPrivate::ScreenDeleted(void) { - MythUINotificationScreen *screen = - static_cast(sender()); + MythNotificationScreen *screen = + static_cast(sender()); bool duefordeletion = m_deletedScreens.contains(screen); @@ -845,8 +845,8 @@ void NCPrivate::ScreenDeleted(void) { // don't remove the id from the list, as the application is still registered // re-create the screen - MythUINotificationScreen *newscreen = - new MythUINotificationScreen(m_screenStack, *screen); + MythNotificationScreen *newscreen = + new MythNotificationScreen(m_screenStack, *screen); connect(newscreen, SIGNAL(ScreenDeleted()), this, SLOT(ScreenDeleted())); m_registrations[screen->m_id] = newscreen; // Screen was deleted, add it to suspended list @@ -909,7 +909,7 @@ bool NCPrivate::Queue(const MythNotification ¬ification) // Tell the GUI thread we have new notifications to process QCoreApplication::postEvent( - GetMythMainWindow(), new MythUINotificationCenterEvent()); + GetMythMainWindow(), new MythNotificationCenterEvent()); return true; } @@ -924,7 +924,7 @@ void NCPrivate::ProcessQueue(void) { int id = n->GetId(); bool created = false; - MythUINotificationScreen *screen = NULL; + MythNotificationScreen *screen = NULL; if (id > 0) { @@ -980,20 +980,20 @@ void NCPrivate::ProcessQueue(void) } /** - * CreateScreen will create a MythUINotificationScreen instance. + * CreateScreen will create a MythNotificationScreen instance. * This screen will not be displayed until it is used. */ -MythUINotificationScreen *NCPrivate::CreateScreen(MythNotification *n, int id) +MythNotificationScreen *NCPrivate::CreateScreen(MythNotification *n, int id) { - MythUINotificationScreen *screen; + MythNotificationScreen *screen; if (n) { - screen = new MythUINotificationScreen(m_screenStack, *n); + screen = new MythNotificationScreen(m_screenStack, *n); } else { - screen = new MythUINotificationScreen(m_screenStack, id); + screen = new MythNotificationScreen(m_screenStack, id); } if (!screen->Create()) // Reads screen definition from xml, and constructs screen @@ -1049,12 +1049,12 @@ void NCPrivate::UnRegister(void *from, int id, bool closeimemdiately) // Tell the GUI thread we have something to process QCoreApplication::postEvent( - GetMythMainWindow(), new MythUINotificationCenterEvent()); + GetMythMainWindow(), new MythNotificationCenterEvent()); } void NCPrivate::DeleteAllRegistrations(void) { - QMap::iterator it = m_registrations.begin(); + QMap::iterator it = m_registrations.begin(); for (; it != m_registrations.end(); ++it) { @@ -1071,7 +1071,7 @@ void NCPrivate::DeleteAllScreens(void) // delete all screens waiting to be deleted while(!m_deletedScreens.isEmpty()) { - MythUINotificationScreen *screen = m_deletedScreens.last(); + MythNotificationScreen *screen = m_deletedScreens.last(); // we remove the screen from the list before deleting the screen // so the MythScreenType::Exiting() signal won't process it a second time m_deletedScreens.removeLast(); @@ -1107,7 +1107,7 @@ void NCPrivate::DeleteUnregistered(void) { int id = it.key(); bool closeimemdiately = it.value(); - MythUINotificationScreen *screen = NULL; + MythNotificationScreen *screen = NULL; if (m_registrations.contains(id)) { @@ -1143,10 +1143,10 @@ void NCPrivate::DeleteUnregistered(void) * Insert screen into list of screens. * Returns index in screens list. */ -int NCPrivate::InsertScreen(MythUINotificationScreen *screen) +int NCPrivate::InsertScreen(MythNotificationScreen *screen) { - QList::iterator it = m_screens.begin(); - QList::iterator itend = m_screens.end(); + QList::iterator it = m_screens.begin(); + QList::iterator itend = m_screens.end(); // if (screen->m_id > 0) // { @@ -1172,10 +1172,10 @@ int NCPrivate::InsertScreen(MythUINotificationScreen *screen) * Remove screen from list of screens. * Returns index in screens list. */ -int NCPrivate::RemoveScreen(MythUINotificationScreen *screen) +int NCPrivate::RemoveScreen(MythNotificationScreen *screen) { - QList::iterator it = m_screens.begin(); - QList::iterator itend = m_screens.end(); + QList::iterator it = m_screens.begin(); + QList::iterator itend = m_screens.end(); for (; it != itend; ++it) { @@ -1196,8 +1196,8 @@ int NCPrivate::RemoveScreen(MythUINotificationScreen *screen) */ void NCPrivate::RefreshScreenPosition(int from) { - QList::iterator it = m_screens.begin(); - QList::iterator itend = m_screens.end(); + QList::iterator it = m_screens.begin(); + QList::iterator itend = m_screens.end(); int position = 0; @@ -1239,20 +1239,20 @@ void NCPrivate::GetNotificationScreens(QList &_screens) int position = 0; for (; it != itend; ++it) { - MythUINotificationScreen *screen = - dynamic_cast(*it); + MythNotificationScreen *screen = + dynamic_cast(*it); if (screen) { if ((screen->m_visibility & MythNotification::kPlayback) == 0) continue; - MythUINotificationScreen *newscreen; + MythNotificationScreen *newscreen; if (!m_converted.contains(screen)) { // screen hasn't been created, return it - newscreen = new MythUINotificationScreen(NULL, *screen); + newscreen = new MythNotificationScreen(NULL, *screen); // CreateScreen can never fail, no need to test return value m_converted[screen] = newscreen; } @@ -1297,13 +1297,13 @@ bool NCPrivate::RemoveFirst(void) // The top screen is the only currently displayed first, if there's a // fullscreen notification displayed, it's the last one - MythUINotificationScreen *top = m_screens.front(); - QList::const_iterator it = m_screens.end() - 1; + MythNotificationScreen *top = m_screens.front(); + QList::const_iterator it = m_screens.end() - 1; // loop from last to 2nd for (; it != m_screens.begin(); --it) { - MythUINotificationScreen *s = *it; + MythNotificationScreen *s = *it; if (s->m_fullscreen) { @@ -1320,14 +1320,14 @@ bool NCPrivate::RemoveFirst(void) return true; } -/////////////////////// MythUINotificationCenter +/////////////////////// MythNotificationCenter -MythUINotificationCenter *MythUINotificationCenter::GetInstance(void) +MythNotificationCenter *MythNotificationCenter::GetInstance(void) { return GetNotificationCenter(); } -MythUINotificationCenter::MythUINotificationCenter() +MythNotificationCenter::MythNotificationCenter() : d(new NCPrivate()) { const bool isGuiThread = @@ -1339,7 +1339,7 @@ MythUINotificationCenter::MythUINotificationCenter() } } -MythUINotificationCenter::~MythUINotificationCenter() +MythNotificationCenter::~MythNotificationCenter() { const bool isGuiThread = QThread::currentThread() == QCoreApplication::instance()->thread(); @@ -1353,12 +1353,12 @@ MythUINotificationCenter::~MythUINotificationCenter() d = NULL; } -bool MythUINotificationCenter::Queue(const MythNotification ¬ification) +bool MythNotificationCenter::Queue(const MythNotification ¬ification) { return d->Queue(notification); } -void MythUINotificationCenter::ProcessQueue(void) +void MythNotificationCenter::ProcessQueue(void) { const bool isGuiThread = QThread::currentThread() == QCoreApplication::instance()->thread(); @@ -1372,45 +1372,45 @@ void MythUINotificationCenter::ProcessQueue(void) d->ProcessQueue(); } -int MythUINotificationCenter::Register(void *from) +int MythNotificationCenter::Register(void *from) { return d->Register(from); } -void MythUINotificationCenter::UnRegister(void *from, int id, bool closeimemdiately) +void MythNotificationCenter::UnRegister(void *from, int id, bool closeimemdiately) { d->UnRegister(from, id, closeimemdiately); } -QDateTime MythUINotificationCenter::ScreenExpiryTime(const MythScreenType *screen) +QDateTime MythNotificationCenter::ScreenExpiryTime(const MythScreenType *screen) { - const MythUINotificationScreen *s = - dynamic_cast(screen); + const MythNotificationScreen *s = + dynamic_cast(screen); if (!s) return QDateTime(); return s->m_expiry; } -bool MythUINotificationCenter::ScreenCreated(const MythScreenType *screen) +bool MythNotificationCenter::ScreenCreated(const MythScreenType *screen) { - const MythUINotificationScreen *s = - dynamic_cast(screen); + const MythNotificationScreen *s = + dynamic_cast(screen); if (!s) return true;; return s->m_created; } -void MythUINotificationCenter::GetNotificationScreens(QList &_screens) +void MythNotificationCenter::GetNotificationScreens(QList &_screens) { d->GetNotificationScreens(_screens); } -void MythUINotificationCenter::UpdateScreen(MythScreenType *screen) +void MythNotificationCenter::UpdateScreen(MythScreenType *screen) { - MythUINotificationScreen *s = - dynamic_cast(screen); + MythNotificationScreen *s = + dynamic_cast(screen); if (!s) return; @@ -1421,17 +1421,17 @@ void MythUINotificationCenter::UpdateScreen(MythScreenType *screen) } } -int MythUINotificationCenter::DisplayedNotifications(void) const +int MythNotificationCenter::DisplayedNotifications(void) const { return d->DisplayedNotifications(); } -int MythUINotificationCenter::QueuedNotifications(void) const +int MythNotificationCenter::QueuedNotifications(void) const { return d->QueuedNotifications(); } -bool MythUINotificationCenter::RemoveFirst(void) +bool MythNotificationCenter::RemoveFirst(void) { return d->RemoveFirst(); } @@ -1539,6 +1539,6 @@ void ShowNotification(MythNotification::Type type, n->SetPriority(priority); n->SetVisibility(visibility); - MythUINotificationCenter::GetInstance()->Queue(*n); + MythNotificationCenter::GetInstance()->Queue(*n); delete n; } diff --git a/mythtv/libs/libmythui/mythuinotificationcenter.h b/mythtv/libs/libmythui/mythnotificationcenter.h similarity index 88% rename from mythtv/libs/libmythui/mythuinotificationcenter.h rename to mythtv/libs/libmythui/mythnotificationcenter.h index 232452f8742..165aa54bf41 100644 --- a/mythtv/libs/libmythui/mythuinotificationcenter.h +++ b/mythtv/libs/libmythui/mythnotificationcenter.h @@ -1,5 +1,5 @@ // -// mythuinotificationcenter.h +// mythnotificationcenter.h // MythTV // // Created by Jean-Yves Avenard on 25/06/13. @@ -22,31 +22,31 @@ class MythScreenType; class NCPrivate; -class MUI_PUBLIC MythUINotificationCenterEvent : public MythEvent +class MUI_PUBLIC MythNotificationCenterEvent : public MythEvent { public: - MythUINotificationCenterEvent() : MythEvent(kEventType) { } + MythNotificationCenterEvent() : MythEvent(kEventType) { } static Type kEventType; }; -class MUI_PUBLIC MythUINotificationCenter +class MUI_PUBLIC MythNotificationCenter { public: - MythUINotificationCenter(void); - virtual ~MythUINotificationCenter(); + MythNotificationCenter(void); + virtual ~MythNotificationCenter(); /** * Queue a notification * Queue() is thread-safe and can be called from anywhere. - * Typical use would be MythUINotificationCenter::GetInstance()->Queue(notification) + * Typical use would be MythNotificationCenter::GetInstance()->Queue(notification) */ bool Queue(const MythNotification ¬ification); /** - * returns the MythUINotificationCenter singleton + * returns the MythNotificationCenter singleton */ - static MythUINotificationCenter *GetInstance(void); + static MythNotificationCenter *GetInstance(void); /** * An application can register in which case it will be assigned a @@ -72,12 +72,12 @@ class MUI_PUBLIC MythUINotificationCenter /** * Return when the given screen is going to expire - * will return an invalid QDateTime if screen isn't a MythUINotificationScreen + * will return an invalid QDateTime if screen isn't a MythNotificationScreen */ QDateTime ScreenExpiryTime(const MythScreenType *screen); /** * Return true if ::Create() has been called on screen. - * will always return true should screen not be a MythUINotificationScreen + * will always return true should screen not be a MythNotificationScreen */ bool ScreenCreated(const MythScreenType *screen); /** @@ -87,7 +87,7 @@ class MUI_PUBLIC MythUINotificationCenter */ void GetNotificationScreens(QList &screens); /** - * Will call ::doInit() if the screen is a MythUINotificationScreen and + * Will call ::doInit() if the screen is a MythNotificationScreen and * ::Create() has been called for it already */ void UpdateScreen(MythScreenType *screen); diff --git a/mythtv/libs/libmythui/mythuinotificationcenter_private.h b/mythtv/libs/libmythui/mythnotificationcenter_private.h similarity index 82% rename from mythtv/libs/libmythui/mythuinotificationcenter_private.h rename to mythtv/libs/libmythui/mythnotificationcenter_private.h index a620d845b40..36281edf4df 100644 --- a/mythtv/libs/libmythui/mythuinotificationcenter_private.h +++ b/mythtv/libs/libmythui/mythnotificationcenter_private.h @@ -1,13 +1,13 @@ // -// mythuinotificationcenter_private.h +// mythnotificationcenter_private.h // MythTV // // Created by Jean-Yves Avenard on 30/06/13. // Copyright (c) 2013 Bubblestuff Pty Ltd. All rights reserved. // -#ifndef MythTV_mythuinotificationcenter_private_h -#define MythTV_mythuinotificationcenter_private_h +#ifndef MythTV_mythnotificationcenter_private_h +#define MythTV_mythnotificationcenter_private_h #include #include @@ -21,11 +21,11 @@ #include "mythuiimage.h" #include "mythuitext.h" #include "mythuiprogressbar.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #include "mythuistatetype.h" // Forward declarations -class MythUINotificationScreen; +class MythNotificationScreen; class MythNotificationScreenStack; #define MIN_LIFE 1000 @@ -44,14 +44,14 @@ public slots: /** * Queue a notification * Queue() is thread-safe and can be called from anywhere. - * Typical use would be MythUINotificationCenter::GetInstance()->Queue(notification) + * Typical use would be MythNotificationCenter::GetInstance()->Queue(notification) */ bool Queue(const MythNotification ¬ification); /** - * returns the MythUINotificationCenter singleton + * returns the MythNotificationCenter singleton */ - static MythUINotificationCenter *GetInstance(void); + static MythNotificationCenter *GetInstance(void); /** * An application can register in which case it will be assigned a @@ -77,12 +77,12 @@ public slots: /** * Return when the given screen is going to expire - * will return an invalid QDateTime if screen isn't a MythUINotificationScreen + * will return an invalid QDateTime if screen isn't a MythNotificationScreen */ QDateTime ScreenExpiryTime(const MythScreenType *screen); /** * Return true if ::Create() has been called on screen. - * will always return true should screen not be a MythUINotificationScreen + * will always return true should screen not be a MythNotificationScreen */ bool ScreenCreated(const MythScreenType *screen); /** @@ -92,7 +92,7 @@ public slots: */ void GetNotificationScreens(QList &screens); /** - * Will call ::doInit() if the screen is a MythUINotificationScreen and + * Will call ::doInit() if the screen is a MythNotificationScreen and * ::Create() has been called for it already */ void UpdateScreen(MythScreenType *screen); @@ -120,42 +120,42 @@ public slots: private: - MythUINotificationScreen *CreateScreen(MythNotification *notification, + MythNotificationScreen *CreateScreen(MythNotification *notification, int id = -1); void DeleteAllRegistrations(void); void DeleteAllScreens(void); void DeleteUnregistered(void); - int InsertScreen(MythUINotificationScreen *screen); - int RemoveScreen(MythUINotificationScreen *screen); + int InsertScreen(MythNotificationScreen *screen); + int RemoveScreen(MythNotificationScreen *screen); void RefreshScreenPosition(int from = 0); MythNotificationScreenStack *m_originalScreenStack; MythNotificationScreenStack *m_screenStack; QList m_notifications; - QList m_screens; - QList m_deletedScreens; - QMap m_registrations; + QList m_screens; + QList m_deletedScreens; + QMap m_registrations; QList m_suspended; QMap m_unregistered; QMap m_clients; QMutex m_lock; int m_currentId; - QMap m_converted; + QMap m_converted; }; -class MythUINotificationScreen : public MythScreenType +class MythNotificationScreen : public MythScreenType { Q_OBJECT public: - MythUINotificationScreen(MythScreenStack *stack, + MythNotificationScreen(MythScreenStack *stack, int id = -1); - MythUINotificationScreen(MythScreenStack *stack, + MythNotificationScreen(MythScreenStack *stack, MythNotification ¬ification); - MythUINotificationScreen(MythScreenStack *stack, - const MythUINotificationScreen &screen); + MythNotificationScreen(MythScreenStack *stack, + const MythNotificationScreen &screen); - virtual ~MythUINotificationScreen(); + virtual ~MythNotificationScreen(); bool keyPressEvent(QKeyEvent *event); @@ -190,7 +190,7 @@ class MythUINotificationScreen : public MythScreenType kAll = ~kNone, }; - MythUINotificationScreen &operator=(const MythUINotificationScreen &s); + MythNotificationScreen &operator=(const MythNotificationScreen &s); signals: void ScreenDeleted(); diff --git a/mythtv/libs/libmythui/mythudplistener.cpp b/mythtv/libs/libmythui/mythudplistener.cpp index c81641a94ab..ad8a553632c 100644 --- a/mythtv/libs/libmythui/mythudplistener.cpp +++ b/mythtv/libs/libmythui/mythudplistener.cpp @@ -8,7 +8,7 @@ #include "mythlogging.h" #include "mythmainwindow.h" #include "mythudplistener.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #define LOC QString("UDPListener: ") diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp index ee0fb1d0772..5471216bdd6 100644 --- a/mythtv/programs/mythfrontend/main.cpp +++ b/mythtv/programs/mythfrontend/main.cpp @@ -70,7 +70,7 @@ using namespace std; #include "mythmainwindow.h" #include "mythcontrols.h" #include "mythuihelper.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #include "mythdirs.h" #include "mythdb.h" #include "backendconnectionmanager.h" diff --git a/mythtv/programs/mythfrontend/networkcontrol.cpp b/mythtv/programs/mythfrontend/networkcontrol.cpp index 7be8b985d0e..ffe7cd2f2c6 100644 --- a/mythtv/programs/mythfrontend/networkcontrol.cpp +++ b/mythtv/programs/mythfrontend/networkcontrol.cpp @@ -24,7 +24,7 @@ // libmythui #include "mythmainwindow.h" #include "mythuihelper.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #define LOC QString("NetworkControl: ") #define LOC_ERR QString("NetworkControl Error: ") @@ -1234,7 +1234,7 @@ QString NetworkControl::processNotification(NetworkCommand *nc) QString message = nc->getCommand().remove(0, 12).trimmed(); MythNotification n(message, tr("Network Control")); - MythUINotificationCenter::GetInstance()->Queue(n); + MythNotificationCenter::GetInstance()->Queue(n); return QString("OK"); } diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp index 28acb618b43..e5792496bbc 100644 --- a/mythtv/programs/mythfrontend/playbackbox.cpp +++ b/mythtv/programs/mythfrontend/playbackbox.cpp @@ -23,7 +23,7 @@ #include "recordinginfo.h" #include "recordingrule.h" #include "mythuihelper.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #include "storagegroup.h" #include "mythuibutton.h" #include "mythlogging.h" diff --git a/mythtv/programs/mythfrontend/services/frontend.cpp b/mythtv/programs/mythfrontend/services/frontend.cpp index 5c915d0ed7a..374414dc974 100644 --- a/mythtv/programs/mythfrontend/services/frontend.cpp +++ b/mythtv/programs/mythfrontend/services/frontend.cpp @@ -11,7 +11,7 @@ #include "mythuihelper.h" #include "mythmainwindow.h" #include "tv_play.h" -#include "mythuinotificationcenter.h" +#include "mythnotificationcenter.h" #include "videometadatalistmanager.h" #include "videometadata.h"