Silence compilation warnings.

12 files changed, 28 insertions, 31 deletions

diff --git a/pages/edit_searchtimer.ecpp b/pages/edit_searchtimer.ecpp
index d6a0aba..a17b9d8 100644
--- a/pages/edit_searchtimer.ecpp
+++ b/pages/edit_searchtimer.ecpp
@@ -30,9 +30,7 @@ using namespace vdrlive;
 	bool usesubtitle = false;
 	bool usedescr = false;
 	int usechannel = SearchTimer::NoChannel;
-	tChannelID channelidfrom;
 	tChannelID channelfrom;
-	tChannelID channelidto;
 	tChannelID channelto;
 	string changrpsel = "";
 	bool usetime = false;
diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp
index 8792c23..8920b77 100644
--- a/pages/edit_timer.ecpp
+++ b/pages/edit_timer.ecpp
@@ -231,7 +231,7 @@ cTimer* timer;
 					             for (RecordingDirs::iterator rdir = recordingdirs.begin(); rdir != recordingdirs.end(); ++rdir) {
 						        std::string dir = *rdir;
 </%cpp>
-		    					<option value="<$ dir $>"
+							<option value="<$ dir $>"
 %							if (*rdir == directory) {
 							selected="selected"
 %							}
diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp
index 5c46557..f84287a 100644
--- a/pages/multischedule.ecpp
+++ b/pages/multischedule.ecpp
@@ -31,11 +31,11 @@ struct SchedEntry {
 	int row_count;
 };
 
-std::string 					channel_groups_setting;
+std::string				channel_groups_setting;
 std::vector<std::string>		channel_groups_names;
-std::vector< std::vector<int> > channel_groups_numbers;
+std::vector< std::vector<int> >		channel_groups_numbers;
 std::vector<std::string>		times_names;
-std::vector<time_t>      		times_start;
+std::vector<time_t>			times_start;
 </%pre>
 <%args>
 	int channel = -1;
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 2be03a0..bbb8f38 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -81,7 +81,7 @@ int update_status(1);
 	if ((duration >= 0) && ((progress < 0) || (duration == 0)))
 		cls +="_invisible";
 </%cpp>
-<div class="<$ cls $>"><div class="__elapsed" <%cpp> if (!id.empty()) { </%cpp>id="<$ id $>"<%cpp> } </%cpp> style="width: <$ progress $>px"></div></div>
+<div class="<$ cls $>"><div class="__elapsed" <%cpp> if (!id.empty()) { </%cpp>id="<$ id $>"<%cpp> } </%cpp>style="width: <$ progress $>px"></div></div>
 </%def>
 
 <# ---------------------------------------------------------------------- #>
@@ -95,7 +95,7 @@ int update_status(1);
 	string alt;
 	string id;
 </%args>
-<%cpp> { </%cpp> <a <%cpp> if (!id.empty()) { </%cpp> id="<$ id $>" <%cpp> } </%cpp><& hide_element hide=(id.empty()? 0 : 1) &> href="vdr_request/<$ action $>?param=<$ param $>" <%cpp>if (!tip.empty()) { </%cpp><& tooltip.hint text=(tip) &> <%cpp> } </%cpp>><img src="<$ LiveSetup().GetThemedLink("img", image) $>" alt="<$ alt $>"></img></a> <%cpp> } </%cpp>
+<%cpp> { </%cpp><a <%cpp> if (!id.empty()) { </%cpp>id="<$ id $>" <%cpp> } </%cpp><& hide_element hide=(id.empty()? 0 : 1) &> href="vdr_request/<$ action $>?param=<$ param $>" <%cpp>if (!tip.empty()) { </%cpp><& tooltip.hint text=(tip) &> <%cpp> } </%cpp>><img src="<$ LiveSetup().GetThemedLink("img", image) $>" alt="<$ alt $>"></img></a> <%cpp> } </%cpp>
 </%def>
 
 <# ---------------------------------------------------------------------- #>
@@ -104,7 +104,7 @@ int update_status(1);
 <%args>
 	string title;
 </%args>
-<%cpp> if (LiveSetup().GetShowIMDb()) { </%cpp> <a href="http://www.imdb.com/find?s=all&q=<$ StringUrlEncode(title) $>" target="_blank"><img src="<$ LiveSetup().GetThemedLink("img", "imdb.png") $>" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a> <%cpp> } </%cpp>
+<%cpp> if (LiveSetup().GetShowIMDb()) { </%cpp><a href="http://www.imdb.com/find?s=all&q=<$ StringUrlEncode(title) $>" target="_blank"><img src="<$ LiveSetup().GetThemedLink("img", "imdb.png") $>" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a> <%cpp> } </%cpp>
 </%def>
 
 <# ---------------------------------------------------------------------- #>
@@ -186,7 +186,7 @@ int update_status(1);
 	<script type="text/javascript"><!--
 		var liveEnhanced = new PageEnhance({
 				infoWinOptions: {
-			  		buttonimg: 'img/transparent.png',
+					buttonimg: 'img/transparent.png',
 					loadingMsg: '<$ tr("loading data") $>',
 					errorMsg: '<$ tr("an error occured!") $>'
 				},
@@ -310,7 +310,8 @@ int update_status(1);
 			<& pageelems.imdb_info_href title=(title) &>
 <%cpp>
 			}
-</%cpp>		</td>
+</%cpp>
+		</td>
 <%cpp>
 	}
 </%cpp>
@@ -338,7 +339,7 @@ int update_status(1);
 			<div class="epg_tools">
 				<& (tools_comp) id=(boxId) archived=(archived) detail=(1) title=(title) &>
 			</div>
-		 	<div class="epg_info">
+			<div class="epg_info">
 				<div class="info nowrap"><%cpp> if (!archived.empty()) { </%cpp><span class="bold"><$ (archived + " ") $></span><%cpp> } </%cpp><$ (time) $></div>
 <%cpp>
 	if (elapsed >= 0) {
@@ -347,7 +348,7 @@ int update_status(1);
 <%cpp>
 	}
 </%cpp>
-		 		<div class="title"><$ (title) $></div>
+				<div class="title"><$ (title) $></div>
 				<div class="short"><$ (short_descr) $></div>
 				<div class="description">
 					<span class="epg_images">
@@ -375,7 +376,7 @@ int update_status(1);
 			<div class="boxheader"><div><div class="caption"><$ tr(LIVESUMMARY) $></div></div></div>
 		</div>
 		<div class="epg_content">
-		 	<div>
+			<div>
 				<div class="about_head"><div><div><$ tr("Authors") $></div></div></div>
 				<div class="about_left"><$ tr("Project Idea") $>:</div>
 				<div class="about_right">Thomas Keil (Thomas)</div>
diff --git a/pages/remote.ecpp b/pages/remote.ecpp
index a1aa0ff..8dc4703 100644
--- a/pages/remote.ecpp
+++ b/pages/remote.ecpp
@@ -137,7 +137,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 			<div>
 			<img src="<$ LiveSetup().GetThemedLink("img", "remotecontrol.jpg") $>" width="162" height="378" border="0" usemap="#remote" alt="" />
 			     <map name="remote">
-			     	  <area href="#" shape="circle" coords="37,36,10" alt="Power" onclick="KeyPress(<$ kPower $>)" nohref="nohref" alt="" />
+				  <area href="#" shape="circle" coords="37,36,10" alt="Power" onclick="KeyPress(<$ kPower $>)" nohref="nohref" alt="" />
 				  <area href="#" shape="rect" coords="27,60,59,75" alt="1" onclick="KeyPress(<$ k1 $>)" nohref="nohref" alt="" />
 				  <area href="#" shape="rect" coords="64,59,98,75" alt="2" onclick="KeyPress(<$ k2 $>)" nohref="nohref" alt="" />
 				  <area href="#" shape="rect" coords="103,59,137,75" alt="3" onclick="KeyPress(<$ k3 $>)" nohref="nohref" alt="" />
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
index 5d14e2b..391140d 100644
--- a/pages/schedule.ecpp
+++ b/pages/schedule.ecpp
@@ -147,15 +147,15 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 <%cpp>
 				}
 </%cpp>
