Skip to content

Commit

Permalink
Use c++11 initialization. Use m_ for class member names. (libmythtv 7/7)
Browse files Browse the repository at this point in the history 
Convert classes to use use the new c++11 brace initialization style.
Also update class member names (when needed) so that all member names
start with 'm_'.  This makes it easy to distinguish class members.
  • Loading branch information
@linuxdude42
linuxdude42 committed Mar 13, 2019
1 parent 5031035 commit 4049984
Show file tree
Hide file tree
Showing 31 changed files with 1,217 additions and 1,322 deletions.
70 changes: 35 additions & 35 deletions mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
View file
Expand Up @@ -24,62 +24,62 @@ void ScanWizard::SetupConfig(
uint default_sourceid, uint default_cardid,
QString default_inputname)
{
videoSource = new VideoSourceSelector(
m_videoSource = new VideoSourceSelector(
default_sourceid, CardUtil::GetScanableInputTypes(), false);
input = new InputSelector(default_cardid, default_inputname);
scanType = new ScanTypeSetting(),
scanConfig = new ScanOptionalConfig(scanType);
services = new DesiredServices();
ftaOnly = new FreeToAirOnly();
addFullTS = new AddFullTS();
trustEncSI = new TrustEncSISetting();

addChild(services);
addChild(ftaOnly);
addChild(addFullTS);
addChild(trustEncSI);

addChild(videoSource);
addChild(input);
addChild(scanType);
addChild(scanConfig);

connect(videoSource, SIGNAL(valueChanged(const QString&)),
scanConfig, SLOT( SetSourceID( const QString&)));

connect(videoSource, SIGNAL(valueChanged(const QString&)),
input, SLOT( SetSourceID( const QString&)));

connect(input, SIGNAL(valueChanged(const QString&)),
scanType, SLOT( SetInput( const QString&)));

connect(input, SIGNAL(valueChanged(const QString&)),
this, SLOT( SetInput( const QString&)));
m_input = new InputSelector(default_cardid, default_inputname);
m_scanType = new ScanTypeSetting(),
m_scanConfig = new ScanOptionalConfig(m_scanType);
m_services = new DesiredServices();
m_ftaOnly = new FreeToAirOnly();
m_addFullTS = new AddFullTS();
m_trustEncSI = new TrustEncSISetting();

addChild(m_services);
addChild(m_ftaOnly);
addChild(m_addFullTS);
addChild(m_trustEncSI);

addChild(m_videoSource);
addChild(m_input);
addChild(m_scanType);
addChild(m_scanConfig);

connect(m_videoSource, SIGNAL(valueChanged(const QString&)),
m_scanConfig, SLOT( SetSourceID( const QString&)));

connect(m_videoSource, SIGNAL(valueChanged(const QString&)),
m_input, SLOT( SetSourceID( const QString&)));

connect(m_input, SIGNAL(valueChanged(const QString&)),
m_scanType, SLOT( SetInput( const QString&)));

connect(m_input, SIGNAL(valueChanged(const QString&)),
this, SLOT( SetInput( const QString&)));
}

uint ScanWizard::GetSourceID(void) const
{
return videoSource->getValue().toUInt();
return m_videoSource->getValue().toUInt();
}

ServiceRequirements ScanWizard::GetServiceRequirements(void) const
{
return services->GetServiceRequirements();
return m_services->GetServiceRequirements();
}

bool ScanWizard::DoFreeToAirOnly(void) const
{
return ftaOnly->getValue().toInt();
return m_ftaOnly->getValue().toInt();
}

bool ScanWizard::DoAddFullTS(void) const
{
return addFullTS->getValue().toInt();
return m_addFullTS->getValue().toInt();
}

bool ScanWizard::DoTestDecryption(void) const
{
return trustEncSI->getValue().toInt();
return m_trustEncSI->getValue().toInt();
}

////////////////////////////////////////////////////////////////////////////
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythtv/mythccextractorplayer.cpp
View file
Expand Up @@ -658,12 +658,12 @@ void MythCCExtractorPlayer::IngestDVBSubtitles(void)

AVSubtitles *avsubtitles = (*subit).reader->GetAVSubtitles();

QMutexLocker locker(&(avsubtitles->lock));
QMutexLocker locker(&(avsubtitles->m_lock));

while (!avsubtitles->buffers.empty())
while (!avsubtitles->m_buffers.empty())
{
const AVSubtitle subtitle = avsubtitles->buffers.front();
avsubtitles->buffers.pop_front();
const AVSubtitle subtitle = avsubtitles->m_buffers.front();
avsubtitles->m_buffers.pop_front();

const QSize v_size =
QSize(GetVideoSize().width()*4, GetVideoSize().height()*4);
Expand Down
25 changes: 11 additions & 14 deletions mythtv/libs/libmythtv/scanwizard.cpp
View file
Expand Up @@ -33,7 +33,6 @@
#include "channelscanner_gui.h"
#include "scanwizard.h"
#include "sourceutil.h"
#include "cardutil.h"
#include "videosource.h"
#include "scaninfo.h"
#include "channelimporter.h"
Expand All @@ -44,9 +43,7 @@
ScanWizard::ScanWizard(uint default_sourceid,
uint default_cardid,
QString default_inputname) :
lastHWCardID(0),
lastHWCardType(CardUtil::ERROR_PROBE),
scannerPane(new ChannelScannerGUI())
m_scannerPane(new ChannelScannerGUI())
{
SetupConfig(default_sourceid, default_cardid, default_inputname);
ButtonStandardSetting *scanButton = new ButtonStandardSetting(tr("Scan"));
Expand All @@ -71,7 +68,7 @@ void ScanWizard::Scan()

if (scantype == ScanTypeSetting::DVBUtilsImport)
{
scannerPane->ImportDVBUtils(sourceid, lastHWCardType,
m_scannerPane->ImportDVBUtils(sourceid, m_lastHWCardType,
GetFilename());
}
else if (scantype == ScanTypeSetting::NITAddScan_DVBT)
Expand Down Expand Up @@ -102,23 +99,23 @@ void ScanWizard::Scan()
else if (scantype == ScanTypeSetting::IPTVImport)
{
do_scan = false;
scannerPane->ImportM3U(cardid, inputname, sourceid, false);
m_scannerPane->ImportM3U(cardid, inputname, sourceid, false);
}
else if (scantype == ScanTypeSetting::VBoxImport)
{
do_scan = false;
scannerPane->ImportVBox(cardid, inputname, sourceid,
m_scannerPane->ImportVBox(cardid, inputname, sourceid,
DoFreeToAirOnly(),
GetServiceRequirements());
}
else if (scantype == ScanTypeSetting::ExternRecImport)
{
do_scan = false;
scannerPane->ImportExternRecorder(cardid, inputname, sourceid);
m_scannerPane->ImportExternRecorder(cardid, inputname, sourceid);
}
else if (scantype == ScanTypeSetting::IPTVImportMPTS)
{
scannerPane->ImportM3U(cardid, inputname, sourceid, true);
m_scannerPane->ImportM3U(cardid, inputname, sourceid, true);
}
else if ((scantype == ScanTypeSetting::FullScan_ATSC) ||
(scantype == ScanTypeSetting::FullTransportScan) ||
Expand Down Expand Up @@ -175,7 +172,7 @@ void ScanWizard::Scan()
QString table_start, table_end;
GetFrequencyTableRange(table_start, table_end);

scannerPane->Scan(
m_scannerPane->Scan(
GetScanType(), GetCardID(),
GetInputName(), GetSourceID(),
DoIgnoreSignalTimeout(), DoFollowNIT(),
Expand All @@ -199,11 +196,11 @@ void ScanWizard::SetInput(const QString &cardids_inputname)
// Work out what kind of card we've got
// We need to check against the last capture card so that we don't
// try and probe a card which is already open by scan()
if ((lastHWCardID != cardid) ||
(lastHWCardType == CardUtil::ERROR_OPEN))
if ((m_lastHWCardID != cardid) ||
(m_lastHWCardType == CardUtil::ERROR_OPEN))
{
lastHWCardID = cardid;
m_lastHWCardID = cardid;
QString subtype = CardUtil::ProbeSubTypeName(cardid);
lastHWCardType = CardUtil::toInputType(subtype);
m_lastHWCardType = CardUtil::toInputType(subtype);
}
}
49 changes: 25 additions & 24 deletions mythtv/libs/libmythtv/scanwizard.h
View file
Expand Up @@ -35,6 +35,7 @@
// MythTV headers
#include "mythtvexp.h"
#include "mythdbcon.h"
#include "cardutil.h"
#include "standardsettings.h"
#include "scanwizardconfig.h"

Expand All @@ -56,49 +57,49 @@ class MTV_PUBLIC ScanWizard : public GroupSetting
void SetInput(const QString &cardid_inputname);

protected:
uint lastHWCardID;
uint lastHWCardType;
ChannelScannerGUI *scannerPane;
uint m_lastHWCardID {0};
uint m_lastHWCardType {CardUtil::ERROR_PROBE};
ChannelScannerGUI *m_scannerPane {nullptr};

// The following are moved from deleted class ScanWizardConfig
public:
void SetupConfig(uint default_sourceid, uint default_cardid,
QString default_inputname);

uint GetSourceID(void) const;
uint GetScanID(void) const { return scanConfig->GetScanID(); }
QString GetModulation(void) const { return scanConfig->GetModulation(); }
int GetScanType(void) const { return scanType->getValue().toInt();}
uint GetCardID(void) const { return input->GetCardID(); }
QString GetInputName(void) const { return input->GetInputName(); }
QString GetFilename(void) const { return scanConfig->GetFilename(); }
uint GetMultiplex(void) const { return scanConfig->GetMultiplex(); }
uint GetScanID(void) const { return m_scanConfig->GetScanID(); }
QString GetModulation(void) const { return m_scanConfig->GetModulation(); }
int GetScanType(void) const { return m_scanType->getValue().toInt();}
uint GetCardID(void) const { return m_input->GetCardID(); }
QString GetInputName(void) const { return m_input->GetInputName(); }
QString GetFilename(void) const { return m_scanConfig->GetFilename(); }
uint GetMultiplex(void) const { return m_scanConfig->GetMultiplex(); }
bool GetFrequencyTableRange(QString &start, QString &end) const
{ return scanConfig->GetFrequencyTableRange(start, end); }
{ return m_scanConfig->GetFrequencyTableRange(start, end); }
QString GetFrequencyStandard(void) const
{ return scanConfig->GetFrequencyStandard(); }
{ return m_scanConfig->GetFrequencyStandard(); }
QString GetFrequencyTable(void) const
{ return scanConfig->GetFrequencyTable(); }
{ return m_scanConfig->GetFrequencyTable(); }
QMap<QString,QString> GetStartChan(void) const
{ return scanConfig->GetStartChan(); }
{ return m_scanConfig->GetStartChan(); }
ServiceRequirements GetServiceRequirements(void) const;
bool DoIgnoreSignalTimeout(void) const
{ return scanConfig->DoIgnoreSignalTimeout(); }
{ return m_scanConfig->DoIgnoreSignalTimeout(); }
bool DoFollowNIT(void) const
{ return scanConfig->DoFollowNIT(); }
{ return m_scanConfig->DoFollowNIT(); }
bool DoFreeToAirOnly(void) const;
bool DoAddFullTS(void) const;
bool DoTestDecryption(void) const;

protected:
VideoSourceSelector *videoSource;
InputSelector *input;
ScanTypeSetting *scanType;
ScanOptionalConfig *scanConfig;
DesiredServices *services;
FreeToAirOnly *ftaOnly;
AddFullTS *addFullTS;
TrustEncSISetting *trustEncSI;
VideoSourceSelector *m_videoSource {nullptr};
InputSelector *m_input {nullptr};
ScanTypeSetting *m_scanType {nullptr};
ScanOptionalConfig *m_scanConfig {nullptr};
DesiredServices *m_services {nullptr};
FreeToAirOnly *m_ftaOnly {nullptr};
AddFullTS *m_addFullTS {nullptr};
TrustEncSISetting *m_trustEncSI {nullptr};
// End of members moved from ScanWizardConfig
};

Expand Down

0 comments on commit 4049984

Please sign in to comment.