Skip to content

Commit

Permalink
Change argument order for ShowNotificationX
Browse files Browse the repository at this point in the history 
visibility is a field that is going to be more used than priority.

Also, initialise class member in constructor (they would have been initialized in SetNotification()). Coverity #1046928
  • Loading branch information
@jyavenard
jyavenard committed Jul 12, 2013
1 parent ae5ec36 commit f74eca3
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 40 deletions.
20 changes: 13 additions & 7 deletions mythtv/libs/libmythui/mythuinotificationcenter.cpp
View file
Expand Up @@ -46,7 +46,9 @@ MythUINotificationScreen::MythUINotificationScreen(MythScreenStack *stack,
m_created(false), m_content(kNone), m_update(kAll),
m_artworkImage(NULL), m_titleText(NULL), m_originText(NULL),
m_descriptionText(NULL), m_extraText(NULL), m_progresstextText(NULL),
m_progressBar(NULL), m_index(0), m_timer(new QTimer(this))
m_progressBar(NULL), m_index(0), m_timer(new QTimer(this)),
m_visibility(MythNotification::kAll),
m_priority(MythNotification::kDefault)
{
// Set timer if need be
SetSingleShotTimer(m_duration);
Expand All @@ -62,7 +64,9 @@ MythUINotificationScreen::MythUINotificationScreen(MythScreenStack *stack,
m_update(kAll),
m_artworkImage(NULL), m_titleText(NULL), m_originText(NULL),
m_descriptionText(NULL), m_extraText(NULL), m_progresstextText(NULL),
m_progressBar(NULL), m_index(0), m_timer(new QTimer(this))
m_progressBar(NULL), m_index(0), m_timer(new QTimer(this)),
m_visibility(MythNotification::kAll),
m_priority(MythNotification::kDefault)
{
SetNotification(notification);
connect(m_timer, SIGNAL(timeout()), this, SLOT(ProcessTimer()));
Expand All @@ -76,7 +80,9 @@ MythUINotificationScreen::MythUINotificationScreen(MythScreenStack *stack,
m_created(false), m_content(kNone), m_update(kAll),
m_artworkImage(NULL), m_titleText(NULL), m_originText(NULL),
m_descriptionText(NULL), m_extraText(NULL), m_progresstextText(NULL),
m_progressBar(NULL), m_timer(new QTimer(this))
m_progressBar(NULL), m_timer(new QTimer(this)),
m_visibility(MythNotification::kAll),
m_priority(MythNotification::kDefault)
{
*this = s;
connect(m_timer, SIGNAL(timeout()), this, SLOT(ProcessTimer()));
Expand Down Expand Up @@ -1164,8 +1170,8 @@ bool MythUINotificationCenter::RemoveFirst(void)
void ShowNotificationError(const QString &msg,
const QString &from,
const QString &detail,
const PNMask priority,
const VNMask visibility)
const VNMask visibility,
const MythNotification::Priority priority)
{
MythErrorNotification n(msg, from, detail);
n.SetPriority(priority);
Expand All @@ -1177,8 +1183,8 @@ void ShowNotificationError(const QString &msg,
void ShowNotification(const QString &msg,
const QString &from,
const QString &detail,
const PNMask priority,
const VNMask visibility)
const VNMask visibility,
const MythNotification::Priority priority)
{
MythNotification n(msg, from, detail);
n.SetPriority(priority);
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythui/mythuinotificationcenter.h
View file
Expand Up @@ -121,13 +121,13 @@ class MUI_PUBLIC MythUINotificationCenter
MUI_PUBLIC void ShowNotificationError(const QString &msg,
const QString &from = QString(),
const QString &detail = QString(),
const PNMask priority = MythNotification::kDefault,
const VNMask visibility = MythNotification::kAll);
const VNMask visibility = MythNotification::kAll,
const MythNotification::Priority priority = MythNotification::kDefault);

MUI_PUBLIC void ShowNotification(const QString &msg,
const QString &from = QString(),
const QString &detail = QString(),
const PNMask priority = MythNotification::kDefault,
const VNMask visibility = MythNotification::kAll);
const VNMask visibility = MythNotification::kAll,
const MythNotification::Priority priority = MythNotification::kDefault);

#endif /* defined(__MythTV__mythnotifications__) */
58 changes: 29 additions & 29 deletions mythtv/libs/libmythui/mythuinotificationcenter_private.h
View file
Expand Up @@ -195,35 +195,35 @@ public slots:
void ProcessTimer(void);

public:
int m_id;
QImage m_image;
QString m_imagePath;
QString m_title;
QString m_origin;
QString m_description;
QString m_extra;
int m_duration;
float m_progress;
QString m_progresstext;
bool m_fullscreen;
bool m_added;
bool m_created;
uint32_t m_content;
uint32_t m_update;
MythUIImage *m_artworkImage;
MythUIText *m_titleText;
MythUIText *m_originText;
MythUIText *m_descriptionText;
MythUIText *m_extraText;
MythUIText *m_progresstextText;
MythUIProgressBar *m_progressBar;
QDateTime m_creation, m_expiry;
int m_index;
MythPoint m_position;
QTimer *m_timer;
QString m_style;
VNMask m_visibility;
PNMask m_priority;
int m_id;
QImage m_image;
QString m_imagePath;
QString m_title;
QString m_origin;
QString m_description;
QString m_extra;
int m_duration;
float m_progress;
QString m_progresstext;
bool m_fullscreen;
bool m_added;
bool m_created;
uint32_t m_content;
uint32_t m_update;
MythUIImage *m_artworkImage;
MythUIText *m_titleText;
MythUIText *m_originText;
MythUIText *m_descriptionText;
MythUIText *m_extraText;
MythUIText *m_progresstextText;
MythUIProgressBar *m_progressBar;
QDateTime m_creation, m_expiry;
int m_index;
MythPoint m_position;
QTimer *m_timer;
QString m_style;
VNMask m_visibility;
MythNotification::Priority m_priority;
};

//// class MythScreenNotificationStack
Expand Down

0 comments on commit f74eca3

Please sign in to comment.