Permalink
Browse files

Remove some dead code from mythfilldatabase

Coverity ID 746797
Coverity ID 746798
  • Loading branch information...
stuartm committed Dec 6, 2012
1 parent 2c91c56 commit 8158cf7b7bbe5413e6d7d9cf3109c3bfa603c590
@@ -38,7 +38,6 @@ The schema contains the following tables:
\htmlonly
<table>
<tr><td>callsignnetworkmap <td>pk(id)
<tr><td>capturecard <td>pk(cardid)
<tr><td>cardinput <td>pk(cardinputid)
<tr><td>channel <td>pk(chanid) k(channum,sourceid)
@@ -58,7 +57,6 @@ The schema contains the following tables:
<tr><td>keybindings <td>pk(context,action,hostname)
<tr><td>keyword <td>uk(phrase,searchtype)
<tr><td>mythlog <td>pk(logid)
<tr><td>networkiconmap <td>pk(id) uk(network)
<tr><td>oldprogram <td>pk(oldtitle)
<tr><td>oldrecorded <td>k(endtime) k(title) k(seriesid) k(programid)
pk(station,starttime,title)
@@ -2370,13 +2368,6 @@ bool InitializeMythSchema(void)
"Inserting MythTV initial database information.");
const char *updates[] = {
"CREATE TABLE callsignnetworkmap ("
" id int(11) NOT NULL AUTO_INCREMENT,"
" callsign varchar(20) NOT NULL DEFAULT '',"
" network varchar(20) NOT NULL DEFAULT '',"
" PRIMARY KEY (id),"
" UNIQUE KEY callsign (callsign)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;",
"CREATE TABLE capturecard ("
" cardid int(10) unsigned NOT NULL AUTO_INCREMENT,"
" videodevice varchar(128) DEFAULT NULL,"
@@ -2871,13 +2862,6 @@ bool InitializeMythSchema(void)
" PRIMARY KEY (logid),"
" KEY module (module)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;",
"CREATE TABLE networkiconmap ("
" id int(11) NOT NULL AUTO_INCREMENT,"
" network varchar(20) NOT NULL DEFAULT '',"
" url varchar(255) NOT NULL DEFAULT '',"
" PRIMARY KEY (id),"
" UNIQUE KEY network (network)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;",
"CREATE TABLE oldfind ("
" recordid int(11) NOT NULL DEFAULT '0',"
" findid int(11) NOT NULL DEFAULT '0',"
@@ -190,19 +190,6 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
"channel lineup.")
->SetGroup("Channel List Handling");
add("--no-mark-repeats", "markrepeats", true, "do not mark repeats", "");
add("--export-icon-map", "exporticonmap", "iconmap.xml",
"export icon map to file", "")
->SetGroup("Channel Icon Handling");
add("--import-icon-map", "importiconmap", "iconmap.xml",
"import icon map to file", "")
->SetGroup("Channel Icon Handling");
add("--update-icon-map", "updateiconmap", false,
"updates icon map icons", "")
->SetGroup("Channel Icon Handling");
add("--reset-icon-map", "reseticonmap", "", "resets icon maps",
"Reset all icon maps. If given 'all' as an optional value, reset "
"channel icons as well.")
->SetGroup("Channel Icon Handling");
add("--graboptions", "graboptions", "", "", "")
->SetRemoved("mythfilldatabase now passes any text after an\n"
@@ -101,7 +101,7 @@ void FillData::SetRefresh(int day, bool set)
}
// DataDirect stuff
void FillData::DataDirectStationUpdate(Source source, bool update_icons)
void FillData::DataDirectStationUpdate(Source source)
{
DataDirectProcessor::UpdateStationViewTable(source.lineupid);
@@ -117,9 +117,6 @@ void FillData::DataDirectStationUpdate(Source source, bool update_icons)
}
// TODO delete any channels which no longer exist in listings source
if (update_icons)
icon_data.UpdateSourceIcons(source.id);
// Unselect channels not in users lineup for DVB, HDTV
if (!insert_channels && (new_channels > 0) &&
is_grabber_labs(source.xmltvgrabber))
@@ -179,7 +176,7 @@ bool FillData::DataDirectUpdateChannels(Source source)
}
if (ok)
DataDirectStationUpdate(source, false);
DataDirectStationUpdate(source);
return ok;
}
@@ -332,7 +329,6 @@ bool FillData::GrabDataFromFile(int id, QString &filename)
return false;
chan_data.handleChannels(id, &chanlist);
icon_data.UpdateSourceIcons(id);
if (proglist.count() == 0)
{
LOG(VB_GENERAL, LOG_INFO, "No programs found in data.");
@@ -15,7 +15,6 @@ using namespace std;
// filldata headers
#include "channeldata.h"
#include "xmltvparser.h"
#include "icondata.h"
#define REFRESH_MAX 21
@@ -59,7 +58,7 @@ class FillData
void SetRefresh(int day, bool set);
void DataDirectStationUpdate(Source source, bool update_icons = true);
void DataDirectStationUpdate(Source source);
bool DataDirectUpdateChannels(Source source);
bool GrabDDData(Source source, int poffset,
QDate pdate, int ddSource);
@@ -79,7 +78,6 @@ class FillData
ProgramData prog_data;
ChannelData chan_data;
XMLTVParser xmltv_parser;
IconData icon_data;
DataDirectProcessor ddprocessor;
QString logged_in;
Oops, something went wrong.

0 comments on commit 8158cf7

Please sign in to comment.