Ticket #13653: 0003-Rename-the-ScanFrequency-starting-scan-frequency-UI-.patch

File 0003-Rename-the-ScanFrequency-starting-scan-frequency-UI-.patch, 1.5 KB (added by Gary Buhrmaster, 4 months ago)

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

    From 684494a2f671fa9a8345dfb27a7164a25d47a85a Mon Sep 17 00:00:00 2001
    From: Gary Buhrmaster <gary.buhrmaster@gmail.com>
    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 b class CaptureCardTextEditSetting : public MythUITextEditSetting 
    397397    }
    398398};
    399399
    400 class ScanFrequency : public MythUITextEditSetting
     400class ScanFrequencyStart : public MythUITextEditSetting
    401401{
    402402  public:
    403     explicit ScanFrequency(const VideoSource &parent) :
     403    explicit ScanFrequencyStart(const VideoSource &parent) :
    404404        MythUITextEditSetting(new VideoSourceDBStorage(this, parent, "scanfrequency"))
    405405    {
    406406       setLabel(QObject::tr("Scan Frequency"));
    VideoSource::VideoSource() 
    674674    addChild(m_name = new Name(*this));
    675675    addChild(new XMLTVGrabber(*this));
    676676    addChild(new FreqTableSelector(*this));
    677     addChild(new ScanFrequency(*this));
     677    addChild(new ScanFrequencyStart(*this));
    678678    addChild(new DVBNetID(*this, -1, -1));
    679679    addChild(new BouquetID(*this, 0, 0));
    680680    addChild(new RegionID(*this, 0, 0));