From 684494a2f671fa9a8345dfb27a7164a25d47a85a Mon Sep 17 00:00:00 2001 From: Gary Buhrmaster Date: Tue, 14 Jul 2020 15:06:19 +0000 Subject: [PATCH 3/7] Rename the ScanFrequency starting scan frequency UI element in videosource.cpp Renamed to avoid (global) name conflict with ScanFrequency class in libs/libmythtv/channelscan/channelscanmiscsettings.h --- mythtv/libs/libmythtv/videosource.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp index 04c0f2a832..38fb8d84fa 100644 --- a/mythtv/libs/libmythtv/videosource.cpp +++ b/mythtv/libs/libmythtv/videosource.cpp @@ -397,10 +397,10 @@ class CaptureCardTextEditSetting : public MythUITextEditSetting } }; -class ScanFrequency : public MythUITextEditSetting +class ScanFrequencyStart : public MythUITextEditSetting { public: - explicit ScanFrequency(const VideoSource &parent) : + explicit ScanFrequencyStart(const VideoSource &parent) : MythUITextEditSetting(new VideoSourceDBStorage(this, parent, "scanfrequency")) { setLabel(QObject::tr("Scan Frequency")); @@ -674,7 +674,7 @@ VideoSource::VideoSource() addChild(m_name = new Name(*this)); addChild(new XMLTVGrabber(*this)); addChild(new FreqTableSelector(*this)); - addChild(new ScanFrequency(*this)); + addChild(new ScanFrequencyStart(*this)); addChild(new DVBNetID(*this, -1, -1)); addChild(new BouquetID(*this, 0, 0)); addChild(new RegionID(*this, 0, 0)); -- 2.26.2