Skip to content

Commit

Permalink
tidy: Match variable names in function declarations and definitions.
Browse files Browse the repository at this point in the history
The clang-tidy "inconsistent parameter name" checker pointed out a
couple of places where function parameter names differed between the
declaration and the definition of a parameter.  Change the names in
the function declaration to match the actual names used in the
function definition.

https://clang.llvm.org/extra/clang-tidy/checks/readability-inconsistent-declaration-parameter-name.html
  • Loading branch information
linuxdude42 committed Dec 25, 2019
1 parent 13261fe commit e38b188
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions mythplugins/mythmusic/mythmusic/decoder.h
Expand Up @@ -127,7 +127,7 @@ class CdDecoderFactory : public DecoderFactory
bool supports(const QString &source) const override; // DecoderFactory
const QString &extension() const override; // DecoderFactory
const QString &description() const override; // DecoderFactory
Decoder *create(const QString &source, AudioOutput *output, bool deletable) override; // DecoderFactory
Decoder *create(const QString &file, AudioOutput *output, bool deletable) override; // DecoderFactory
};

class avfDecoderFactory : public DecoderFactory
Expand All @@ -138,7 +138,7 @@ class avfDecoderFactory : public DecoderFactory
bool supports(const QString &source) const override; // DecoderFactory
const QString &extension() const override; // DecoderFactory
const QString &description() const override; // DecoderFactory
Decoder *create(const QString &source, AudioOutput *output, bool deletable) override; // DecoderFactory
Decoder *create(const QString &file, AudioOutput *output, bool deletable) override; // DecoderFactory
};

#endif
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/mpeg/dvbdescriptors.h
Expand Up @@ -2038,9 +2038,9 @@ class AC3Descriptor : public MPEGDescriptor
QString toString(void) const override; // MPEGDescriptor
};

static QString coderate_inner(uint cr)
static QString coderate_inner(uint coderate)
{
switch (cr)
switch (coderate)
{
case 0x0: return "auto"; // not actually defined in spec
case 0x1: return "1/2";
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/dtvrecorder.h
Expand Up @@ -121,7 +121,7 @@ class DTVRecorder :
// For handling other (non audio/video) packets
bool FindOtherKeyframes(const TSPacket *tspacket);

inline bool CheckCC(uint pid, uint cc);
inline bool CheckCC(uint pid, uint new_cnt);

virtual QString GetSIStandard(void) const { return "mpeg"; }
virtual void SetCAMPMT(const ProgramMapTable */*pmt*/) {}
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/dtvsignalmonitor.h
Expand Up @@ -77,7 +77,7 @@ class DTVSignalMonitor : public SignalMonitor,
bool IsAllGood(void) const override; // SignalMonitor

// MPEG
void HandlePAT(const ProgramAssociationTable *pad) override; // MPEGStreamListener
void HandlePAT(const ProgramAssociationTable *pat) override; // MPEGStreamListener
void HandleCAT(const ConditionalAccessTable */*cat*/) override {} // MPEGStreamListener
void HandlePMT(uint program_num, const ProgramMapTable *pmt) override; // MPEGStreamListener
void HandleEncryptionStatus(uint pnum, bool enc_status) override; // MPEGStreamListener
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/dvbstreamhandler.h
Expand Up @@ -47,7 +47,7 @@ class DVBStreamHandler : public StreamHandler
DVBChannel *dvbchan);

private:
explicit DVBStreamHandler(const QString &dvb_debice, int inputid);
explicit DVBStreamHandler(const QString &dvb_device, int inputid);

void run(void) override; // MThread
void RunTS(void);
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/tv_play.h
Expand Up @@ -328,7 +328,7 @@ class MTV_PUBLIC TV : public QObject, public MenuItemDisplayer

public slots:
void HandleOSDClosed(int osdType);
void timerEvent(QTimerEvent *event) override; // QObject
void timerEvent(QTimerEvent *te) override; // QObject
void StopPlayback(void);

protected:
Expand Down Expand Up @@ -435,10 +435,10 @@ class MTV_PUBLIC TV : public QObject, public MenuItemDisplayer
const PlayerContext *GetPlayerReadLock(
int which, const char *file, int location) const;
PlayerContext *GetPlayerHaveLock(
PlayerContext *ctx,
PlayerContext *locked_context,
int which, const char *file, int location);
const PlayerContext *GetPlayerHaveLock(
const PlayerContext *ctx,
const PlayerContext *locked_context,
int which, const char *file, int location) const;
void ReturnPlayerLock(PlayerContext *&ctx);
void ReturnPlayerLock(const PlayerContext *&ctx) const;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/tv_rec.h
Expand Up @@ -329,7 +329,7 @@ class MTV_PUBLIC TVRec : public SignalMonitorListener, public QRunnable
void SetRecordingStatus(
RecStatus::Type new_status, int line, bool have_lock = false);

QString LoadProfile(void *tvchan, RecordingInfo *rec,
QString LoadProfile(void *tvchain, RecordingInfo *rec,
RecordingProfile &profile);

// Various components TVRec coordinates
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/mythsettings.h
Expand Up @@ -111,7 +111,7 @@ class MythSetting : public MythSettingBase
{
}

QString ToHTML(uint depth) const override; // MythSettingBase
QString ToHTML(uint level) const override; // MythSettingBase

public:
QString m_value;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/galleryviews.h
Expand Up @@ -189,7 +189,7 @@ class DirectoryView : public FlatView
{ return m_marked.contains(id) || m_prevMarked.contains(id); }

protected:
void SetDirectory(int nreParent);
void SetDirectory(int newParent);
void LoadDirThumbs(ImageItem &parent, int thumbsNeeded, int level = 0);
void PopulateThumbs(ImageItem &parent, int thumbsNeeded,
const ImageList &files, const ImageList &dirs,
Expand Down

0 comments on commit e38b188

Please sign in to comment.