Skip to content

Commit

Permalink
tidy: Pass constructor arguments by value and use std::move. (libmyth…
Browse files Browse the repository at this point in the history
…tv/libmythui)

The clang-tidy "pass by value" modernization check pointed out a
number of places where constructors are declared to take a const
object, and the the only use of that object is to copy it to a newly
initialize local variable.  Passing a non-const and using the
std::move function allows the compiler to choose the best way to
construct the local copy of the value.  Changes made by the clang-tidy
program and cleaned up by hand.

https://clang.llvm.org/extra/clang-tidy/checks/modernize-pass-by-value.html
  • Loading branch information
linuxdude42 committed Nov 23, 2019
1 parent f6a1e3f commit 147e8d8
Show file tree
Hide file tree
Showing 59 changed files with 223 additions and 162 deletions.
8 changes: 5 additions & 3 deletions mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
Expand Up @@ -32,11 +32,13 @@

// C++ includes
#include <algorithm>
#include <utility>

using namespace std;

// Qt includes
#include <QObject>
#include <QMutexLocker>
#include <QObject>

// MythTV includes - General
#include "channelscan_sm.h"
Expand Down Expand Up @@ -144,7 +146,7 @@ class ScannedChannelInfo
ChannelScanSM::ChannelScanSM(ScanMonitor *_scan_monitor,
const QString &_cardtype, ChannelBase *_channel,
int _sourceID, uint signal_timeout,
uint channel_timeout, const QString &_inputname,
uint channel_timeout, QString _inputname,
bool test_decryption)
: // Set in constructor
m_scanMonitor(_scan_monitor),
Expand All @@ -154,7 +156,7 @@ ChannelScanSM::ChannelScanSM(ScanMonitor *_scan_monitor,
m_sourceID(_sourceID),
m_signalTimeout(signal_timeout),
m_channelTimeout(channel_timeout),
m_inputName(_inputname),
m_inputName(std::move(_inputname)),
m_testDecryption(test_decryption),
// Misc
m_analogSignalHandler(new AnalogSignalHandler(this))
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/channelscan/channelscan_sm.h
Expand Up @@ -94,7 +94,7 @@ class ChannelScanSM : public MPEGStreamListener,
ChannelScanSM(ScanMonitor *_scan_monitor,
const QString &_cardtype, ChannelBase* _channel, int _sourceID,
uint signal_timeout, uint channel_timeout,
const QString &_inputname, bool test_decryption);
QString _inputname, bool test_decryption);
~ChannelScanSM();

void StartScanner(void);
Expand Down
5 changes: 3 additions & 2 deletions mythtv/libs/libmythtv/channelscan/externrecscanner.cpp
Expand Up @@ -3,6 +3,7 @@
// Std C headers
#include <cmath>
#include <unistd.h>
#include <utility>

// Qt headers
#include <QFile>
Expand All @@ -20,12 +21,12 @@
#define LOC QString("ExternRecChanFetch: ")

