From c1a1aae4c13d9cb507712d1dfd35dfd3e6d3daf3 Mon Sep 17 00:00:00 2001
From: satbaby <satbaby>
Date: Sat, 16 Jun 2012 10:38:38 +0200
Subject: [PATCH]  use empty() instead of size()

---
 src/daemonc/remotecontrol.cpp                  | 4 ++--
 src/gui/channellist.cpp                        | 2 +-
 src/gui/epgplus.cpp                            | 6 +++---
 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 2 +-
 src/zapit/src/bouquets.cpp                     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp
index 00d913d7a..6f6f30da2 100644
--- a/src/daemonc/remotecontrol.cpp
+++ b/src/daemonc/remotecontrol.cpp
@@ -631,11 +631,11 @@ const std::string & CRemoteControl::setSubChannel(const int numSub, const bool f
 
 const std::string & CRemoteControl::subChannelUp(void)
 {
-	//return setSubChannel((subChannels.size() == 0) ? -1 : (int)((selected_subchannel + 1) % subChannels.size()));
+	//return setSubChannel((subChannels.empty()) ? -1 : (int)((selected_subchannel + 1) % subChannels.size()));
  	// if there are any NVOD/subchannels switch these else switch audio channel (if any)
   	if ( !subChannels.empty() || !g_settings.audiochannel_up_down_enable)
   	{
-  		return setSubChannel((subChannels.size() == 0) ? -1 : (int)((selected_subchannel + 1) % subChannels.size()));
+  		return setSubChannel( subChannels.empty() ? -1 : (int)((selected_subchannel + 1) % subChannels.size()));
   	}
   	else
   	{
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index a24d88760..2ec3bac98 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -678,7 +678,7 @@ int CChannelList::show()
 			actzap = updateSelection(new_selected);
 		}
 		else if (msg == (neutrino_msg_t)g_settings.key_bouquet_up) {
-			if (bouquetList->Bouquets.size() > 0) {
+			if (!bouquetList->Bouquets.empty()) {
 				bool found = true;
 				uint32_t nNext = (bouquetList->getActiveBouquetNumber()+1) % bouquetList->Bouquets.size();
 				if(bouquetList->Bouquets[nNext]->channelList->getSize() <= 0) {
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index d19a778ed..35bbcaca7 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -881,7 +881,7 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
 				this->paint();
 			}
 			if (msg == CRCInput::RC_yellow) {
-				if (bouquetList->Bouquets.size() > 0) {
+				if (!bouquetList->Bouquets.empty()) {
 					bool found = true;
 					uint32_t nNext = (bouquetList->getActiveBouquetNumber()+1) % bouquetList->Bouquets.size();
 //printf("**************************** EpgPlus::exec current bouquet %d new %d\n", bouquetList->getActiveBouquetNumber(), nNext);
@@ -908,7 +908,7 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
 				}
 			}
 			else if (msg == CRCInput::RC_green) {
-				if (bouquetList->Bouquets.size() > 0) {
+				if (!bouquetList->Bouquets.empty()) {
 					bool found = true;
 					int nNext = (bouquetList->getActiveBouquetNumber()+bouquetList->Bouquets.size()-1) % bouquetList->Bouquets.size();
 					if(bouquetList->Bouquets[nNext]->channelList->getSize() <= 0) {
@@ -1263,7 +1263,7 @@ int CEPGplusHandler::exec (CMenuTarget * parent, const std::string & /*actionKey
 	//channelList = CNeutrinoApp::getInstance()->channelList;
 	int bnum = bouquetList->getActiveBouquetNumber();
 	current_bouquet = bnum;
-	if(bouquetList->Bouquets.size() && bouquetList->Bouquets[bnum]->channelList->getSize() > 0)
+	if(!bouquetList->Bouquets.empty() && bouquetList->Bouquets[bnum]->channelList->getSize() > 0)
 		channelList = bouquetList->Bouquets[bnum]->channelList;
 	else
 		channelList = CNeutrinoApp::getInstance()->channelList;
diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index 57851a73f..e53469824 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -390,7 +390,7 @@ void CControlAPI::ExecCGI(CyhookHandler *hh)
 		hh->SetHeader(HTTP_OK, "text/xml; charset=UTF-8");
 	else
 		hh->SetHeader(HTTP_OK, "text/plain; charset=UTF-8");
-	if (hh->ParamList.size() > 0)
+	if ( !hh->ParamList.empty() )
 	{
 		script = hh->ParamList["1"];
 		unsigned int len = hh->ParamList.size();
diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp
index af0996a7e..293ba6796 100644
--- a/src/zapit/src/bouquets.cpp
+++ b/src/zapit/src/bouquets.cpp
@@ -628,7 +628,7 @@ CBouquetManager::ChannelIterator::ChannelIterator(CBouquetManager* owner, const
 {
 	Owner = owner;
 	tv = TV;
-	if (Owner->Bouquets.size() == 0)
+	if (Owner->Bouquets.empty())
 		c = -2;
 	else {
 		b = 0;
@@ -644,7 +644,7 @@ CBouquetManager::ChannelIterator CBouquetManager::ChannelIterator::operator ++(i
 		c++;
 		if ((unsigned int) c >= getBouquet()->size()) {
 			for (b++; b < Owner->Bouquets.size(); b++)
-				if (getBouquet()->size() != 0) {
+				if ( !getBouquet()->empty() ) {
 					c = 0;
 					goto end;
 				}