-	   			<tr class="head">
-	   				<td colspan="5"><div class="boxheader"><div><div><$ day $></div></div></div></td>
+				<tr class="head">
+					<td colspan="5"><div class="boxheader"><div><div><$ day $></div></div></div></td>
 				</tr>
 <%cpp>
-	   			current_day = day;
+				current_day = day;
 			}
 </%cpp>
 				<tr>
-	   				<td class="action leftcol <? lastEventCurrentDay ? "bottomrow" ?>"><& pageelems.event_timer epgid=(epgid) &></td>
+					<td class="action leftcol <? lastEventCurrentDay ? "bottomrow" ?>"><& pageelems.event_timer epgid=(epgid) &></td>
 					<td class="action <? lastEventCurrentDay ? "bottomrow" ?>"><%cpp>if (LiveFeatures<features::epgsearch>().Recent() ) { </%cpp><a href="searchresults.html?searchplain=<$ StringUrlEncode(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a><%cpp> } else { </%cpp><img src="img/transparent.png" width="16" height="16"><%cpp> } </%cpp></td>
 					<td class="action <? lastEventCurrentDay ? "bottomrow" ?>"><& pageelems.imdb_info_href title=(title) &></td>
 					<td class="topaligned <? lastEventCurrentDay ? "bottomrow" ?>"><div class="withmargin nowrap"><$ start $> - <$ end $></div></td>
diff --git a/pages/searchepg.ecpp b/pages/searchepg.ecpp
index 2331074..18e8f2e 100644
--- a/pages/searchepg.ecpp
+++ b/pages/searchepg.ecpp
@@ -27,9 +27,7 @@ using namespace vdrlive;
 	bool usesubtitle = false;
 	bool usedescr = false;
 	int usechannel = SearchTimer::NoChannel;
-	tChannelID channelidfrom;
 	tChannelID channelfrom;
-	tChannelID channelidto;
 	tChannelID channelto;
 	string changrpsel = "";
 	bool usetime = false;
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index 695b26d..264839b 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -150,7 +150,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 					<tr>
 						<td class="label leftcol"><div class="withmargin"><$ tr("Use authentication") $>:</div></td>
 						<td class="rightcol">
-							<input type="checkbox" name="useauth" id="useauth" value="1" <%cpp> CHECKIF(useauth); </%cpp> onclick="changeduseauth(this)"/>
+							<input type="checkbox" name="useauth" id="useauth" value="1" <%cpp> CHECKIF(useauth); </%cpp>onclick="changeduseauth(this)"/>
 							<div id="authsection" style="display: none">
 							<table border="0" cellpadding="0" cellspacing="0" class="dependent">
 							<tr>
@@ -182,7 +182,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 					<tr>
 						<td class="label leftcol"><div class="withmargin"><$ tr("Use ajax technology") $>:</div></td>
 						<td class="rightcol">
-							<input type="checkbox" name="useAjax" id="useAjax" value="1" <%cpp> CHECKIF(!useAjax.empty()); </%cpp> onclick="changeduseajax(this)"/>
+							<input type="checkbox" name="useAjax" id="useAjax" value="1" <%cpp> CHECKIF(!useAjax.empty()); </%cpp>onclick="changeduseajax(this)"/>
 							<div id="ajaxsection" style="display: none">
 							<table border="0" cellpadding="0" cellspacing="0" class="dependent">
 							<tr>
@@ -196,7 +196,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 					<tr>
 						<td class="label leftcol"><div class="withmargin"><$ tr("Allow video streaming") $>:</div></td>
 						<td class="rightcol">
-							<input type="checkbox" name="useStreamdev" id="useStreamdev" value="1" <%cpp> CHECKIF(!useStreamdev.empty()); </%cpp> onclick="changedusestreamdev(this)"/>
+							<input type="checkbox" name="useStreamdev" id="useStreamdev" value="1" <%cpp> CHECKIF(!useStreamdev.empty()); </%cpp>onclick="changedusestreamdev(this)"/>
 							<div id="streamdevsection" style="display: none">
 							<table border="0" cellpadding="0" cellspacing="0" class="dependent">
 							<tr>
diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp
index 83d139b..31f5607 100644
--- a/pages/timerconflicts.ecpp
+++ b/pages/timerconflicts.ecpp
@@ -95,7 +95,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 								timerStateHint = tr("Timer is active.");
 							}
 
