Skip to content

Commit

Permalink
tidy: Remove redundant member initialization.
Browse files Browse the repository at this point in the history
The clang-tidy "redundant member initialization" check pointed out a
number of places where functions explicitly initialize a member to its
default value.  Changes made by the clang-tidy program, with some
cleanup by hand.

https://clang.llvm.org/extra/clang-tidy/checks/readability-redundant-member-init.html
https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-equals-default.html
  • Loading branch information
linuxdude42 committed Dec 23, 2019
1 parent a13b29a commit 53ec53a
Show file tree
Hide file tree
Showing 24 changed files with 31 additions and 44 deletions.
2 changes: 1 addition & 1 deletion mythplugins/mythgame/mythgame/gamehandler.h
Expand Up @@ -62,7 +62,7 @@ class GameHandler : public QObject
Q_OBJECT

public:
GameHandler() : QObject() {}
GameHandler() = default;

static void updateSettings(GameHandler *handler);
static GameHandler *getHandler(uint i);
Expand Down
6 changes: 2 additions & 4 deletions mythtv/libs/libmyth/standardsettings.h
Expand Up @@ -156,8 +156,7 @@ class MPUBLIC MythUITextEditSetting : public StandardSetting
class MPUBLIC TransTextEditSetting: public MythUITextEditSetting
{
public:
TransTextEditSetting() :
MythUITextEditSetting() { }
TransTextEditSetting() = default;
};


Expand Down Expand Up @@ -411,8 +410,7 @@ class MPUBLIC MythUICheckBoxSetting : public StandardSetting
class MPUBLIC TransMythUICheckBoxSetting: public MythUICheckBoxSetting
{
public:
TransMythUICheckBoxSetting() :
MythUICheckBoxSetting() { }
TransMythUICheckBoxSetting() = default;
};

class MPUBLIC HostCheckBoxSetting: public MythUICheckBoxSetting
Expand Down
10 changes: 5 additions & 5 deletions mythtv/libs/libmythmetadata/imagemanager.h
Expand Up @@ -109,7 +109,7 @@ class META_PUBLIC DeviceManager
StringMap GetDeviceDirs() const;
QList<int> GetAbsentees();

DeviceManager() : m_devices() {}
DeviceManager() = default;
~DeviceManager();

