Fix 'this if clause does not guard...' warnings

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

7 files changed, 10 insertions, 7 deletions

diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
index 29794ac7..e8a0e5b1 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/kvi_locale.cpp
@@ -96,8 +96,8 @@ typedef unsigned int gunichar;
 #define CONTINUATION_CHAR                            \
    if ((*(guchar *)p & 0xc0) != 0x80) /* 10xxxxxx */ \
      goto error;                                     \
-     val <<= 6;                                      \
-     val |= (*(guchar *)p) & 0x3f;
+   val <<= 6;                                        \
+   val |= (*(guchar *)p) & 0x3f;
 
 
 static const char *
diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
index dd408edb..805801b9 100644
--- a/src/kvilib/tal/kvi_tal_listview.cpp
+++ b/src/kvilib/tal/kvi_tal_listview.cpp
@@ -362,7 +362,7 @@
 				 ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
 				((KviTalCheckListItem*)parent())->updateController( update, store );
 	
-				updateController( update, store );
+			    updateController( update, store );
 			} else {
 			    // if there are no children we simply set the CheckBoxController and update its parent
 			    setCurrentState( s );
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index 117fcc12..0b6eeb5c 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -489,10 +489,12 @@ void KviIrcConnectionTargetResolver::haveServerIp()
 						if(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).find(':') != -1)
 						{
 							if(!_OUTPUT_MUTE)
+							{
 								m_pConsole->output(KVI_OUT_SYSTEMWARNING,
 									__tr2qs("The system-wide IPv6 bind address (%s) is not valid"),
 									KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).utf8().data());
 								KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress) = false;
+							}
 						} else {
 							// this is an interface address: might be down
 							if(!_OUTPUT_MUTE)
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index 35d50950..a8780759 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -1481,7 +1481,7 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg)
 					&szNick,&szUser,&szHost,&szNewNick);
 			if(!_OUTPUT_MUTE)
 				old->output(KVI_OUT_SYSTEMWARNING,__tr2qs("End of merged output"));
-				old->userAction(szNewNick,szUser,szHost,KVI_USERACTION_NICK);
+			old->userAction(szNewNick,szUser,szHost,KVI_USERACTION_NICK);
 			if(bTQWasActive)old->delayedAutoRaise();
 		}
 		if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing))
diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp
index 286b3ff8..b11fc4d2 100644
--- a/src/kvirc/ui/kvi_styled_controls.cpp
+++ b/src/kvirc/ui/kvi_styled_controls.cpp
@@ -216,7 +216,7 @@ void KviStyledCheckBox::paintEvent ( TQPaintEvent * event)
 							);
 						image.setPixel(x,y,rgb);
 					}
-					p.drawImage(0,0,image);
+				p.drawImage(0,0,image);
 			} else {
 			p.drawPixmap(0,0,pix);
 			}
@@ -331,7 +331,7 @@ void KviStyledToolButton::paintEvent ( TQPaintEvent * event)
 							);
 						image.setPixel(x,y,rgb);
 					}
-					p.drawImage(pos,image);
+				p.drawImage(pos,image);
 			} else {
 			p.drawPixmap(pos,pix);
 			}
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 2b29e007..c15a030c 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -835,8 +835,10 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c)
 	if(iCount>0)
 	{
 		for(; (iCount>0 && !stream.atEnd()) ; iCount-- )
+		{
 			a->set(iIndex,new KviKvsVariant(stream.readLine()));
 			iIndex++;
+		}
 	} else {
 		while(!stream.atEnd()) {
 			a->set(iIndex,new KviKvsVariant(stream.readLine()));
diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h
index 561f4874..99955cf4 100644
--- a/src/modules/options/instances.h
+++ b/src/modules/options/instances.h
@@ -61,7 +61,6 @@ typedef struct _KviOptionsWidgetInstanceEntry
 class KviOptionsInstanceManager : public TQObject
 {
 	TQ_OBJECT
-	
 public:
 	KviOptionsInstanceManager();
 	virtual ~KviOptionsInstanceManager();