-	        		        EpgInfoPtr epgEvent;
+						        EpgInfoPtr epgEvent;
 							string longDescription;
 							string title;
 #if VDRVERSNUM >= 20301
diff --git a/pages/users.ecpp b/pages/users.ecpp
index f884e91..9e00602 100644
--- a/pages/users.ecpp
+++ b/pages/users.ecpp
@@ -54,7 +54,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 <%cpp>
 				cUser* user = Users.First();
 				while (user) 
-    				{
+				{
 					bool bottom = (Users.Next(user) == NULL);
 				    if (user) 
 				    {
diff --git a/pages/vlc.ecpp b/pages/vlc.ecpp
index 881958c..59baa72 100644
--- a/pages/vlc.ecpp
+++ b/pages/vlc.ecpp
@@ -115,7 +115,7 @@ using namespace vdrlive;
 	}
 </%cpp>
 			<embed type="application/x-vlc-plugin" pluginspage="http://www.videolan.org/" version="VideoLAN.VLCPlugin.2" id="video1" name="video1" autoplay="yes" loop="no" width="720" height="576" target="<$ videourl $>" />
-	   		<& vlc.controls videourl=(videourl) asyncReq=(asyncReq) &>
+			<& vlc.controls videourl=(videourl) asyncReq=(asyncReq) &>
 <%cpp>
 	if (!asyncReq) {
 </%cpp>
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index f9a66c3..a38faf9 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -246,7 +246,7 @@ if (type == "now") {
 					<div class="more withmargin">
 %					if (eventId != 0) {
 					    <a
-% 						if (!longDescription.empty()) {
+%						if (!longDescription.empty()) {
 						<& tooltip.hint text=(longDescription) &><& tooltip.display domId=(epgEvent->Id()) &>
 %						}
 						><span class="title"><$ (epgEvent->Title()) $></span><br /><span class="short"><$ (epgEvent->ShortDescr()) $></span></a>
@@ -255,10 +255,10 @@ if (type == "now") {
 %						}
 					</div>
 				</td>
-				<td class="topaligned rightcol <? lastCurrentChanel ? "bottomrow"?>"><div class="station withmargin"><a 		href="schedule.html?channel=<$ chNumber $>" <& tooltip.hint text=(tr("View the schedule of this channel")) &>><$ chNumber $><$ tr(" - ") $><$ (epgEvent->Caption()) $></a></div>
+				<td class="topaligned rightcol <? lastCurrentChanel ? "bottomrow"?>"><div class="station withmargin"><a	href="schedule.html?channel=<$ chNumber $>" <& tooltip.hint text=(tr("View the schedule of this channel")) &>><$ chNumber $><$ tr(" - ") $><$ (epgEvent->Caption()) $></a></div>
 				</td>
 			</tr>
-%   	}
+%	}
 <%cpp>
 	}
 </%cpp>
@@ -285,7 +285,7 @@ if (type == "now") {
 	vector< string >::const_iterator part = parts.begin();
 	for ( int i = 0; part != parts.end(); ++i, ++part ) {
 </%cpp>
-	<option <%cpp> reply.out() << ( (current_fixtime != "" && *part == current_displaytime) ? "selected=\"selected\"" : "" ); </%cpp> value="<$ *part $>"> <$ tr("at") + string(" ") + *part $></option>
+	<option <%cpp> reply.out() << ( (current_fixtime != "" && *part == current_displaytime) ? "selected=\"selected\"" : "" ); </%cpp>value="<$ *part $>"> <$ tr("at") + string(" ") + *part $></option>
 <%cpp>
 	}
 </%cpp>