[SCM] kodi-pvr-hts/master: prefix all member fields with m_
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Wed Mar 2 23:01:44 UTC 2016
The following commit has been merged in the master branch:
commit 58e89d644eaf5082b7490d6476be8154b8eb437a
Author: Sam Stenvall <neggelandia at gmail.com>
Date: Sun Jul 26 20:32:59 2015 +0300
prefix all member fields with m_
diff --git a/src/tvheadend/entity/Channel.h b/src/tvheadend/entity/Channel.h
index 471a88a..3849cee 100644
--- a/src/tvheadend/entity/Channel.h
+++ b/src/tvheadend/entity/Channel.h
@@ -42,27 +42,27 @@ namespace tvheadend
{
public:
Channel() :
- num(0),
- numMinor(0),
- radio(false),
- caid(0)
+ m_num(0),
+ m_numMinor(0),
+ m_radio(false),
+ m_caid(0)
{
}
bool operator<(const Channel &right) const
{
- return num < right.num;
+ return m_num < right.m_num;
}
bool operator==(const Channel &other) const
{
return m_id == other.m_id &&
- num == other.num &&
- numMinor == other.numMinor &&
- radio == other.radio &&
- caid == other.caid &&
- name == other.name &&
- icon == other.icon;
+ m_num == other.m_num &&
+ m_numMinor == other.m_numMinor &&
+ m_radio == other.m_radio &&
+ m_caid == other.m_caid &&
+ m_name == other.m_name &&
+ m_icon == other.m_icon;
}
bool operator!=(const Channel &other) const
@@ -70,31 +70,31 @@ namespace tvheadend
return !(this == &other);
}
- uint32_t GetNum() const { return num; }
- void SetNum(uint32_t num) { this->num = num; }
+ uint32_t GetNum() const { return m_num; }
+ void SetNum(uint32_t num) { m_num = num; }
- uint32_t GetNumMinor() const { return numMinor; }
- void SetNumMinor(uint32_t numMinor) { this->numMinor = numMinor; }
+ uint32_t GetNumMinor() const { return m_numMinor; }
+ void SetNumMinor(uint32_t numMinor) { m_numMinor = numMinor; }
- bool IsRadio() const { return radio; }
- void SetRadio(bool radio) { this->radio = radio; }
+ bool IsRadio() const { return m_radio; }
+ void SetRadio(bool radio) { m_radio = radio; }
- uint32_t GetCaid() const { return caid; }
- void SetCaid(uint32_t caid) { this->caid = caid; }
+ uint32_t GetCaid() const { return m_caid; }
+ void SetCaid(uint32_t caid) { m_caid = caid; }
- const std::string& GetName() const { return name; }
- void SetName(const std::string &name) { this->name = name; }
+ const std::string& GetName() const { return m_name; }
+ void SetName(const std::string &name) { m_name = name; }
- const std::string& GetIcon() const { return icon; }
- void SetIcon(const std::string &icon) { this->icon = icon; }
+ const std::string& GetIcon() const { return m_icon; }
+ void SetIcon(const std::string &icon) { m_icon = icon; }
private:
- uint32_t num;
- uint32_t numMinor;
- bool radio;
- uint32_t caid;
- std::string name;
- std::string icon;
+ uint32_t m_num;
+ uint32_t m_numMinor;
+ bool m_radio;
+ uint32_t m_caid;
+ std::string m_name;
+ std::string m_icon;
};
}
}
\ No newline at end of file
diff --git a/src/tvheadend/entity/Event.h b/src/tvheadend/entity/Event.h
index 7854f3f..5db11ed 100644
--- a/src/tvheadend/entity/Event.h
+++ b/src/tvheadend/entity/Event.h
@@ -41,41 +41,41 @@ namespace tvheadend
{
public:
Event() :
- next(0),
- channel(0),
- content(0),
- start(0),
- stop(0),
- stars(0),
- age(0),
- aired(0),
- season(0),
- episode(0),
- part(0),
- recordingId(0)
+ m_next(0),
+ m_channel(0),
+ m_content(0),
+ m_start(0),
+ m_stop(0),
+ m_stars(0),
+ m_age(0),
+ m_aired(0),
+ m_season(0),
+ m_episode(0),
+ m_part(0),
+ m_recordingId(0)
{
}
bool operator==(const Event &other) const
{
return m_id == other.m_id &&
- next == other.next &&
- channel == other.channel &&
- content == other.content &&
- start == other.start &&
- stop == other.stop &&
- stars == other.stars &&
- age == other.age &&
- aired == other.aired &&
- season == other.season &&
- episode == other.episode &&
- part == other.part &&
- title == other.title &&
- subtitle == other.subtitle &&
- desc == other.desc &&
- summary == other.summary &&
- image == other.image &&
- recordingId == other.recordingId;
+ m_next == other.m_next &&
+ m_channel == other.m_channel &&
+ m_content == other.m_content &&
+ m_start == other.m_start &&
+ m_stop == other.m_stop &&
+ m_stars == other.m_stars &&
+ m_age == other.m_age &&
+ m_aired == other.m_aired &&
+ m_season == other.m_season &&
+ m_episode == other.m_episode &&
+ m_part == other.m_part &&
+ m_title == other.m_title &&
+ m_subtitle == other.m_subtitle &&
+ m_desc == other.m_desc &&
+ m_summary == other.m_summary &&
+ m_image == other.m_image &&
+ m_recordingId == other.m_recordingId;
}
bool operator!=(const Event &other) const
@@ -83,76 +83,76 @@ namespace tvheadend
return !(this == &other);
}
- uint32_t GetNext() const { return next; }
- void SetNext(uint32_t next) { this->next = next; }
+ uint32_t GetNext() const { return m_next; }
+ void SetNext(uint32_t next) { m_next = next; }
- uint32_t GetChannel() const { return channel; }
- void SetChannel(uint32_t channel) { this->channel = channel; }
+ uint32_t GetChannel() const { return m_channel; }
+ void SetChannel(uint32_t channel) { m_channel = channel; }
- uint32_t GetContent() const { return content; }
- void SetContent(uint32_t content) { this->content = content; }
+ uint32_t GetContent() const { return m_content; }
+ void SetContent(uint32_t content) { m_content = content; }
- time_t GetStart() const { return start; }
- void SetStart(time_t start) { this->start = start; }
+ time_t GetStart() const { return m_start; }
+ void SetStart(time_t start) { m_start = start; }
- time_t GetStop() const { return stop; }
- void SetStop(time_t stop) { this->stop = stop; }
+ time_t GetStop() const { return m_stop; }
+ void SetStop(time_t stop) { m_stop = stop; }
- uint32_t GetStars() const { return stars; }
- void SetStars(uint32_t stars) { this->stars = stars; }
+ uint32_t GetStars() const { return m_stars; }
+ void SetStars(uint32_t stars) { m_stars = stars; }
- uint32_t GetAge() const { return age; }
- void SetAge(uint32_t age) { this->age = age; }
+ uint32_t GetAge() const { return m_age; }
+ void SetAge(uint32_t age) { m_age = age; }
- time_t GetAired() const { return aired; }
- void SetAired(time_t aired) { this->aired = aired; }
+ time_t GetAired() const { return m_aired; }
+ void SetAired(time_t aired) { m_aired = aired; }
- uint32_t GetSeason() const { return season; }
- void SetSeason(uint32_t season) { this->season = season; }
+ uint32_t GetSeason() const { return m_season; }
+ void SetSeason(uint32_t season) { m_season = season; }
- uint32_t GetEpisode() const { return episode; }
- void SetEpisode(uint32_t episode) { this->episode = episode; }
+ uint32_t GetEpisode() const { return m_episode; }
+ void SetEpisode(uint32_t episode) { m_episode = episode; }
- uint32_t GetPart() const { return part; }
- void SetPart(uint32_t part) { this->part = part; }
+ uint32_t GetPart() const { return m_part; }
+ void SetPart(uint32_t part) { m_part = part; }
- const std::string& GetTitle() const { return title; }
- void SetTitle(const std::string &title) { this->title = title; }
+ const std::string& GetTitle() const { return m_title; }
+ void SetTitle(const std::string &title) { m_title = title; }
- const std::string& GetSubtitle() const { return subtitle; }
- void SetSubtitle(const std::string &subtitle) { this->subtitle = subtitle; }
+ const std::string& GetSubtitle() const { return m_subtitle; }
+ void SetSubtitle(const std::string &subtitle) { m_subtitle = subtitle; }
// TODO: Rename to GetDescription to match Recording
- const std::string& GetDesc() const { return desc; }
- void SetDesc(const std::string &desc) { this->desc = desc; }
+ const std::string& GetDesc() const { return m_desc; }
+ void SetDesc(const std::string &desc) { m_desc = desc; }
- const std::string& GetSummary() const { return summary; }
- void SetSummary(const std::string &summary) { this->summary = summary; }
+ const std::string& GetSummary() const { return m_summary; }
+ void SetSummary(const std::string &summary) { m_summary = summary; }
- const std::string& GetImage() const { return image; }
- void SetImage(const std::string &image) { this->image = image; }
+ const std::string& GetImage() const { return m_image; }
+ void SetImage(const std::string &image) { m_image = image; }
- uint32_t GetRecordingId() const { return recordingId; }
- void SetRecordingId(uint32_t recordingId) { this->recordingId = recordingId; }
+ uint32_t GetRecordingId() const { return m_recordingId; }
+ void SetRecordingId(uint32_t recordingId) { m_recordingId = recordingId; }
private:
- uint32_t next;
- uint32_t channel;
- uint32_t content;
- time_t start;
- time_t stop;
- uint32_t stars; /* 1 - 5 */
- uint32_t age; /* years */
- time_t aired;
- uint32_t season;
- uint32_t episode;
- uint32_t part;
- std::string title;
- std::string subtitle; /* episode name */
- std::string desc;
- std::string summary;
- std::string image;
- uint32_t recordingId;
+ uint32_t m_next;
+ uint32_t m_channel;
+ uint32_t m_content;
+ time_t m_start;
+ time_t m_stop;
+ uint32_t m_stars; /* 1 - 5 */
+ uint32_t m_age; /* years */
+ time_t m_aired;
+ uint32_t m_season;
+ uint32_t m_episode;
+ uint32_t m_part;
+ std::string m_title;
+ std::string m_subtitle; /* episode name */
+ std::string m_desc;
+ std::string m_summary;
+ std::string m_image;
+ uint32_t m_recordingId;
};
}
}
diff --git a/src/tvheadend/entity/Recording.h b/src/tvheadend/entity/Recording.h
index edae620..746cd48 100644
--- a/src/tvheadend/entity/Recording.h
+++ b/src/tvheadend/entity/Recording.h
@@ -52,36 +52,36 @@ namespace tvheadend
{
public:
Recording() :
- channel(0),
- eventId(0),
- start(0),
- stop(0),
- startExtra(0),
- stopExtra(0),
- state(PVR_TIMER_STATE_ERROR),
- retention(99), // Kodi default - "99 days"
- priority(50) // Kodi default - "normal"
+ m_channel(0),
+ m_eventId(0),
+ m_start(0),
+ m_stop(0),
+ m_startExtra(0),
+ m_stopExtra(0),
+ m_state(PVR_TIMER_STATE_ERROR),
+ m_retention(99), // Kodi default - "99 days"
+ m_priority(50) // Kodi default - "normal"
{
}
bool operator==(const Recording &other) const
{
return m_id == other.m_id &&
- channel == other.channel &&
- eventId == other.eventId &&
- start == other.start &&
- stop == other.stop &&
- startExtra == other.startExtra &&
- stopExtra == other.stopExtra &&
- title == other.title &&
- path == other.path &&
- description == other.description &&
- timerecId == other.timerecId &&
- autorecId == other.autorecId &&
- state == other.state &&
- error == other.error &&
- retention == other.retention &&
- priority == other.priority;
+ m_channel == other.m_channel &&
+ m_eventId == other.m_eventId &&
+ m_start == other.m_start &&
+ m_stop == other.m_stop &&
+ m_startExtra == other.m_startExtra &&
+ m_stopExtra == other.m_stopExtra &&
+ m_title == other.m_title &&
+ m_path == other.m_path &&
+ m_description == other.m_description &&
+ m_timerecId == other.m_timerecId &&
+ m_autorecId == other.m_autorecId &&
+ m_state == other.m_state &&
+ m_error == other.m_error &&
+ m_retention == other.m_retention &&
+ m_priority == other.m_priority;
}
bool operator!=(const Recording &other) const
@@ -91,15 +91,15 @@ namespace tvheadend
bool IsRecording() const
{
- return state == PVR_TIMER_STATE_COMPLETED ||
- state == PVR_TIMER_STATE_ABORTED ||
- state == PVR_TIMER_STATE_RECORDING;
+ return m_state == PVR_TIMER_STATE_COMPLETED ||
+ m_state == PVR_TIMER_STATE_ABORTED ||
+ m_state == PVR_TIMER_STATE_RECORDING;
}
bool IsTimer() const
{
- return state == PVR_TIMER_STATE_SCHEDULED ||
- state == PVR_TIMER_STATE_RECORDING;
+ return m_state == PVR_TIMER_STATE_SCHEDULED ||
+ m_state == PVR_TIMER_STATE_RECORDING;
}
/**
@@ -107,81 +107,81 @@ namespace tvheadend
*/
unsigned int GetTimerType() const
{
- if (!timerecId.empty())
+ if (!m_timerecId.empty())
return TIMER_ONCE_CREATED_BY_TIMEREC;
- else if (!autorecId.empty())
+ else if (!m_autorecId.empty())
return TIMER_ONCE_CREATED_BY_AUTOREC;
- else if (eventId != 0)
+ else if (m_eventId != 0)
return TIMER_ONCE_EPG;
else
return TIMER_ONCE_MANUAL;
}
- uint32_t GetChannel() const { return channel; }
- void SetChannel(uint32_t channel) { this->channel = channel; }
+ uint32_t GetChannel() const { return m_channel; }
+ void SetChannel(uint32_t channel) { m_channel = channel; }
- uint32_t GetEventId() const { return eventId; }
- void SetEventId(uint32_t eventId) { this->eventId = eventId; }
+ uint32_t GetEventId() const { return m_eventId; }
+ void SetEventId(uint32_t eventId) { m_eventId = eventId; }
// TODO: Change to time_t
- int64_t GetStart() const { return start; }
- void SetStart(int64_t start) { this->start = start; }
+ int64_t GetStart() const { return m_start; }
+ void SetStart(int64_t start) { m_start = start; }
// TODO: Change to time_t
- int64_t GetStop() const { return stop; }
- void SetStop(int64_t stop) { this->stop = stop; }
+ int64_t GetStop() const { return m_stop; }
+ void SetStop(int64_t stop) { m_stop = stop; }
// TODO: Change to time_t
- int64_t GetStartExtra() const { return startExtra; }
- void SetStartExtra(int64_t startExtra) { this->startExtra = startExtra; }
+ int64_t GetStartExtra() const { return m_startExtra; }
+ void SetStartExtra(int64_t startExtra) { m_startExtra = startExtra; }
// TODO: Change to time_t
- int64_t GetStopExtra() const { return stopExtra; }
- void SetStopExtra(int64_t stopExtra) { this->stopExtra = stopExtra; }
+ int64_t GetStopExtra() const { return m_stopExtra; }
+ void SetStopExtra(int64_t stopExtra) { m_stopExtra = stopExtra; }
- const std::string& GetTitle() const { return title; }
- void SetTitle(const std::string &title) { this->title = title; }
+ const std::string& GetTitle() const { return m_title; }
+ void SetTitle(const std::string &title) { m_title = title; }
- const std::string& GetPath() const { return path; }
- void SetPath(const std::string &path) { this->path = path; }
+ const std::string& GetPath() const { return m_path; }
+ void SetPath(const std::string &path) { m_path = path; }
- const std::string& GetDescription() const { return description; }
- void SetDescription(const std::string &description) { this->description = description; }
+ const std::string& GetDescription() const { return m_description; }
+ void SetDescription(const std::string &description) { m_description = description; }
- const std::string& GetTimerecId() const { return autorecId; }
- void SetTimerecId(const std::string &autorecId) { this->autorecId = autorecId; }
+ const std::string& GetTimerecId() const { return m_autorecId; }
+ void SetTimerecId(const std::string &autorecId) { m_autorecId = autorecId; }
- const std::string& GetAutorecId() const { return title; }
- void SetAutorecId(const std::string &title) { this->title = title; }
+ const std::string& GetAutorecId() const { return m_title; }
+ void SetAutorecId(const std::string &title) { m_title = title; }
- PVR_TIMER_STATE GetState() const { return state; }
- void SetState(const PVR_TIMER_STATE &state) { this->state = state; }
+ PVR_TIMER_STATE GetState() const { return m_state; }
+ void SetState(const PVR_TIMER_STATE &state) { m_state = state; }
- const std::string& GetError() const { return error; }
- void SetError(const std::string &error) { this->error = error; }
+ const std::string& GetError() const { return m_error; }
+ void SetError(const std::string &error) { m_error = error; }
- uint32_t GetRetention() const { return retention; }
- void SetRetention(uint32_t retention) { this->retention = retention; }
+ uint32_t GetRetention() const { return m_retention; }
+ void SetRetention(uint32_t retention) { m_retention = retention; }
- uint32_t GetPriority() const { return priority; }
- void SetPriority(uint32_t priority) { this->priority = priority; }
+ uint32_t GetPriority() const { return m_priority; }
+ void SetPriority(uint32_t priority) { m_priority = priority; }
private:
- uint32_t channel;
- uint32_t eventId;
- int64_t start;
- int64_t stop;
- int64_t startExtra;
- int64_t stopExtra;
- std::string title;
- std::string path;
- std::string description;
- std::string timerecId;
- std::string autorecId;
- PVR_TIMER_STATE state;
- std::string error;
- uint32_t retention;
- uint32_t priority;
+ uint32_t m_channel;
+ uint32_t m_eventId;
+ int64_t m_start;
+ int64_t m_stop;
+ int64_t m_startExtra;
+ int64_t m_stopExtra;
+ std::string m_title;
+ std::string m_path;
+ std::string m_description;
+ std::string m_timerecId;
+ std::string m_autorecId;
+ PVR_TIMER_STATE m_state;
+ std::string m_error;
+ uint32_t m_retention;
+ uint32_t m_priority;
};
}
}
diff --git a/src/tvheadend/entity/Schedule.cpp b/src/tvheadend/entity/Schedule.cpp
index b43d469..6a61c9a 100644
--- a/src/tvheadend/entity/Schedule.cpp
+++ b/src/tvheadend/entity/Schedule.cpp
@@ -28,7 +28,7 @@ void Schedule::SetDirty(bool dirty)
Entity::SetDirty(dirty);
// Mark all events as dirty too
- for (auto &entry : events)
+ for (auto &entry : m_events)
entry.second.SetDirty(dirty);
}
@@ -36,7 +36,7 @@ Segment Schedule::GetSegment(time_t startTime, time_t endTime) const
{
Segment segment;
- for (const auto &entry : events)
+ for (const auto &entry : m_events)
{
const Event &event = entry.second;
@@ -49,5 +49,5 @@ Segment Schedule::GetSegment(time_t startTime, time_t endTime) const
Events& Schedule::GetEvents()
{
- return events;
+ return m_events;
}
diff --git a/src/tvheadend/entity/Schedule.h b/src/tvheadend/entity/Schedule.h
index 46d5997..533d3a6 100644
--- a/src/tvheadend/entity/Schedule.h
+++ b/src/tvheadend/entity/Schedule.h
@@ -55,7 +55,7 @@ namespace tvheadend
Events& GetEvents();
private:
- Events events;
+ Events m_events;
};
}
}
\ No newline at end of file
--
kodi-pvr-hts packaging
More information about the pkg-multimedia-commits
mailing list