Skip to content

Commit

Permalink
tidy: Clean up duplicated if/then/else and switch bodies.
Browse files Browse the repository at this point in the history 
The clang-tidy bugprone "branch clone" checker pointed out a number of
places where the bodies of an if/then/else clause were duplicated, or
where the bodies of switch clauses were duplicated.  Clean up these
warnings either by collapsing the multiple instances of code into a
single instance, or by flagging clang-tidy to ignore these warnings.

https://clang.llvm.org/extra/clang-tidy/checks/bugprone-branch-clone.html
  • Loading branch information
@linuxdude42
linuxdude42 committed Nov 27, 2019
1 parent 19545d3 commit dbed56e
Show file tree
Hide file tree
Showing 68 changed files with 234 additions and 431 deletions.
24 changes: 6 additions & 18 deletions mythplugins/mytharchive/mytharchivehelper/main.cpp
View file
Expand Up @@ -1481,27 +1481,15 @@ QString NativeArchive::findNodeText(const QDomElement &elem, const QString &node

// some fixups
// FIXME could be a lot smarter
if (nodeName == "recgroup")
if ((nodeName == "recgroup") ||
(nodeName == "playgroup"))
{
res = "Default";
}
else if (nodeName == "recordid")
{
res = "";
}
else if (nodeName == "seriesid")
{
res = "";
}
else if (nodeName == "programid")
{
res = "";
}
else if (nodeName == "playgroup")
{
res = "Default";
}
else if (nodeName == "profile")
else if ((nodeName == "recordid") ||
(nodeName == "seriesid") ||
(nodeName == "programid") ||
(nodeName == "profile"))
{
res = "";
}
Expand Down
14 changes: 4 additions & 10 deletions mythplugins/mythmusic/mythmusic/lyricsview.cpp
View file
Expand Up @@ -96,11 +96,8 @@ void LyricsView::customEvent(QEvent *event)
{
bool handled = false;

if (event->type() == MusicPlayerEvent::TrackChangeEvent)
{
findLyrics();
}
else if (event->type() == MusicPlayerEvent::PlayedTracksChangedEvent)
if ((event->type() == MusicPlayerEvent::TrackChangeEvent) ||
(event->type() == MusicPlayerEvent::PlayedTracksChangedEvent))
{
findLyrics();
}
Expand Down Expand Up @@ -154,11 +151,8 @@ void LyricsView::customEvent(QEvent *event)
{
saveLyrics();
}
else if (resulttext == tr("Edit Lyrics"))
{
editLyrics();
}
else if (resulttext == tr("Add Lyrics"))
else if ((resulttext == tr("Edit Lyrics")) ||
(resulttext == tr("Add Lyrics")))
{
editLyrics();
}
Expand Down
4 changes: 0 additions & 4 deletions mythplugins/mythmusic/mythmusic/musicplayer.cpp
View file
Expand Up @@ -1194,8 +1194,6 @@ MusicPlayer::RepeatMode MusicPlayer::toggleRepeatMode(void)
m_repeatMode = REPEAT_ALL;
break;
case REPEAT_ALL:
m_repeatMode = REPEAT_OFF;
break;
default:
m_repeatMode = REPEAT_OFF;
break;
Expand All @@ -1221,8 +1219,6 @@ MusicPlayer::ShuffleMode MusicPlayer::toggleShuffleMode(void)
m_shuffleMode = SHUFFLE_ARTIST;
break;
case SHUFFLE_ARTIST:
m_shuffleMode = SHUFFLE_OFF;
break;
default:
m_shuffleMode = SHUFFLE_OFF;
break;
Expand Down
30 changes: 9 additions & 21 deletions mythplugins/mythmusic/mythmusic/playlisteditorview.cpp
View file
Expand Up @@ -176,25 +176,15 @@ bool PlaylistEditorView::Create(void)

void PlaylistEditorView::customEvent(QEvent *event)
{
if (event->type() == MusicPlayerEvent::MetadataChangedEvent)
{
if ((event->type() == MusicPlayerEvent::MetadataChangedEvent) ||
(event->type() == MusicPlayerEvent::AlbumArtChangedEvent))
{ // NOLINT(bugprone-branch-clone)
// TODO: this could be more efficient
reloadTree();
}
else if (event->type() == MusicPlayerEvent::AlbumArtChangedEvent)
{
// TODO: this could be more efficient
reloadTree();
}
else if (event->type() == MusicPlayerEvent::TrackRemovedEvent)
{
updateSelectedTracks();
}
else if (event->type() == MusicPlayerEvent::TrackAddedEvent)
{
updateSelectedTracks();
}
else if (event->type() == MusicPlayerEvent::AllTracksRemovedEvent)
else if ((event->type() == MusicPlayerEvent::TrackRemovedEvent) ||
(event->type() == MusicPlayerEvent::TrackAddedEvent) ||
(event->type() == MusicPlayerEvent::AllTracksRemovedEvent))
{
updateSelectedTracks();
}
Expand Down Expand Up @@ -536,7 +526,7 @@ void PlaylistEditorView::updateSonglist(MusicGenericTree *node)
if (node->getAction() == "playlists" ||
node->getAction() == "smartplaylists" ||
node->getAction() == "smartplaylistcategory")
{
{ // NOLINT(bugprone-branch-clone)
}
else if (node->getAction() == "trackid" || node->getAction() == "cdtrack")
{
Expand Down Expand Up @@ -651,10 +641,8 @@ void PlaylistEditorView::ShowMenu(void)
{
menu = createPlaylistMenu();
}
else if (mnode->getAction() == "trackid")
{
}
else if (mnode->getAction() == "error")
else if ((mnode->getAction() == "trackid") ||
(mnode->getAction() == "error"))
{
}
else
Expand Down
28 changes: 10 additions & 18 deletions mythplugins/mythmusic/mythmusic/smartplaylist.cpp
View file
Expand Up @@ -1339,22 +1339,18 @@ void CriteriaRowEditor::enableSaveButton()
enabled = true;
else if (Field->m_type == ftDate)
{
if (Operator->m_noOfArguments == 0)
enabled = true;
else if (Operator->m_noOfArguments == 1 && !m_value1Selector->GetValue().isEmpty())
enabled = true;
else if (Operator->m_noOfArguments == 2 && !m_value1Selector->GetValue().isEmpty()
&& !m_value2Selector->GetValue().isEmpty())
if ((Operator->m_noOfArguments == 0) ||
(Operator->m_noOfArguments == 1 && !m_value1Selector->GetValue().isEmpty()) ||
(Operator->m_noOfArguments == 2 && !m_value1Selector->GetValue().isEmpty()
&& !m_value2Selector->GetValue().isEmpty()))
enabled = true;
}
else // ftString
{
if (Operator->m_noOfArguments == 0)
enabled = true;
else if (Operator->m_noOfArguments == 1 && !m_value1Edit->GetText().isEmpty())
enabled = true;
else if (Operator->m_noOfArguments == 2 && !m_value1Edit->GetText().isEmpty()
&& !m_value2Edit->GetText().isEmpty())
if ((Operator->m_noOfArguments == 0) ||
(Operator->m_noOfArguments == 1 && !m_value1Edit->GetText().isEmpty()) ||
(Operator->m_noOfArguments == 2 && !m_value1Edit->GetText().isEmpty()
&& !m_value2Edit->GetText().isEmpty()))
enabled = true;
}
}
Expand Down Expand Up @@ -1547,12 +1543,8 @@ void CriteriaRowEditor::valueButtonClicked(void)
msg = tr("Select a Title");
searchList = MusicMetadata::fillFieldList("title");
}
else if (m_fieldSelector->GetValue() == "Last Play")
{
editDate();
return;
}
else if (m_fieldSelector->GetValue() == "Date Imported")
else if ((m_fieldSelector->GetValue() == "Last Play") ||
(m_fieldSelector->GetValue() == "Date Imported"))
{
editDate();
return;
Expand Down
2 changes: 0 additions & 2 deletions mythtv/libs/libmyth/audio/audiooutputpulse.cpp
View file
Expand Up @@ -622,8 +622,6 @@ void AudioOutputPulseAudio::ContextStateCallback(pa_context *c, void *arg)
switch (pa_context_get_state(c))
{
case PA_CONTEXT_READY:
pa_threaded_mainloop_signal(audoutP->m_mainloop, 0);
break;
case PA_CONTEXT_TERMINATED:
case PA_CONTEXT_FAILED:
pa_threaded_mainloop_signal(audoutP->m_mainloop, 0);
Expand Down
8 changes: 0 additions & 8 deletions mythtv/libs/libmyth/audio/eldutils.cpp
View file
Expand Up @@ -213,17 +213,9 @@ void ELD::update_sad(int index,
break;

case TYPE_SACD:
break;

case TYPE_EAC3:
break;

case TYPE_DTS_HD:
break;

case TYPE_MLP:
break;

case TYPE_DST:
break;

Expand Down
5 changes: 2 additions & 3 deletions mythtv/libs/libmyth/remoteutil.cpp
View file
Expand Up @@ -121,9 +121,8 @@ bool RemoteDeleteRecording(uint recordingID, bool forceMetadataDelete,
.arg(forgetHistory ? "FORGET" : "NO_FORGET");
QStringList strlist(cmd);

if (!gCoreContext->SendReceiveStringList(strlist) || strlist.isEmpty())
result = false;
else if (strlist[0].toInt() == -2)
if ((!gCoreContext->SendReceiveStringList(strlist) || strlist.isEmpty()) ||
(strlist[0].toInt() == -2))
result = false;

if (!result)
Expand Down
5 changes: 3 additions & 2 deletions mythtv/libs/libmythbase/mythsystemlegacy.cpp
View file
Expand Up @@ -302,8 +302,9 @@ void MythSystemLegacy::Signal(MythSignal sig)
int posix_signal = SIGTRAP;
switch (sig)
{
case kSignalNone: break;
case kSignalUnknown: break;
case kSignalNone:
case kSignalUnknown:
break;
case kSignalHangup: posix_signal = SIGHUP; break;
case kSignalInterrupt: posix_signal = SIGINT; break;
case kSignalContinue: posix_signal = SIGCONT; break;
Expand Down
1 change: 0 additions & 1 deletion mythtv/libs/libmythbase/unzip.cpp
View file
Expand Up @@ -395,7 +395,6 @@ UnZip::ErrorCode UnZip::extractAll(const QDir& dir, ExtractionOptions options)
end = true;
break;
case CreateDirFailed:
break;
case Skip:
break;
case SkipAll:
Expand Down
36 changes: 12 additions & 24 deletions mythtv/libs/libmythfreemheg/Actions.cpp
View file
Expand Up @@ -176,12 +176,10 @@ void MHActionSequence::Initialise(MHParseNode *p, MHEngine *engine)
case C_GET_ITEM_STATUS:
pAction = new MHGetItemStatus;
break;
case C_GET_LABEL:
case C_GET_LABEL: // PushButton
case C_GET_LAST_ANCHOR_FIRED: // HyperText
pAction = new MHUnimplementedAction(pElemAction->GetTagNo());
break;// PushButton
case C_GET_LAST_ANCHOR_FIRED:
pAction = new MHUnimplementedAction(pElemAction->GetTagNo());
break;// HyperText
break;
case C_GET_LINE_COLOUR:
pAction = new MHGetLineColour;
break;
Expand Down Expand Up @@ -291,23 +289,17 @@ void MHActionSequence::Initialise(MHParseNode *p, MHEngine *engine)
pAction = new MHSetBoxSize;
break;
case C_SET_CACHE_PRIORITY:
case C_SET_COUNTER_END_POSITION: // Stream
pAction = new MHUnimplementedAction(pElemAction->GetTagNo());
break; // ?
case C_SET_COUNTER_END_POSITION:
pAction = new MHUnimplementedAction(pElemAction->GetTagNo());
break; // Stream
break;
case C_SET_COUNTER_POSITION:
pAction = new MHSetCounterPosition;
break; // Stream
case C_SET_COUNTER_TRIGGER:
pAction = new MHUnimplementedAction(pElemAction->GetTagNo());
break; // Stream
case C_SET_COUNTER_TRIGGER: // Stream
case C_SET_CURSOR_POSITION:
pAction = new MHUnimplementedAction(pElemAction->GetTagNo());
break; // ?
case C_SET_CURSOR_SHAPE:
pAction = new MHUnimplementedAction(pElemAction->GetTagNo());
break; // ?
break;
case C_SET_DATA:
pAction = new MHSetData;
break;
Expand Down Expand Up @@ -341,12 +333,10 @@ void MHActionSequence::Initialise(MHParseNode *p, MHEngine *engine)
case C_SET_LINE_WIDTH:
pAction = new MHSetLineWidth;
break;
case C_SET_OVERWRITE_MODE:
pAction = new MHUnimplementedAction(pElemAction->GetTagNo());
break; // EntryField
case C_SET_PALETTE_REF:
case C_SET_OVERWRITE_MODE: // EntryField
case C_SET_PALETTE_REF: // Visible
pAction = new MHUnimplementedAction(pElemAction->GetTagNo());
break; // Visible
break;
case C_SET_PORTION:
pAction = new MHSetPortion;
break;
Expand Down Expand Up @@ -426,10 +416,8 @@ void MHActionSequence::Initialise(MHParseNode *p, MHEngine *engine)
case C_GET_VIDEO_DECODE_OFFSET:
pAction = new MHGetVideoDecodeOffset;
break;
case C_GET_FOCUS_POSITION:
pAction = new MHUnimplementedAction(pElemAction->GetTagNo());
break; // HyperText
case C_SET_FOCUS_POSITION:
case C_GET_FOCUS_POSITION: // HyperText
case C_SET_FOCUS_POSITION: // HyperText
pAction = new MHUnimplementedAction(pElemAction->GetTagNo());
break; // HyperText
case C_SET_BITMAP_DECODE_OFFSET:
Expand Down
11 changes: 2 additions & 9 deletions mythtv/libs/libmythfreemheg/Programs.cpp
View file
Expand Up @@ -968,15 +968,8 @@ void MHResidentProgram::CallProgram(bool fIsFork, const MHObjectRef &success, co
else SetSuccessFlag(success, false, engine);

}
else if (m_Name.Equal("GAP")) { // GetAudioDescPref
if (args.Size() == 1)
{
engine->FindObject(*(args.GetAt(1)->GetReference()))->SetVariableValue(false);
SetSuccessFlag(success, true, engine);
}
else SetSuccessFlag(success, false, engine);
}
else if (m_Name.Equal("GSP")) { // GetSubtitlePref
else if (m_Name.Equal("GAP") || // GetAudioDescPref
m_Name.Equal("GSP")) { // GetSubtitlePref
if (args.Size() == 1)
{
engine->FindObject(*(args.GetAt(1)->GetReference()))->SetVariableValue(false);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythmetadata/metadatacommon.cpp
View file
Expand Up @@ -1210,7 +1210,7 @@ PeopleMap ParsePeople(const QDomElement& people)
QString jobstring = person.attribute("job");
PeopleType type = kPersonActor;
if (jobstring.toLower() == "actor")
type = kPersonActor;
type = kPersonActor; // NOLINT(bugprone-branch-clone)
else if (jobstring.toLower() == "author")
type = kPersonAuthor;
else if (jobstring.toLower() == "producer")
Expand Down Expand Up @@ -1268,7 +1268,7 @@ ArtworkMap ParseArtwork(const QDomElement& artwork)
QString typestring = image.attribute("type");
VideoArtworkType type = kArtworkCoverart;
if (typestring.toLower() == "coverart")
type = kArtworkCoverart;
type = kArtworkCoverart; // NOLINT(bugprone-branch-clone)
else if (typestring.toLower() == "fanart")
type = kArtworkFanart;
else if (typestring.toLower() == "banner")
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythmetadata/metadatafactory.cpp
View file
Expand Up @@ -642,7 +642,7 @@ LookupType GuessLookupType(ProgramInfo *pginfo)
if ((!pginfo->GetSubtitle().isEmpty() || pginfo->GetEpisode() > 0) &&
(catType == ProgramInfo::kCategorySeries ||
catType == ProgramInfo::kCategoryTVShow))
ret = kProbableTelevision;
ret = kProbableTelevision; // NOLINT(bugprone-branch-clone)
else if (catType == ProgramInfo::kCategoryMovie)
ret = kProbableMovie;
else if (pginfo->GetSeason() > 0 || pginfo->GetEpisode() > 0 ||
Expand Down
9 changes: 4 additions & 5 deletions mythtv/libs/libmythmetadata/musicmetadata.cpp
View file
Expand Up @@ -1243,7 +1243,7 @@ QString MusicMetadata::getAlbumArtFile(void)
QString res;

if ((albumart_image = m_albumArt->getImage(IT_FRONTCOVER)))
res = albumart_image->m_filename;
res = albumart_image->m_filename; // NOLINT(bugprone-branch-clone)
else if ((albumart_image = m_albumArt->getImage(IT_UNKNOWN)))
res = albumart_image->m_filename;
else if ((albumart_image = m_albumArt->getImage(IT_BACKCOVER)))
Expand Down Expand Up @@ -2164,7 +2164,9 @@ ImageType AlbumArtImages::guessImageType(const QString &filename)
ImageType type = IT_FRONTCOVER;

if (filename.contains("front", Qt::CaseInsensitive) ||
filename.contains(tr("front"), Qt::CaseInsensitive))
filename.contains(tr("front"), Qt::CaseInsensitive) ||
filename.contains("cover", Qt::CaseInsensitive) ||
filename.contains(tr("cover"), Qt::CaseInsensitive))
type = IT_FRONTCOVER;
else if (filename.contains("back", Qt::CaseInsensitive) ||
filename.contains(tr("back"), Qt::CaseInsensitive))
Expand All @@ -2175,9 +2177,6 @@ ImageType AlbumArtImages::guessImageType(const QString &filename)
else if (filename.contains("cd", Qt::CaseInsensitive) ||
filename.contains(tr("cd"), Qt::CaseInsensitive))
type = IT_CD;
else if (filename.contains("cover", Qt::CaseInsensitive) ||
filename.contains(tr("cover"), Qt::CaseInsensitive))
type = IT_FRONTCOVER;

return type;
}
Expand Down

0 comments on commit dbed56e

Please sign in to comment.