private:
Expand Down Expand Up @@ -189,7 +189,7 @@ class META_PUBLIC ImageAdapterBase : public DeviceManager
class ImageAdapterLocal : public ImageAdapterBase
{
public:
ImageAdapterLocal() : ImageAdapterBase() {}
ImageAdapterLocal() = default;

ImageItem *CreateItem(const QFileInfo &fi, int parentId, int devId,
const QString &base) const;
Expand Down Expand Up @@ -227,7 +227,7 @@ class ImageAdapterLocal : public ImageAdapterBase
class ImageAdapterSg : public ImageAdapterBase
{
public:
ImageAdapterSg() : ImageAdapterBase(),
ImageAdapterSg() :
m_hostname(gCoreContext->GetMasterHostName()),
m_hostport(MythCoreContext::GetMasterServerPort()),
m_sg(StorageGroup(IMAGE_STORAGE_GROUP, m_hostname, false)) {}
Expand Down Expand Up @@ -381,7 +381,7 @@ class META_PUBLIC ImageManagerBe : protected QObject, public ImageHandler<ImageD
static ImageManagerBe* getInstance();

protected:
ImageManagerBe() :QObject(), ImageHandler()
ImageManagerBe()
{
// Cleanup & terminate child threads before application exits
connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(deleteLater()));
Expand Down Expand Up @@ -425,7 +425,7 @@ class META_PUBLIC ImageDbReader : protected ImageHandler<ImageDbLocal>
int &sizeKb) const;
protected:
ImageDbReader(int order, int dirOrder, bool showAll, int showType)
: ImageHandler(), m_remote(new ImageDbSg()),
: m_remote(new ImageDbSg()),
m_dirOrder(dirOrder), m_fileOrder(order),
m_showHidden(showAll), m_showType(showType)
{ SetRefinementClause(); }
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythmetadata/metaioavfcomment.h
Expand Up @@ -19,7 +19,7 @@ struct AVFormatContext;
class META_PUBLIC MetaIOAVFComment : public MetaIO
{
public:
MetaIOAVFComment(void) : MetaIO() {}
MetaIOAVFComment(void) = default;
~MetaIOAVFComment(void) override = default;

bool write(const QString &filename, MusicMetadata* mdata) override; // MetaIO
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythmetadata/metaioid3.h
Expand Up @@ -33,7 +33,7 @@ using TagLib::ID3v2::AttachedPictureFrame;
class META_PUBLIC MetaIOID3 : public MetaIOTagLib
{
public:
MetaIOID3(void) : MetaIOTagLib() {}
MetaIOID3(void) = default;
~MetaIOID3(void) override { CloseFile(); }

bool write(const QString &filename, MusicMetadata* mdata) override; // MetaIOTagLib
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythmetadata/metaiomp4.h
Expand Up @@ -16,7 +16,7 @@ struct AVFormatContext;
class META_PUBLIC MetaIOMP4 : public MetaIO
{
public:
MetaIOMP4(void) : MetaIO() {}
MetaIOMP4(void) = default;
~MetaIOMP4(void) override = default;

bool write(const QString &filename, MusicMetadata* mdata) override; // MetaIO
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythmetadata/metaiooggvorbis.h
Expand Up @@ -21,7 +21,7 @@ using TagLib::String;
class META_PUBLIC MetaIOOggVorbis : public MetaIOTagLib
{
public:
MetaIOOggVorbis(void) : MetaIOTagLib() {}
MetaIOOggVorbis(void) = default;
~MetaIOOggVorbis(void) override = default;

bool write(const QString &filename, MusicMetadata* mdata) override; // MetaIOTagLib
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythmetadata/metaiotaglib.h
Expand Up @@ -20,7 +20,7 @@ using TagLib::String;
class META_PUBLIC MetaIOTagLib : public MetaIO
{
public:
MetaIOTagLib(void) : MetaIO() {}
MetaIOTagLib(void) = default;
~MetaIOTagLib(void) override = default;

bool write(const QString &filename, MusicMetadata* mdata) override = 0; // MetaIO
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythmetadata/metaiowavpack.h
Expand Up @@ -23,7 +23,7 @@ using TagLib::String;
class META_PUBLIC MetaIOWavPack : public MetaIOTagLib
{
public:
MetaIOWavPack(void) : MetaIOTagLib() {}
MetaIOWavPack(void) = default;
~MetaIOWavPack(void) override = default;

bool write(const QString &filename, MusicMetadata* mdata) override; // MetaIOTagLib
Expand Down
5 changes: 2 additions & 3 deletions mythtv/libs/libmythtv/dtvmultiplex.h
Expand Up @@ -24,7 +24,7 @@ class MPEGDescriptor;
class MTV_PUBLIC DTVMultiplex
{
public:
DTVMultiplex() = default;
DTVMultiplex() = default;
DTVMultiplex(const DTVMultiplex &/*other*/) = default;
DTVMultiplex &operator=(const DTVMultiplex &/*other*/) = default;
virtual ~DTVMultiplex() = default;
Expand Down Expand Up @@ -115,8 +115,7 @@ class MTV_PUBLIC DTVMultiplex
class MTV_PUBLIC ScanDTVTransport : public DTVMultiplex
{
public:
ScanDTVTransport() :
DTVMultiplex() { }
ScanDTVTransport() = default;
ScanDTVTransport(const DTVMultiplex &mplex, DTVTunerType tt, uint cid) :
DTVMultiplex(mplex), m_tuner_type(tt), m_cardid(cid) { }
~ScanDTVTransport() override = default;
Expand Down
3 changes: 0 additions & 3 deletions mythtv/libs/libmythtv/mpeg/mpegtables.h
Expand Up @@ -398,7 +398,6 @@ class MTV_PUBLIC PSIPTable : public PESPacket
protected:
// does not create it's own data
PSIPTable(const TSPacket& tspacket, bool /*unused*/)
: PESPacket()
{
m_pesData = nullptr;
m_fullBuffer = nullptr;
Expand All @@ -413,7 +412,6 @@ class MTV_PUBLIC PSIPTable : public PESPacket
// may be modified
PSIPTable(const TSPacket &tspacket,
const unsigned char *pesdata, uint pes_size)
: PESPacket()
{ // clone
m_ccLast = tspacket.ContinuityCounter();
m_pesDataSize = pes_size;
Expand Down Expand Up @@ -446,7 +444,6 @@ class MTV_PUBLIC PSIPTable : public PESPacket
}
// may be modified
explicit PSIPTable(const TSPacket& table)
: PESPacket()
{
// section_syntax_ind 1 1.0 8 should always be 1
// private_indicator 1 1.1 9 should always be 1
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/mpeg/tspacket.h
Expand Up @@ -169,7 +169,7 @@ class MTV_PUBLIC TSPacket : public TSHeader
public:
/* note: payload is intentionally left uninitialized */
// cppcheck-suppress uninitMemberVar
TSPacket(void) : TSHeader() { }
TSPacket(void) = default;

static TSPacket* CreatePayloadOnlyPacket(void)
{
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/videosource.h
Expand Up @@ -619,7 +619,7 @@ class FirewireDesc : public GroupSetting

public:
explicit FirewireDesc(const FirewireGUID *_guid) :
GroupSetting(), m_guid(_guid) { }
m_guid(_guid) { }

public slots:
void SetGUID(const QString &_guid);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythpainter_qimage.h
Expand Up @@ -17,7 +17,7 @@ class QPainter;
class MUI_PUBLIC MythQImagePainter : public MythPainter
{
public:
MythQImagePainter() : MythPainter() {}
MythQImagePainter() = default;
~MythQImagePainter() override;

QString GetName(void) override // MythPainter
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythpainter_qt.h
Expand Up @@ -13,7 +13,7 @@ class QPainter;
class MythQtPainter : public MythPainter
{
public:
MythQtPainter() : MythPainter() {}
MythQtPainter() = default;
~MythQtPainter() override;

QString GetName(void) override // MythPainter
Expand Down
3 changes: 1 addition & 2 deletions mythtv/libs/libmythui/mythrect.h
Expand Up @@ -18,8 +18,7 @@ class MUI_PUBLIC MythRect : public QRect
{

public:
MythRect()
: QRect() {}
MythRect() = default;
MythRect(int x, int y, int width, int height)
: QRect(x, y, width, height) {}
MythRect(const QString &sX, const QString &sY, const QString &sWidth,
Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/libmythui/platforms/mythdisplaydrm.cpp
Expand Up @@ -5,7 +5,6 @@
#define LOC QString("DispDRM: ")

MythDisplayDRM::MythDisplayDRM()
: MythDisplay()
{
m_device = new MythDRMDevice(m_screen);
}
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythupnp/websocket.h
Expand Up @@ -138,7 +138,7 @@ class WebSocketExtension : public QObject
Q_OBJECT

public:
WebSocketExtension() : QObject() { };
WebSocketExtension() = default;;
~WebSocketExtension() override = default;

virtual bool HandleTextFrame(const WebSocketFrame &/*frame*/) { return false; }
Expand Down
4 changes: 1 addition & 3 deletions mythtv/programs/mythbackend/scheduler.h
Expand Up @@ -32,9 +32,7 @@ class Scheduler;
class SchedInputInfo
{
public:
SchedInputInfo(void) :
m_groupInputs(),
m_conflictingInputs() {};
SchedInputInfo(void) = default;;
~SchedInputInfo(void) = default;

uint m_inputId {0};
Expand Down
9 changes: 4 additions & 5 deletions mythtv/programs/mythfrontend/galleryslide.h
Expand Up @@ -64,8 +64,7 @@ class Animation : public AbstractAnimation, public QVariantAnimation
\param type Effect to be animated
*/
explicit Animation(Slide *image, Type type = Alpha)
: AbstractAnimation(), QVariantAnimation(),
m_parent(image), m_type(type) {}
: m_parent(image), m_type(type) {}
void Start(bool forwards = true, float speed = 1.0) override; // AbstractAnimation
void Pulse(int interval) override; // AbstractAnimation
void Set(const QVariant& from, const QVariant& to,
Expand All @@ -91,7 +90,7 @@ class Animation : public AbstractAnimation, public QVariantAnimation
class GroupAnimation : public AbstractAnimation
{
public:
GroupAnimation() : AbstractAnimation() {}
GroupAnimation() = default;
~GroupAnimation() override { GroupAnimation::Clear(); }
void Pulse(int interval) override = 0; // AbstractAnimation
void Start(bool forwards, float speed = 1.0) override // AbstractAnimation
Expand All @@ -112,7 +111,7 @@ class SequentialAnimation : public GroupAnimation
{
Q_OBJECT
public:
SequentialAnimation() : GroupAnimation() {}
SequentialAnimation() = default;
void Pulse(int interval) override; // GroupAnimation
void Start(bool forwards, float speed = 1.0) override; // GroupAnimation
void SetSpeed(float speed) override; // GroupAnimation
Expand All @@ -130,7 +129,7 @@ class ParallelAnimation : public GroupAnimation
{
Q_OBJECT
public:
ParallelAnimation() : GroupAnimation() {}
ParallelAnimation() = default;
void Pulse(int interval) override; // GroupAnimation
void Start(bool forwards, float speed = 1.0) override; // GroupAnimation
void SetSpeed(float speed) override; // GroupAnimation
Expand Down
3 changes: 1 addition & 2 deletions mythtv/programs/mythfrontend/gallerytransitions.h
Expand Up @@ -146,8 +146,7 @@ class TransitionZoom : public GroupTransition
class TransitionSpin : public TransitionBlend
{
public:
TransitionSpin() : TransitionBlend()
{ setObjectName(Transition::tr("Spin")); }
TransitionSpin() { setObjectName(Transition::tr("Spin")); }
void Initialise() override; // TransitionBlend
void Finalise() override; // TransitionBlend
};
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/galleryviews.h
Expand Up @@ -34,7 +34,7 @@ using WeightList = QVector<double>;
class MarkedFiles : public QSet<int>
{
public:
MarkedFiles() : QSet() {}
MarkedFiles() = default;
void Initialise(int id) { m_valid = true; m_parent = id; clear();}
void Clear() { m_valid = false; clear(); }
bool IsFor(int id) { return m_valid && m_parent == id; }
Expand Down
3 changes: 1 addition & 2 deletions mythtv/programs/mythfrontend/programrecpriority.h
Expand Up @@ -27,8 +27,7 @@ class ProgramRecPriorityInfo : public RecordingInfo
friend class ProgramRecPriority;

public:
ProgramRecPriorityInfo():
RecordingInfo() {}
ProgramRecPriorityInfo() = default;
ProgramRecPriorityInfo(const ProgramRecPriorityInfo &/*other*/) = default;
ProgramRecPriorityInfo &operator=(const ProgramRecPriorityInfo &other)
{ clone(other); return *this; }
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/upnpscanner.h
Expand Up @@ -73,7 +73,7 @@ class UPNPScanner : public QObject

private:
explicit UPNPScanner(UPNPSubscription *sub)
: QObject(), m_subscription(sub) {}
: m_subscription(sub) {}
void ScheduleUpdate(void);
void CheckFailure(const QUrl &url);
void Debug(void);
Expand Down

0 comments on commit 53ec53a

Please sign in to comment.