Clean up unused parameter/variable warnings from removing DataDirect.

MythTV · Feb 27, 2019 · 7f28a74 · 7f28a74
1 parent 97c40cd
commit 7f28a74
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 23 deletions.
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
@@ -10492,16 +10492,6 @@ bool TV::HandleOSDChannelEdit(PlayerContext *ctx, QString action)
  *  \brief Automatically fills in as much information as possible.
  */
 void TV::ChannelEditAutoFill(const PlayerContext *ctx, InfoMap &infoMap) const
-{
-    QMap<QString,bool> dummy;
-    ChannelEditAutoFill(ctx, infoMap, dummy);
-}
-
-/** \fn TV::ChannelEditAutoFill(const PlayerContext*,InfoMap&,const QMap<QString,bool>&) const
- *  \brief Automatically fills in as much information as possible.
- */
-void TV::ChannelEditAutoFill(const PlayerContext *ctx, InfoMap &infoMap,
-                             const QMap<QString,bool> &changed) const
 {
     const QString keys[4] = { "XMLTV", "callsign", "channame", "channum", };
 

diff --git a/mythtv/libs/libmythtv/tv_play.h b/mythtv/libs/libmythtv/tv_play.h
@@ -692,8 +692,6 @@ class MTV_PUBLIC TV : public QObject, public MenuItemDisplayer
     void StartChannelEditMode(PlayerContext*);
     bool HandleOSDChannelEdit(PlayerContext*, QString action);
     void ChannelEditAutoFill(const PlayerContext*, InfoMap&) const;
-    void ChannelEditAutoFill(const PlayerContext*, InfoMap&,
-                             const QMap<QString,bool>&) const;
     void ChannelEditXDSFill(const PlayerContext*, InfoMap&) const;
 
     // General dialog handling

diff --git a/mythtv/programs/mythbackend/services/channel.cpp b/mythtv/programs/mythbackend/services/channel.cpp
@@ -357,9 +357,9 @@ bool Channel::RemoveVideoSource( uint nSourceID )
 //
 /////////////////////////////////////////////////////////////////////////////
 
-DTC::LineupList* Channel::GetDDLineupList( const QString &sSource,
-                                           const QString &sUserId,
-                                           const QString &sPassword )
+DTC::LineupList* Channel::GetDDLineupList( const QString &/*sSource*/,
+                                           const QString &/*sUserId*/,
+                                           const QString &/*sPassword*/ )
 {
     DTC::LineupList *pLineups = new DTC::LineupList();
     return pLineups;

diff --git a/mythtv/programs/mythbackend/services/channel.h b/mythtv/programs/mythbackend/services/channel.h
@@ -118,9 +118,9 @@ class Channel : public ChannelServices
 
         bool                      RemoveVideoSource      ( uint SourceID ) override; // ChannelServices
 
-        DTC::LineupList*          GetDDLineupList        ( const QString &Source,
-                                                           const QString &UserId,
-                                                           const QString &Password ) override; // ChannelServices
+        DTC::LineupList*          GetDDLineupList        ( const QString &/*Source*/,
+                                                           const QString &/*UserId*/,
+                                                           const QString &/*Password*/ ) override; // ChannelServices
 
         int                       FetchChannelsFromSource( const uint SourceId,
                                                            const uint CardId,

diff --git a/mythtv/programs/mythfilldatabase/filldata.cpp b/mythtv/programs/mythfilldatabase/filldata.cpp
@@ -109,7 +109,7 @@ bool FillData::GrabDataFromFile(int id, QString &filename)
     return true;
 }
 
-bool FillData::GrabData(Source source, int offset, QDate *qCurrentDate)
+bool FillData::GrabData(Source source, int offset)
 {
     QString xmltv_grabber = source.xmltvgrabber;
 
@@ -242,7 +242,6 @@ bool FillData::Run(SourceList &sourcelist)
 
     m_need_post_grab_proc = false;
     int nonewdata = 0;
-    bool has_dd_source = false;
 
     for (it = sourcelist.begin(); it != sourcelist.end(); ++it)
     {
@@ -614,7 +613,7 @@ bool FillData::Run(SourceList &sourcelist)
                 {
                     LOG(VB_GENERAL, LOG_NOTICE,
                         QString("Refreshing data for ") + currDate);
-                    if (!GrabData(*it, i, &qCurrentDate))
+                    if (!GrabData(*it, i))
                     {
                         ++failures;
                         if (!m_fatalErrors.empty() || m_interrupted)

diff --git a/mythtv/programs/mythfilldatabase/filldata.h b/mythtv/programs/mythfilldatabase/filldata.h
@@ -50,7 +50,7 @@ class FillData
     void SetRefresh(int day, bool set);
 
     bool GrabDataFromFile(int id, QString &filename);
-    bool GrabData(Source source, int offset, QDate *qCurrentDate = nullptr);
+    bool GrabData(Source source, int offset);
     bool Run(SourceList &sourcelist);
 
     enum

diff --git a/mythtv/programs/mythfilldatabase/main.cpp b/mythtv/programs/mythfilldatabase/main.cpp
@@ -48,7 +48,6 @@ int main(int argc, char *argv[])
 {
     FillData fill_data;
     int fromfile_id = 1;
-    int fromfile_offset = 0;
     QString fromfile_name;
     bool from_file = false;
     bool mark_repeats = true;