diff --git a/mythtv/programs/mythfrontend/channelrecpriority.cpp b/mythtv/programs/mythfrontend/channelrecpriority.cpp index fce54fb307c..6ef061707d0 100644 --- a/mythtv/programs/mythfrontend/channelrecpriority.cpp +++ b/mythtv/programs/mythfrontend/channelrecpriority.cpp @@ -3,7 +3,6 @@ #include // For std::sort() #include // For std::vector -using namespace std; #include "tv.h" @@ -350,9 +349,9 @@ void ChannelRecPriority::SortList() int i = 0; int j = 0; - vector sortingList; + std::vector sortingList; QMap::iterator pit; - vector::iterator sit; + std::vector::iterator sit; // copy m_channelData into sortingList for (i = 0, pit = m_channelData.begin(); pit != m_channelData.end(); @@ -366,12 +365,12 @@ void ChannelRecPriority::SortList() switch(m_sortType) { case byRecPriority: - sort(sortingList.begin(), sortingList.end(), + std::sort(sortingList.begin(), sortingList.end(), channelRecPrioritySort()); break; case byChannel: default: - sort(sortingList.begin(), sortingList.end(), + std::sort(sortingList.begin(), sortingList.end(), channelSort()); break; } diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp index a8d9f90458a..789689c0d3c 100644 --- a/mythtv/programs/mythfrontend/globalsettings.cpp +++ b/mythtv/programs/mythfrontend/globalsettings.cpp @@ -2307,7 +2307,7 @@ static HostComboBoxSetting *GuiVidModeResolution() "watching a video.")); MythDisplay* display = MythDisplay::AcquireRelease(); - vector scr = display->GetVideoModes(); + std::vector scr = display->GetVideoModes(); MythDisplay::AcquireRelease(false); for (auto & vmode : scr) { @@ -2357,7 +2357,7 @@ static HostComboBoxSetting *TVVidModeResolution(int idx=-1) gc->setHelpText(hstr); MythDisplay* display = MythDisplay::AcquireRelease(); - vector scr = display->GetVideoModes(); + std::vector scr = display->GetVideoModes(); MythDisplay::AcquireRelease(false); for (auto & vmode : scr) { @@ -2377,7 +2377,7 @@ void HostRefreshRateComboBoxSetting::ChangeResolution(StandardSetting * setting) QString resolution = setting->getValue(); int hz50 = -1; int hz60 = -1; - const vector list = GetRefreshRates(resolution); + const std::vector list = GetRefreshRates(resolution); addSelection(QObject::tr("Auto"), "0"); for (size_t i = 0; i < list.size(); ++i) { @@ -2403,7 +2403,7 @@ void HostRefreshRateComboBoxSetting::ChangeResolution(StandardSetting * setting) setEnabled(!list.empty()); } -vector HostRefreshRateComboBoxSetting::GetRefreshRates(const QString &res) +std::vector HostRefreshRateComboBoxSetting::GetRefreshRates(const QString &res) { QStringList slist = res.split("x"); int width = 0; @@ -2416,7 +2416,7 @@ vector HostRefreshRateComboBoxSetting::GetRefreshRates(const QString &re height = slist[1].toInt(&ok1); } - vector result; + std::vector result; if (ok0 && ok1) { QSize size(width, height); @@ -4626,7 +4626,7 @@ AppearanceSettings::AppearanceSettings() MythDisplay* display = MythDisplay::AcquireRelease(); if (display->VideoModesAvailable()) { - vector scr = display->GetVideoModes(); + std::vector scr = display->GetVideoModes(); if (!scr.empty()) addChild(UseVideoModes()); } diff --git a/mythtv/programs/mythfrontend/grabbersettings.cpp b/mythtv/programs/mythfrontend/grabbersettings.cpp index 807ecf6e2f1..01ccb666659 100644 --- a/mythtv/programs/mythfrontend/grabbersettings.cpp +++ b/mythtv/programs/mythfrontend/grabbersettings.cpp @@ -15,8 +15,6 @@ #include "metadatacommon.h" #include "grabbersettings.h" -using namespace std; - // --------------------------------------------------- bool GrabberSettings::Create() diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp index 8a2ae484303..672f7585f15 100644 --- a/mythtv/programs/mythfrontend/guidegrid.cpp +++ b/mythtv/programs/mythfrontend/guidegrid.cpp @@ -5,7 +5,6 @@ #include #include // for uint64_t #include // for _Deque_iterator, operator!=, etc -using namespace std; //qt #include @@ -576,9 +575,9 @@ void GuideGrid::Load(void) LoadFromScheduler(m_recList); fillChannelInfos(); - int maxchannel = max((int)GetChannelCount() - 1, 0); + int maxchannel = std::max((int)GetChannelCount() - 1, 0); setStartChannel((int)(m_currentStartChannel) - (m_channelCount / 2)); - m_channelCount = min(m_channelCount, maxchannel + 1); + m_channelCount = std::min(m_channelCount, maxchannel + 1); for (int y = 0; y < m_channelCount; ++y) { @@ -1409,7 +1408,7 @@ void GuideGrid::fillChannelInfos(bool gotostartchannel) if (gotostartchannel) { int ch = FindChannel(m_startChanID, m_startChanNum, false); - m_currentStartChannel = (uint) max(0, ch); + m_currentStartChannel = (uint) std::max(0, ch); } if (m_channelInfos.empty()) @@ -1551,8 +1550,8 @@ void GuideGrid::fillProgramRowInfos(int firstRow, bool useExistingData) { firstRow = 0; allRows = true; - numRows = min((unsigned int)m_channelInfos.size(), - (unsigned int)m_guideGrid->getChannelCount()); + numRows = std::min((unsigned int)m_channelInfos.size(), + (unsigned int)m_guideGrid->getChannelCount()); } QVector chanNums; QVector proglists; @@ -2230,8 +2229,8 @@ void GuideGrid::generateListings() int maxchannel = 0; fillChannelInfos(); - maxchannel = max((int)GetChannelCount() - 1, 0); - m_channelCount = min(m_guideGrid->getChannelCount(), maxchannel + 1); + maxchannel = std::max((int)GetChannelCount() - 1, 0); + m_channelCount = std::min(m_guideGrid->getChannelCount(), maxchannel + 1); LoadFromScheduler(m_recList); fillProgramInfos(); diff --git a/mythtv/programs/mythfrontend/guidegrid.h b/mythtv/programs/mythfrontend/guidegrid.h index 9af7e1ac7e8..0e8b94806fd 100644 --- a/mythtv/programs/mythfrontend/guidegrid.h +++ b/mythtv/programs/mythfrontend/guidegrid.h @@ -6,7 +6,6 @@ #include #include #include -using namespace std; // qt #include @@ -26,16 +25,14 @@ using namespace std; // mythfrontend #include "schedulecommon.h" -using namespace std; - class ProgramInfo; class QTimer; class MythUIButtonList; class MythUIGuideGrid; -using db_chan_list_t = vector ; -using db_chan_list_list_t = vector; -using ProgInfoGuideArray = array,MAX_DISPLAY_CHANS>; +using db_chan_list_t = std::vector ; +using db_chan_list_list_t = std::vector; +using ProgInfoGuideArray = std::array,MAX_DISPLAY_CHANS>; class JumpToChannel; class JumpToChannelListener @@ -244,7 +241,7 @@ class GuideGrid : public ScheduleCommon, public JumpToChannelListener db_chan_list_list_t m_channelInfos; QMap m_channelInfoIdx; - vector m_programs; + std::vector m_programs; ProgInfoGuideArray m_programInfos {}; ProgramList m_recList; diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp index 3debf6f3f82..f5e12d91b4a 100644 --- a/mythtv/programs/mythfrontend/main.cpp +++ b/mythtv/programs/mythfrontend/main.cpp @@ -4,7 +4,6 @@ #include #include #include -using namespace std; #include #include @@ -1748,7 +1747,7 @@ static bool WasAutomaticStart(void) // to record, to obtain guide data or or for a // daily wakeup/shutdown period if (abs(startupTime.secsTo(MythDate::current())) < - max(startupSecs, 15 * 60)) + std::max(startupSecs, 15 * 60)) { LOG(VB_GENERAL, LOG_INFO, "Close to auto-start time, AUTO-Startup assumed"); @@ -1756,7 +1755,7 @@ static bool WasAutomaticStart(void) QString str = gCoreContext->GetSetting("MythFillSuggestedRunTime"); QDateTime guideRunTime = MythDate::fromString(str); if (guideRunTime.secsTo(MythDate::current()) < - max(startupSecs, 15 * 60)) + std::max(startupSecs, 15 * 60)) { LOG(VB_GENERAL, LOG_INFO, "Close to MythFillDB suggested run time, AUTO-Startup to fetch guide data?"); @@ -1899,7 +1898,7 @@ int main(int argc, char **argv) bBypassAutoDiscovery = true; if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) - cerr << "Unable to ignore SIGPIPE\n"; + std::cerr << "Unable to ignore SIGPIPE\n"; if (!cmdline.toString("geometry").isEmpty()) MythMainWindow::ParseGeometryOverride(cmdline.toString("geometry")); @@ -2108,7 +2107,7 @@ int main(int argc, char **argv) fe_sd_notify("STATUS=Loading theme updates"); std::unique_ptr themeUpdateChecker; if (gCoreContext->GetBoolSetting("ThemeUpdateNofications", true)) - themeUpdateChecker = make_unique(); + themeUpdateChecker = std::make_unique(); MythSystemEventHandler sysEventHandler {}; diff --git a/mythtv/programs/mythfrontend/networkcontrol.h b/mythtv/programs/mythfrontend/networkcontrol.h index e95c2974ebd..5e7e444b799 100644 --- a/mythtv/programs/mythfrontend/networkcontrol.h +++ b/mythtv/programs/mythfrontend/networkcontrol.h @@ -2,7 +2,6 @@ #define NETWORKCONTROL_H_ #include -using namespace std; #include #include diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp index 3ce88b09e8a..ff49b80ac98 100644 --- a/mythtv/programs/mythfrontend/playbackbox.cpp +++ b/mythtv/programs/mythfrontend/playbackbox.cpp @@ -1721,7 +1721,7 @@ bool PlaybackBox::UpdateUILists(void) bool isDeletedGroup = (m_recGroup == "Deleted"); bool isLiveTvGroup = (m_recGroup == "LiveTV"); - vector list; + std::vector list; bool newest_first = (0==m_allOrder); m_programInfoCache.GetOrdered(list, newest_first); for (auto *p : list) @@ -4284,7 +4284,7 @@ void PlaybackBox::customEvent(QEvent *event) ProgramInfo *pginfo = FindProgramInUILists(recordingID); if (pginfo) { - pginfo->SetFilesize(max(pginfo->GetFilesize(), fs)); + pginfo->SetFilesize(std::max(pginfo->GetFilesize(), fs)); old_avail = pginfo->GetAvailableStatus(); pginfo->SetAvailableStatus(availableStatus, "AVAILABILITY"); } diff --git a/mythtv/programs/mythfrontend/playbackbox.h b/mythtv/programs/mythfrontend/playbackbox.h index 1f36596dfbf..6266a844685 100644 --- a/mythtv/programs/mythfrontend/playbackbox.h +++ b/mythtv/programs/mythfrontend/playbackbox.h @@ -8,7 +8,6 @@ #include #include #include -using namespace std; #include #include diff --git a/mythtv/programs/mythfrontend/playbackboxhelper.cpp b/mythtv/programs/mythfrontend/playbackboxhelper.cpp index 16d66eb3220..54630745186 100644 --- a/mythtv/programs/mythfrontend/playbackboxhelper.cpp +++ b/mythtv/programs/mythfrontend/playbackboxhelper.cpp @@ -1,5 +1,4 @@ #include -using namespace std; #include #include diff --git a/mythtv/programs/mythfrontend/prevreclist.cpp b/mythtv/programs/mythfrontend/prevreclist.cpp index c2a5d4b8a03..3670226f0ef 100644 --- a/mythtv/programs/mythfrontend/prevreclist.cpp +++ b/mythtv/programs/mythfrontend/prevreclist.cpp @@ -23,7 +23,6 @@ #include #include // for _Deque_iterator, operator-, etc #include // for reverse_iterator -using namespace std; // QT #include diff --git a/mythtv/programs/mythfrontend/proglist.cpp b/mythtv/programs/mythfrontend/proglist.cpp index 0b38351e2b3..1419f21775e 100644 --- a/mythtv/programs/mythfrontend/proglist.cpp +++ b/mythtv/programs/mythfrontend/proglist.cpp @@ -6,7 +6,6 @@ #include #include // for _Deque_iterator, operator-, etc #include // for reverse_iterator -using namespace std; // Qt #include @@ -992,7 +991,7 @@ void ProgLister::FillViewList(const QString &view) m_curView = m_viewList.size() - 1; } -class plCompare : binary_function +class plCompare : std::binary_function { public: virtual bool operator()(const ProgramInfo*, const ProgramInfo*) = 0; diff --git a/mythtv/programs/mythfrontend/programinfocache.h b/mythtv/programs/mythfrontend/programinfocache.h index c9313faf885..fdf1ad62966 100644 --- a/mythtv/programs/mythfrontend/programinfocache.h +++ b/mythtv/programs/mythfrontend/programinfocache.h @@ -6,7 +6,6 @@ // C++ headers #include #include -using namespace std; // Qt headers #include @@ -37,7 +36,7 @@ class ProgramInfoCache bool Update(const ProgramInfo &pginfo); bool UpdateFileSize(uint recordingID, uint64_t filesize); QString GetRecGroup(uint recordingID) const; - void GetOrdered(vector &list, bool newest_first = false); + void GetOrdered(std::vector &list, bool newest_first = false); /// \note This must only be called from the UI thread. bool empty(void) const { return m_cache.empty(); } ProgramInfo *GetRecordingInfo(uint recordingID) const; @@ -56,7 +55,7 @@ class ProgramInfoCache mutable QMutex m_lock; Cache m_cache; - vector *m_nextCache {nullptr}; + std::vector *m_nextCache {nullptr}; QObject *m_listener {nullptr}; bool m_loadIsQueued {false}; uint m_loadsInProgress {0}; diff --git a/mythtv/programs/mythfrontend/programrecpriority.cpp b/mythtv/programs/mythfrontend/programrecpriority.cpp index 0f94dc8c065..671856debe5 100644 --- a/mythtv/programs/mythfrontend/programrecpriority.cpp +++ b/mythtv/programs/mythfrontend/programrecpriority.cpp @@ -4,7 +4,6 @@ // C/C++ headers #include // For std::vector -using namespace std; // QT headers #include diff --git a/mythtv/programs/mythfrontend/statusbox.cpp b/mythtv/programs/mythfrontend/statusbox.cpp index 51e061fe632..d7343111aa0 100644 --- a/mythtv/programs/mythfrontend/statusbox.cpp +++ b/mythtv/programs/mythfrontend/statusbox.cpp @@ -1,8 +1,6 @@ #include "statusbox.h" -using namespace std; - #include #include #include diff --git a/mythtv/programs/mythfrontend/statusbox.h b/mythtv/programs/mythfrontend/statusbox.h index 9e635beb62b..3715b614ccc 100644 --- a/mythtv/programs/mythfrontend/statusbox.h +++ b/mythtv/programs/mythfrontend/statusbox.h @@ -11,7 +11,6 @@ // Std #include #include // For std::vector -using namespace std; class ProgramInfo; class MythUIText; @@ -85,7 +84,7 @@ class StatusBox : public MythScreenType recprof2bps_t m_recordingProfilesBps; - vector m_expList; + std::vector m_expList; MythScreenStack *m_popupStack {nullptr}; diff --git a/mythtv/programs/mythfrontend/videolist.cpp b/mythtv/programs/mythfrontend/videolist.cpp index 21af12ac579..a4cfac64a5d 100644 --- a/mythtv/programs/mythfrontend/videolist.cpp +++ b/mythtv/programs/mythfrontend/videolist.cpp @@ -1,7 +1,6 @@ #include #include #include -using namespace std; #include #include @@ -333,7 +332,7 @@ static int AddFileNode(MythGenericTree *where_to_add, const QString& name, class VideoListImp { public: - using metadata_view_list = vector; + using metadata_view_list = std::vector; private: enum metadata_list_type { ltNone, ltFileSystem, ltDBMetadata, @@ -791,14 +790,14 @@ void VideoListImp::buildGroupList(metadata_list_type whence) metadata_view_list mlist; mlist.reserve(m_metadata.getList().size()); - back_insert_iterator mli(mlist); + std::back_insert_iterator mli(mlist); transform(m_metadata.getList().begin(), m_metadata.getList().end(), mli, to_metadata_ptr()); metadata_path_sort mps = metadata_path_sort(); - sort(mlist.begin(), mlist.end(), mps); + std::sort(mlist.begin(), mlist.end(), mps); - using group_to_node_map = map; + using group_to_node_map = std::map; group_to_node_map gtnm; meta_dir_node *video_root = &m_metadataTree; @@ -810,13 +809,13 @@ void VideoListImp::buildGroupList(metadata_list_type whence) { all_group_node->addEntry(smart_meta_node(new meta_data_node(data))); - vector groups; + std::vector groups; switch (whence) { case ltDBGenreGroup: { - vector > genres = + std::vector > genres = data->GetGenres(); for (const auto& item : genres) @@ -845,7 +844,7 @@ void VideoListImp::buildGroupList(metadata_list_type whence) } case ltDBCastGroup: { - vector > cast = data->GetCast(); + std::vector > cast = data->GetCast(); for (const auto& item : cast) groups.push_back(item.second); @@ -911,7 +910,7 @@ void VideoListImp::buildTVList(void) metadata_view_list mlist; mlist.reserve(m_metadata.getList().size()); - back_insert_iterator mli(mlist); + std::back_insert_iterator mli(mlist); transform(m_metadata.getList().begin(), m_metadata.getList().end(), mli, to_metadata_ptr()); @@ -955,17 +954,17 @@ void VideoListImp::buildDbList() metadata_view_list mlist; mlist.reserve(m_metadata.getList().size()); - back_insert_iterator mli(mlist); + std::back_insert_iterator mli(mlist); transform(m_metadata.getList().begin(), m_metadata.getList().end(), mli, to_metadata_ptr()); // print_meta_list(mlist); metadata_path_sort mps = metadata_path_sort(); - sort(mlist.begin(), mlist.end(), mps); + std::sort(mlist.begin(), mlist.end(), mps); // TODO: break out the prefix in the DB so this isn't needed - using prefix_to_node_map = map; + using prefix_to_node_map = std::map; prefix_to_node_map ptnm; QStringList dirs = GetVideoDirs(); @@ -996,7 +995,7 @@ void VideoListImp::buildFsysList() // Fill metadata from directory structure // - using node_to_path_list = vector >; + using node_to_path_list = std::vector >; node_to_path_list node_paths; @@ -1097,7 +1096,7 @@ struct call_tree_flat void tree_view_to_flat(meta_dir_node &tree, VideoListImp::metadata_view_list &flat) { - back_insert_iterator bip(flat); + std::back_insert_iterator bip(flat); transform(tree.entries_begin(), tree.entries_end(), bip, to_metadata_ptr()); @@ -1142,7 +1141,7 @@ void VideoListImp::update_meta_view(bool flat_list) class dirhandler : public DirectoryHandler { public: - using free_list = list >; + using free_list = std::list >; public: dirhandler(smart_dir_node &directory, const QString &prefix, diff --git a/mythtv/programs/mythfrontend/videometadatasettings.cpp b/mythtv/programs/mythfrontend/videometadatasettings.cpp index 1c981552988..7ccc78651ba 100644 --- a/mythtv/programs/mythfrontend/videometadatasettings.cpp +++ b/mythtv/programs/mythfrontend/videometadatasettings.cpp @@ -11,8 +11,6 @@ #include "videometadatasettings.h" -using namespace std; - // --------------------------------------------------- bool MetadataSettings::Create() diff --git a/mythtv/programs/mythfrontend/videoplayersettings.cpp b/mythtv/programs/mythfrontend/videoplayersettings.cpp index 85aa647a914..c8b09c6c9f5 100644 --- a/mythtv/programs/mythfrontend/videoplayersettings.cpp +++ b/mythtv/programs/mythfrontend/videoplayersettings.cpp @@ -1,5 +1,4 @@ #include -using namespace std; // Qt #include diff --git a/mythtv/programs/mythfrontend/viewschedulediff.cpp b/mythtv/programs/mythfrontend/viewschedulediff.cpp index c1e6d73b59c..325df3b7844 100644 --- a/mythtv/programs/mythfrontend/viewschedulediff.cpp +++ b/mythtv/programs/mythfrontend/viewschedulediff.cpp @@ -17,8 +17,6 @@ //mythfrontend #include "viewschedulediff.h" -using namespace std; - bool ViewScheduleDiff::Create() { if (!LoadWindowFromXML("schedule-ui.xml", "schedulediff", this))