Skip to content

Commit

Permalink
tidy: Fix some class member naming. (libmythtv/channelscan)
Browse files Browse the repository at this point in the history 
The clang-tidy "identifier naming" checker pointed out a few places
where class member function names don't use the convention of starting
with 'm_' and then using camelBack case for the rest of the variable
name.  Fix these for naming consistency across the code base.

https://clang.llvm.org/extra/clang-tidy/checks/readability-identifier-naming.html
  • Loading branch information
@linuxdude42
linuxdude42 committed Jul 27, 2020
1 parent 5f80a90 commit 6ba946c
Show file tree
Hide file tree
Showing 14 changed files with 129 additions and 130 deletions.
18 changes: 9 additions & 9 deletions mythtv/libs/libmythtv/channelscan/channelscanner.cpp
View file
Expand Up @@ -92,11 +92,11 @@ void ChannelScanner::Teardown(void)
#endif

#if !defined( USING_MINGW ) && !defined( _MSC_VER )
if (m_ExternRecScanner)
if (m_externRecScanner)
{
m_ExternRecScanner->Stop();
delete m_ExternRecScanner;
m_ExternRecScanner = nullptr;
m_externRecScanner->Stop();
delete m_externRecScanner;
m_externRecScanner = nullptr;
}
#endif

Expand Down Expand Up @@ -242,7 +242,7 @@ void ChannelScanner::Scan(
}
else if (ScanTypeSetting::IPTVImportMPTS == scantype)
{
if (m_iptv_channels.empty())
if (m_iptvChannels.empty())
{
LOG(VB_CHANSCAN, LOG_INFO, LOC + "IPTVImportMPTS: no channels");
}
Expand All @@ -251,7 +251,7 @@ void ChannelScanner::Scan(
LOG(VB_CHANSCAN, LOG_INFO, LOC +
QString("ScanIPTVChannels(%1) IPTV MPTS").arg(sourceid));

if ((ok = m_sigmonScanner->ScanIPTVChannels(sourceid, m_iptv_channels)))
if ((ok = m_sigmonScanner->ScanIPTVChannels(sourceid, m_iptvChannels)))
m_scanMonitor->ScanPercentComplete(0);
else
{
Expand Down Expand Up @@ -349,7 +349,7 @@ bool ChannelScanner::ImportM3U(uint cardid, const QString &inputname,
m_iptvScanner->Scan();

if (is_mpts)
m_iptv_channels = m_iptvScanner->GetChannels();
m_iptvChannels = m_iptvScanner->GetChannels();

return true;
}
Expand Down Expand Up @@ -386,14 +386,14 @@ bool ChannelScanner::ImportExternRecorder(uint cardid, const QString &inputname,
m_scanMonitor = new ScanMonitor(this);

// Create a External Recorder Channel Fetcher
m_ExternRecScanner = new ExternRecChannelScanner(cardid,
m_externRecScanner = new ExternRecChannelScanner(cardid,
inputname,
sourceid,
m_scanMonitor);

MonitorProgress(false, false, false, false);

m_ExternRecScanner->Scan();
m_externRecScanner->Scan();

return true;
#else
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/channelscan/channelscanner.h
View file
Expand Up @@ -126,14 +126,14 @@ class MTV_PUBLIC ChannelScanner

/// imported channels
DTVChannelList m_channels;
fbox_chan_map_t m_iptv_channels;
fbox_chan_map_t m_iptvChannels;

// vbox support
#ifdef USING_VBOX
VBoxChannelFetcher *m_vboxScanner {nullptr};
#endif
#if !defined( USING_MINGW ) && !defined( _MSC_VER )
ExternRecChannelScanner *m_ExternRecScanner {nullptr};
ExternRecChannelScanner *m_externRecScanner {nullptr};
#endif

/// Only fta channels desired post scan?
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/channelscan/channelscanner_gui.cpp
View file
Expand Up @@ -87,7 +87,7 @@ void ChannelScannerGUI::HandleEvent(const ScannerEvent *scanEvent)
success |= (m_vboxScanner != nullptr);
#endif
#if !defined( USING_MINGW ) && !defined( _MSC_VER )
success |= (m_ExternRecScanner != nullptr);
success |= (m_externRecScanner != nullptr);
#endif

Teardown();
Expand Down
16 changes: 8 additions & 8 deletions mythtv/libs/libmythtv/channelscan/paneall.h
View file
Expand Up @@ -37,24 +37,24 @@ class PaneAll : public GroupSetting
{
public:
PaneAll(const QString &target, StandardSetting *setting) :
m_ignore_signal_timeout(new IgnoreSignalTimeout()),
m_follow_nit(new FollowNITSetting())
m_ignoreSignalTimeout(new IgnoreSignalTimeout()),
m_followNit(new FollowNITSetting())
{
setVisible(false);
setting->addTargetedChildren(target,
{this,
m_ignore_signal_timeout,
m_follow_nit});
m_ignoreSignalTimeout,
m_followNit});
}

bool ignoreSignalTimeout(void) const
{ return m_ignore_signal_timeout->getValue().toInt() != 0; }
{ return m_ignoreSignalTimeout->getValue().toInt() != 0; }
bool GetFollowNIT(void) const
{ return m_follow_nit->getValue().toInt() != 0; }
{ return m_followNit->getValue().toInt() != 0; }

protected:
IgnoreSignalTimeout *m_ignore_signal_timeout {nullptr};
FollowNITSetting *m_follow_nit {nullptr};
IgnoreSignalTimeout *m_ignoreSignalTimeout {nullptr};
FollowNITSetting *m_followNit {nullptr};
};

#endif // PANE_ALL_H
8 changes: 4 additions & 4 deletions mythtv/libs/libmythtv/channelscan/paneanalog.cpp
View file
Expand Up @@ -7,18 +7,18 @@
#include "videosource.h"

PaneAnalog::PaneAnalog(const QString &target, StandardSetting *setting) :
m_freq_table(new TransFreqTableSelector(0))
m_freqTable(new TransFreqTableSelector(0))
{
setVisible(false);
setting->addTargetedChildren(target, {this, m_freq_table});
setting->addTargetedChildren(target, {this, m_freqTable});
}

void PaneAnalog::SetSourceID(uint sourceid)
{
m_freq_table->SetSourceID(sourceid);
m_freqTable->SetSourceID(sourceid);
}

QString PaneAnalog::GetFrequencyTable(void) const
{
return m_freq_table->getValue();
return m_freqTable->getValue();
}
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/channelscan/paneanalog.h
View file
Expand Up @@ -19,7 +19,7 @@ class PaneAnalog : public GroupSetting
QString GetFrequencyTable(void) const;

protected:
TransFreqTableSelector *m_freq_table {nullptr};
TransFreqTableSelector *m_freqTable {nullptr};
};

#endif // PANE_ANALOG_H
79 changes: 39 additions & 40 deletions mythtv/libs/libmythtv/channelscan/paneatsc.h
View file
Expand Up @@ -20,32 +20,32 @@ class PaneATSC : public GroupSetting

public:
PaneATSC(const QString &target, StandardSetting *setting) :
m_atsc_table(new ScanFrequencyTable()),
m_atsc_modulation(new ScanATSCModulation())
m_atscTable(new ScanFrequencyTable()),
m_atscModulation(new ScanATSCModulation())
{
setVisible(false);

connect(m_atsc_table, SIGNAL(valueChanged( const QString&)),
connect(m_atscTable, SIGNAL(valueChanged( const QString&)),
this, SLOT( FreqTableChanged(const QString&)));

connect(m_atsc_modulation, SIGNAL(valueChanged( const QString&)),
connect(m_atscModulation, SIGNAL(valueChanged( const QString&)),
this, SLOT( ModulationChanged(const QString&)));

auto *range = new GroupSetting();
m_transport_start = new TransMythUIComboBoxSetting();
m_transport_end = new TransMythUIComboBoxSetting();
m_transport_count = new TransTextEditSetting();
m_transportStart = new TransMythUIComboBoxSetting();
m_transportEnd = new TransMythUIComboBoxSetting();
m_transportCount = new TransTextEditSetting();
range->setLabel(tr("Scanning Range"));
range->addChild(m_transport_start);
range->addChild(m_transport_end);
range->addChild(m_transport_count);
range->addChild(m_transportStart);
range->addChild(m_transportEnd);
range->addChild(m_transportCount);

setting->addTargetedChildren(target,
{this, m_atsc_table, m_atsc_modulation, range});
{this, m_atscTable, m_atscModulation, range});

connect(m_transport_start, SIGNAL(valueChanged( const QString&)),
connect(m_transportStart, SIGNAL(valueChanged( const QString&)),
this, SLOT( TransportRangeChanged(const QString&)));
connect(m_transport_end, SIGNAL(valueChanged( const QString&)),
connect(m_transportEnd, SIGNAL(valueChanged( const QString&)),
this, SLOT( TransportRangeChanged(const QString&)));

ResetTransportRange();
Expand All @@ -61,20 +61,20 @@ class PaneATSC : public GroupSetting
}

void SetFrequencyTable(const QString &atsc_table)
{ m_atsc_table->setValue(atsc_table); }
{ m_atscTable->setValue(atsc_table); }

QString GetFrequencyTable(void) const
{ return m_atsc_table->getValue(); }
{ return m_atscTable->getValue(); }
QString GetModulation(void) const
{ return m_atsc_modulation->getValue(); }
{ return m_atscModulation->getValue(); }
bool GetFrequencyTableRange(
QString &start, QString &end) const
{
if (!m_transport_start->size() || !m_transport_end->size())
if (!m_transportStart->size() || !m_transportEnd->size())
return false;

start = m_transport_start->getValue();
end = m_transport_end->getValue();
start = m_transportStart->getValue();
end = m_transportEnd->getValue();

return !start.isEmpty() && !end.isEmpty();
}
Expand All @@ -83,9 +83,9 @@ class PaneATSC : public GroupSetting
void FreqTableChanged(const QString &freqtbl)
{
if (freqtbl == "us")
m_atsc_modulation->setValue(0);
else if (m_atsc_modulation->getValue() == "vsb8")
m_atsc_modulation->setValue(1);
m_atscModulation->setValue(0);
else if (m_atscModulation->getValue() == "vsb8")
m_atscModulation->setValue(1);

ResetTransportRange();
}
Expand All @@ -97,24 +97,24 @@ class PaneATSC : public GroupSetting

void TransportRangeChanged(const QString &/*range*/)
{
int a = m_transport_start->getValueIndex(m_transport_start->getValue());
int b = m_transport_end->getValueIndex(m_transport_end->getValue());
int a = m_transportStart->getValueIndex(m_transportStart->getValue());
int b = m_transportEnd->getValueIndex(m_transportEnd->getValue());
if (b < a)
{
m_transport_end->setValue(m_transport_start->getValue());
m_transportEnd->setValue(m_transportStart->getValue());
b = a;
}

int diff = max(b + 1 - a, 0);
m_transport_count->setValue(QString::number(diff));
m_transportCount->setValue(QString::number(diff));
}

protected:
void ResetTransportRange(void)
{
m_transport_start->clearSelections();
m_transport_end->clearSelections();
m_transport_count->setValue(QString::number(0));
m_transportStart->clearSelections();
m_transportEnd->clearSelections();
m_transportCount->setValue(QString::number(0));

FetchFrequencyTables();

Expand All @@ -134,12 +134,12 @@ class PaneATSC : public GroupSetting
if (strNameFormat.indexOf("%") >= 0)
name = strNameFormat.arg(name_num);

m_transport_start->addSelection(name, name, first);
m_transportStart->addSelection(name, name, first);
first = false;

bool last = (next == m_tables.end()) &&
((freq + ft.m_frequencyStep) >= ft.m_frequencyEnd);
m_transport_end->addSelection(name, name, last);
m_transportEnd->addSelection(name, name, last);

name_num++;
freq += ft.m_frequencyStep;
Expand All @@ -156,29 +156,28 @@ class PaneATSC : public GroupSetting
const QString new_tables_sig =
QString("%1_%2_%3").arg(format).arg(modulation).arg(country);

if (new_tables_sig != m_tables_sig)
if (new_tables_sig != m_tablesSig)
{
while (!m_tables.empty())
{
delete m_tables.back();
m_tables.pop_back();
}

m_tables_sig = new_tables_sig;
m_tablesSig = new_tables_sig;

m_tables = get_matching_freq_tables(
format, modulation, country);
}
}

protected:
ScanFrequencyTable *m_atsc_table {nullptr};
ScanATSCModulation *m_atsc_modulation {nullptr};
TransMythUIComboBoxSetting *m_transport_start {nullptr};
TransMythUIComboBoxSetting *m_transport_end {nullptr};
TransTextEditSetting *m_transport_count {nullptr};
// QString m_old_freq_table;
QString m_tables_sig;
ScanFrequencyTable *m_atscTable {nullptr};
ScanATSCModulation *m_atscModulation {nullptr};
TransMythUIComboBoxSetting *m_transportStart {nullptr};
TransMythUIComboBoxSetting *m_transportEnd {nullptr};
TransTextEditSetting *m_transportCount {nullptr};
QString m_tablesSig;
freq_table_list_t m_tables;
};

Expand Down
32 changes: 16 additions & 16 deletions mythtv/libs/libmythtv/channelscan/panedvbt.h
View file
Expand Up @@ -45,42 +45,42 @@ class PaneDVBT : public GroupSetting
m_pbandwidth = new ScanBandwidth(),
m_pinversion = new ScanInversion(),
m_pconstellation = new ScanConstellation(),
m_pcoderate_lp = new ScanCodeRateLP(),
m_pcoderate_hp = new ScanCodeRateHP(),
m_ptrans_mode = new ScanTransmissionMode(),
m_pguard_interval = new ScanGuardInterval(),
m_pcoderateLp = new ScanCodeRateLP(),
m_pcoderateHp = new ScanCodeRateHP(),
m_ptransMode = new ScanTransmissionMode(),
m_pguardInterval = new ScanGuardInterval(),
m_phierarchy = new ScanHierarchy()});
}

QString frequency(void) const { return m_pfrequency->getValue(); }
QString bandwidth(void) const { return m_pbandwidth->getValue(); }
QString inversion(void) const { return m_pinversion->getValue(); }
QString constellation(void) const { return m_pconstellation->getValue(); }
QString coderate_lp(void) const { return m_pcoderate_lp->getValue(); }
QString coderate_hp(void) const { return m_pcoderate_hp->getValue(); }
QString trans_mode(void) const { return m_ptrans_mode->getValue(); }
QString guard_interval(void) const { return m_pguard_interval->getValue();}
QString coderate_lp(void) const { return m_pcoderateLp->getValue(); }
QString coderate_hp(void) const { return m_pcoderateHp->getValue(); }
QString trans_mode(void) const { return m_ptransMode->getValue(); }
QString guard_interval(void) const { return m_pguardInterval->getValue(); }
QString hierarchy(void) const { return m_phierarchy->getValue(); }

void setFrequency(uint frequency) { m_pfrequency->setValue(frequency); }
void setBandwidth(const QString& bandwidth) { m_pbandwidth->setValue(bandwidth); }
void setInversion(const QString& inversion) { m_pinversion->setValue(inversion); }
void setConstellation(const QString& constellation) { m_pconstellation->setValue(constellation); }
void setCodeRateLP(const QString& coderate_lp) { m_pcoderate_lp->setValue(coderate_lp); }
void setCodeRateHP(const QString& coderate_hp) { m_pcoderate_hp->setValue(coderate_hp); }
void setTransmode(const QString& trans_mode) { m_ptrans_mode->setValue(trans_mode); }
void setGuardInterval(const QString& guard_interval) { m_pguard_interval->setValue(guard_interval);}
void setCodeRateLP(const QString& coderate_lp) { m_pcoderateLp->setValue(coderate_lp); }
void setCodeRateHP(const QString& coderate_hp) { m_pcoderateHp->setValue(coderate_hp); }
void setTransmode(const QString& trans_mode) { m_ptransMode->setValue(trans_mode); }
void setGuardInterval(const QString& guard_interval) { m_pguardInterval->setValue(guard_interval); }
void setHierarchy(const QString& hierarchy) { m_phierarchy->setValue(hierarchy); }

protected:
ScanFrequency *m_pfrequency {nullptr};
ScanInversion *m_pinversion {nullptr};
ScanBandwidth *m_pbandwidth {nullptr};
ScanConstellation *m_pconstellation {nullptr};
ScanCodeRateLP *m_pcoderate_lp {nullptr};
ScanCodeRateHP *m_pcoderate_hp {nullptr};
ScanTransmissionMode *m_ptrans_mode {nullptr};
ScanGuardInterval *m_pguard_interval {nullptr};
ScanCodeRateLP *m_pcoderateLp {nullptr};
ScanCodeRateHP *m_pcoderateHp {nullptr};
ScanTransmissionMode *m_ptransMode {nullptr};
ScanGuardInterval *m_pguardInterval {nullptr};
ScanHierarchy *m_phierarchy {nullptr};
};

Expand Down

0 comments on commit 6ba946c

Please sign in to comment.