Fix invalid comparison warnings

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

8 files changed, 19 insertions, 19 deletions

diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index bf7baaeb..6cb0dd99 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -586,20 +586,20 @@ void KviDockWidget::grabActivityInfo()
 	
 	if(KVI_OPTION_BOOL(KviOption_boolUseLevelBasedTrayNotification))
 	{
-		if(m_iConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iConsoles=2;
-		else if(m_iConsoles >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iConsoles=1;
+		if(static_cast<unsigned int>(m_iConsoles) >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iConsoles=2;
+		else if(static_cast<unsigned int>(m_iConsoles) >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iConsoles=1;
 		else m_iConsoles=0;
 		
-		if(m_iChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iChannels=2;
-		else if(m_iChannels >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iChannels=1;
+		if(static_cast<unsigned int>(m_iChannels) >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iChannels=2;
+		else if(static_cast<unsigned int>(m_iChannels) >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iChannels=1;
 		else m_iChannels=0;
 		
-		if(m_iQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iQueries=2;
-		else if(m_iQueries >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iQueries=1;
+		if(static_cast<unsigned int>(m_iQueries) >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iQueries=2;
+		else if(static_cast<unsigned int>(m_iQueries) >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iQueries=1;
 		else m_iQueries=0;
 		
-		if(m_iOther >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iOther=2;
-		else if(m_iOther >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iOther=1;
+		if(static_cast<unsigned int>(m_iOther) >= KVI_OPTION_UINT(KviOption_uintMinTrayHighLevelMessage)) m_iOther=2;
+		else if(static_cast<unsigned int>(m_iOther) >= KVI_OPTION_UINT(KviOption_uintMinTrayLowLevelMessage)) m_iOther=1;
 		else m_iOther=0;
 	}
 }
diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp
index faf10ba6..dd178cc3 100644
--- a/src/modules/notifier/notifierwindowtabs.cpp
+++ b/src/modules/notifier/notifierwindowtabs.cpp
@@ -85,7 +85,7 @@ void KviNotifierWindowTab::setNextMessageAsCurrent()
 void KviNotifierWindowTab::setPrevMessageAsCurrent()
 {
 	if(!m_pCurrentMessage)return;
-	if(!m_pMessageList->findRef(m_pCurrentMessage) == -1)return;
+	if(m_pMessageList->findRef(m_pCurrentMessage) == -1)return;
 	m_pCurrentMessage = m_pMessageList->prev();
 	if(!m_pCurrentMessage)m_pCurrentMessage = m_pMessageList->first();
 }
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index 75cbc55b..7348fa62 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -410,7 +410,7 @@ bool KviKvsObject_mledit::functionInsertAt(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol)
 	KVSO_PARAMETERS_END(c)
 	if(!widget())return true;
-	if(iLine < 0 || iCol < 0 || iLine > ((KviTalMultiLineEdit *)widget())->numLines())
+	if(iLine < 0 || iCol < 0 || iLine > static_cast<kvs_uint_t>(((KviTalMultiLineEdit *)widget())->numLines()))
 			c->warning("No such line number");
 	else
 		((KviTalMultiLineEdit *)widget())->insertAt(szInsert,iLine,iCol);
diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp
index e5c7223d..f9891f0b 100644
--- a/src/modules/objects/class_pixmap.cpp
+++ b/src/modules/objects/class_pixmap.cpp
@@ -223,7 +223,7 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c)
 	if (bPixmapModified) {
 		*m_pImage=m_pPixmap->convertToImage();
 	}
-	if (uWidth>buffer->width() || uHeight>buffer->height())
+	if (uWidth>static_cast<kvs_uint_t>(buffer->width()) || uHeight>static_cast<kvs_uint_t>(buffer->height()))
 	{
 			c->warning(__tr2qs("Area dimensions are out of destination size "));
 			return true;
@@ -246,12 +246,12 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c)
 	}
 
 
-if(uXoffset+uWidth>m_pImage->width())
+if(uXoffset+uWidth>static_cast<kvs_uint_t>(m_pImage->width()))
 	{
 		c->warning(__tr2qs("Offset width area is out of pixmap size "));
 		return true;
 	}
-	if( uYoffset+uHeight>m_pImage->height())
+	if( uYoffset+uHeight>static_cast<kvs_uint_t>(m_pImage->height()))
 	{
 		c->warning(__tr2qs("Offset height area is out of pixmap size "));
 		return true;
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 74dcc8f9..53bcb264 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -121,7 +121,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 
 	tqDebug ("ci sono i parametri");
 	TQWidget *pWidget = 0;
-	int i=0;
+	unsigned int i=0;
 	while(i!=pParams->count())
 	{
 		TQString szClass;
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 4dd17505..f19138ea 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -333,7 +333,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 			if(!szText.isEmpty())
 			{
 				bool bOk = true;
-				for(int j=0;j<lKeywords.count();j++)
+				for(size_t j=0;j<lKeywords.count();j++)
 				{
 					if(szText.find(*(lKeywords.at(j)),0,false) == -1)
 					{
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index d4161539..810bf345 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -1428,7 +1428,7 @@ static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c)
 	}
 
 	int idx = 0;
-	int cnt = 0;
+	kvs_uint_t cnt = 0;
 	int begin;
 	int len = szString.length();
 	while (idx<len)
diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp
index b69b7998..af13415b 100644
--- a/src/modules/tmphighlight/libkvitmphighlight.cpp
+++ b/src/modules/tmphighlight/libkvitmphighlight.cpp
@@ -56,7 +56,7 @@ static bool tmphighlight_kvs_cmd_add(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick)
 	KVSM_PARAMETERS_END(c)
 	if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
-	if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
+	if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL)
 	{
 		c->warning(__tr2qs("Current window is not a channel"));
 		return false;
@@ -95,7 +95,7 @@ static bool tmphighlight_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick)
 	KVSM_PARAMETERS_END(c)
 	if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
-		if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
+		if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL)
 	{
 		c->warning(__tr2qs("Current window is not a channel"));
 		return false;
@@ -133,7 +133,7 @@ static bool tmphighlight_kvs_fnc_ishighlighted(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick)
 	KVSM_PARAMETERS_END(c)
 	if( ( !c->window()->console()) || c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
-		if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
+		if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL)
 	{
 		c->warning(__tr2qs("Current window is not a channel"));
 		return false;