ExternRecChannelScanner::ExternRecChannelScanner(uint cardid,
const QString &inputname,
QString inputname,
uint sourceid,
ScanMonitor *monitor)
: m_scan_monitor(monitor)
, m_cardid(cardid)
, m_inputname(inputname)
, m_inputname(std::move(inputname))
, m_sourceid(sourceid)
, m_thread(new MThread("ExternRecChannelScanner", this))
{
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/channelscan/externrecscanner.h
Expand Up @@ -24,7 +24,7 @@ class ExternRecChannelScanner : public QRunnable
Q_DECLARE_TR_FUNCTIONS(ExternRecChannelScanner);

public:
ExternRecChannelScanner(uint cardid, const QString &inputname, uint sourceid,
ExternRecChannelScanner(uint cardid, QString inputname, uint sourceid,
ScanMonitor *monitor = nullptr);
~ExternRecChannelScanner();

Expand Down
7 changes: 5 additions & 2 deletions mythtv/libs/libmythtv/channelscan/inputselectorsetting.cpp
Expand Up @@ -28,14 +28,17 @@
*/

#include "inputselectorsetting.h"

#include <utility>

#include "cardutil.h"
#include "mythcorecontext.h"
#include "mythdb.h"

InputSelector::InputSelector(uint default_cardid,
const QString &default_inputname) :
QString default_inputname) :
m_default_cardid(default_cardid),
m_default_inputname(default_inputname)
m_default_inputname(std::move(default_inputname))
{
setLabel(tr("Input"));
setHelpText(
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/channelscan/inputselectorsetting.h
Expand Up @@ -37,7 +37,7 @@ class InputSelector : public TransMythUIComboBoxSetting
Q_OBJECT

public:
InputSelector(uint default_cardid, const QString &default_inputname);
InputSelector(uint default_cardid, QString default_inputname);

void Load(void) override; // StandardSetting

Expand Down
5 changes: 3 additions & 2 deletions mythtv/libs/libmythtv/channelscan/iptvchannelfetcher.cpp
Expand Up @@ -3,6 +3,7 @@
// Std C headers
#include <cmath>
#include <unistd.h>
#include <utility>

// Qt headers
#include <QFile>
Expand Down Expand Up @@ -31,10 +32,10 @@ static bool parse_extinf(const QString &line,
int &nextChanNum);

IPTVChannelFetcher::IPTVChannelFetcher(
uint cardid, const QString &inputname, uint sourceid,
uint cardid, QString inputname, uint sourceid,
bool is_mpts, ScanMonitor *monitor) :
m_scan_monitor(monitor),
m_cardid(cardid), m_inputname(inputname),
m_cardid(cardid), m_inputname(std::move(inputname)),
m_sourceid(sourceid), m_is_mpts(is_mpts),
m_thread(new MThread("IPTVChannelFetcher", this))
{
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/channelscan/iptvchannelfetcher.h
Expand Up @@ -64,7 +64,7 @@ class IPTVChannelFetcher : public QRunnable
Q_DECLARE_TR_FUNCTIONS(IPTVChannelFetcher);

public:
IPTVChannelFetcher(uint cardid, const QString &inputname, uint sourceid,
IPTVChannelFetcher(uint cardid, QString inputname, uint sourceid,
bool is_mpts, ScanMonitor *monitor = nullptr);
~IPTVChannelFetcher();

Expand Down
5 changes: 3 additions & 2 deletions mythtv/libs/libmythtv/channelscan/scaninfo.cpp
@@ -1,5 +1,6 @@
// C++ headers
#include <cstdint>
#include <utility>

// Qt headers
#include <QString>
Expand All @@ -12,9 +13,9 @@
#include "mythlogging.h"

ScanInfo::ScanInfo(uint scanid, uint cardid, uint sourceid,
bool processed, const QDateTime &scandate) :
bool processed, QDateTime scandate) :
m_scanid(scanid), m_cardid(cardid), m_sourceid(sourceid),
m_processed(processed), m_scandate(scandate)
m_processed(processed), m_scandate(std::move(scandate))
{
}

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/channelscan/scaninfo.h
Expand Up @@ -20,7 +20,7 @@ class ScanInfo
public:
ScanInfo() = default;
ScanInfo(uint scanid, uint cardid, uint sourceid,
bool processed, const QDateTime &scandate);
bool processed, QDateTime scandate);

static bool MarkProcessed(uint scanid);
static bool DeleteScan(uint scanid);
Expand Down
5 changes: 3 additions & 2 deletions mythtv/libs/libmythtv/channelscan/vboxchannelfetcher.cpp
@@ -1,6 +1,7 @@
// Std C headers
#include <cmath>
#include <unistd.h>
#include <utility>

// Qt headers
#include <QFile>
Expand All @@ -18,11 +19,11 @@

#define LOC QString("VBoxChanFetch: ")

VBoxChannelFetcher::VBoxChannelFetcher(uint cardid, const QString &inputname, uint sourceid,
VBoxChannelFetcher::VBoxChannelFetcher(uint cardid, QString inputname, uint sourceid,
bool ftaOnly, ServiceRequirements serviceType,
ScanMonitor *monitor) :
m_scan_monitor(monitor),
m_cardid(cardid), m_inputname(inputname),
m_cardid(cardid), m_inputname(std::move(inputname)),
m_sourceid(sourceid), m_ftaOnly(ftaOnly),
m_serviceType(serviceType),
m_thread(new MThread("VBoxChannelFetcher", this))
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/channelscan/vboxchannelfetcher.h
Expand Up @@ -61,7 +61,7 @@ class VBoxChannelFetcher : public QRunnable
Q_DECLARE_TR_FUNCTIONS(VBoxChannelFetcher);

public:
VBoxChannelFetcher(uint cardid, const QString &inputname, uint sourceid,
VBoxChannelFetcher(uint cardid, QString inputname, uint sourceid,
bool ftaOnly, ServiceRequirements serviceType,
ScanMonitor *monitor = nullptr);
~VBoxChannelFetcher();
Expand Down
11 changes: 7 additions & 4 deletions mythtv/libs/libmythtv/channelsettings.cpp
@@ -1,7 +1,10 @@
// C/C++ headers
#include <utility>

// Qt headers
#include <QWidget>
#include <QFile>
#include <QCoreApplication>
#include <QFile>
#include <QWidget>

// MythTV headers
#include "channelsettings.h"
Expand Down Expand Up @@ -247,9 +250,9 @@ class OutputFilters : public MythUITextEditSetting
class XmltvID : public MythUIComboBoxSetting
{
public:
XmltvID(const ChannelID &id, const QString &_sourceName) :
XmltvID(const ChannelID &id, QString _sourceName) :
MythUIComboBoxSetting(new ChannelDBStorage(this, id, "xmltvid"), true),
sourceName(_sourceName)
sourceName(std::move(_sourceName))
{
setLabel(QCoreApplication::translate("(Common)", "XMLTV ID"));

Expand Down
5 changes: 3 additions & 2 deletions mythtv/libs/libmythtv/diseqcsettings.cpp
Expand Up @@ -6,6 +6,7 @@

// Std C headers
#include <cmath>
#include <utility>

// MythTV headers
#include "mythdbcon.h"
Expand Down Expand Up @@ -669,10 +670,10 @@ SCRConfig::SCRConfig(DiSEqCDevSCR &scr, StandardSetting *parent) : m_scr(scr)
class lnb_preset
{
public:
lnb_preset(const QString &_name, DiSEqCDevLNB::dvbdev_lnb_t _type,
lnb_preset(QString _name, DiSEqCDevLNB::dvbdev_lnb_t _type,
uint _lof_sw = 0, uint _lof_lo = 0,
uint _lof_hi = 0, bool _pol_inv = false) :
name(_name), type(_type),
name(std::move(_name)), type(_type),
lof_sw(_lof_sw), lof_lo(_lof_lo),
lof_hi(_lof_hi), pol_inv(_pol_inv) {}

Expand Down
28 changes: 15 additions & 13 deletions mythtv/libs/libmythtv/frequencytables.cpp
@@ -1,3 +1,5 @@
#include <utility>

#include <QMutex>

#include "frequencies.h"
Expand All @@ -20,10 +22,10 @@ TransportScanItem::TransportScanItem()

TransportScanItem::TransportScanItem(uint sourceid,
const QString &_si_std,
const QString &_name,
QString _name,
uint _mplexid,
uint _timeoutTune)
: m_mplexid(_mplexid), m_friendlyName(_name),
: m_mplexid(_mplexid), m_friendlyName(std::move(_name)),
m_sourceID(sourceid),
m_timeoutTune(_timeoutTune)
{
Expand All @@ -38,24 +40,24 @@ TransportScanItem::TransportScanItem(uint sourceid,
}

TransportScanItem::TransportScanItem(uint _sourceid,
const QString &_name,
QString _name,
DTVMultiplex &_tuning,
uint _timeoutTune)
: m_mplexid(0),
m_friendlyName(_name),
m_friendlyName(std::move(_name)),
m_sourceID(_sourceid),
m_timeoutTune(_timeoutTune)
{
m_tuning = _tuning;
}

TransportScanItem::TransportScanItem(uint _sourceid,
const QString &_name,
QString _name,
DTVTunerType _tuner_type,
const DTVTransport &_tuning,
uint _timeoutTune)
: m_mplexid(0),
m_friendlyName(_name),
m_friendlyName(std::move(_name)),
m_sourceID(_sourceid),
m_timeoutTune(_timeoutTune)
{
Expand All @@ -77,12 +79,12 @@ TransportScanItem::TransportScanItem(uint _sourceid,

TransportScanItem::TransportScanItem(uint sourceid,
const QString &std,
const QString &strFmt,
QString strFmt,
uint freqNum,
uint freq,
const FrequencyTable &ft,
uint timeoutTune)
: m_mplexid(0), m_friendlyName(strFmt),
: m_mplexid(0), m_friendlyName(std::move(strFmt)),
m_friendlyNum(freqNum), m_sourceID(sourceid),
m_timeoutTune(timeoutTune)
{
Expand Down Expand Up @@ -124,15 +126,15 @@ TransportScanItem::TransportScanItem(uint sourceid,
}

TransportScanItem::TransportScanItem(uint _sourceid,
const QString &_name,
const IPTVTuningData &_tuning,
const QString &_channel,
QString _name,
IPTVTuningData _tuning,
QString _channel,
uint _timeoutTune) :
m_mplexid(0),
m_friendlyName(_name),
m_friendlyName(std::move(_name)),
m_sourceID(_sourceid),
m_timeoutTune(_timeoutTune),
m_iptvTuning(_tuning), m_iptvChannel(_channel)
m_iptvTuning(std::move(_tuning)), m_iptvChannel(std::move(_channel))
{
m_tuning.Clear();
m_tuning.m_sistandard = "MPEG";
Expand Down
14 changes: 7 additions & 7 deletions mythtv/libs/libmythtv/frequencytables.h
Expand Up @@ -127,33 +127,33 @@ class TransportScanItem
TransportScanItem();
TransportScanItem(uint _sourceid,
const QString &_si_std,
const QString &_name,
QString _name,
uint _mplexid,
uint _timeoutTune);

TransportScanItem(uint _sourceid,
const QString &_name,
QString _name,
DTVMultiplex &_tuning,
uint _timeoutTune);

TransportScanItem(uint _sourceid,
const QString &_name,
QString _name,
DTVTunerType _tuner_type,
const DTVTransport &_tuning,
uint _timeoutTune);

TransportScanItem(uint _sourceid,
const QString &_si_std,
const QString &strFmt, /* fmt for info shown to user */
QString strFmt, /* fmt for info shown to user */
uint freqNum,
uint frequency, /* center frequency to use */
const FrequencyTable&, /* freq table to get info from */
uint _timeoutTune);

TransportScanItem(uint _sourceid,
const QString &_name,
const IPTVTuningData &_tuning,
const QString &_channel,
QString _name,
IPTVTuningData _tuning,
QString _channel,
uint _timeoutTune);

uint offset_cnt() const
Expand Down
7 changes: 4 additions & 3 deletions mythtv/libs/libmythtv/jitterometer.cpp
Expand Up @@ -3,8 +3,9 @@
#include "jitterometer.h"

// Std
#include <cstdlib>
#include <cmath>
#include <cstdlib>
#include <utility>

#define UNIX_PROC_STAT "/proc/stat"
#define MAX_CORES 8
Expand All @@ -16,8 +17,8 @@
#include <mach/vm_map.h>
#endif

Jitterometer::Jitterometer(const QString &nname, int ncycles)
: m_num_cycles(ncycles), m_name(nname)
Jitterometer::Jitterometer(QString nname, int ncycles)
: m_num_cycles(ncycles), m_name(std::move(nname))
{
m_times.resize(m_num_cycles);

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/jitterometer.h
Expand Up @@ -43,7 +43,7 @@
class MTV_PUBLIC Jitterometer
{
public:
Jitterometer(const QString &nname, int ncycles = 0);
Jitterometer(QString nname, int ncycles = 0);
~Jitterometer();

float GetLastFPS(void) const { return m_last_fps; }
Expand Down

0 comments on commit 147e8d8

Please sign in to comment.