[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/oscar/liboscar
From:       Andrew Coles <andrew_coles () yahoo ! co ! uk>
Date:       2009-03-05 23:30:56
Message-ID: 1236295856.600102.27007.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 935707 by coles:

Parentheses around && within ||, and changed two for loops to use ++i rather than i++.



 M  +18 -18    userdetails.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/oscar/liboscar/userdetails.cpp #935706:935707
@@ -180,24 +180,24 @@
 		bool found = false;
 		Guid cap( inbuf.getGuid() );
 		int i;
-		for ( i=0; i < CAP_LAST; i++ )
+		for ( i=0; i < CAP_LAST; ++i )
 		{
-			if ( i == CAP_KOPETE && cap.isEqual ( oscar_caps[i], 12 )   ||
-			   i == CAP_MIRANDA && cap.isEqual ( oscar_caps[i], 8 )     ||
-			   i == CAP_QIP && cap.isEqual ( oscar_caps[i], 16 )        ||
-			   i == CAP_QIPINFIUM && cap.isEqual ( oscar_caps[i], 16 )  ||
-			   i == CAP_QIPPDA && cap.isEqual ( oscar_caps[i], 16 )     ||
-			   i == CAP_QIPSYMBIAN && cap.isEqual ( oscar_caps[i], 16 ) ||
-			   i == CAP_QIPMOBILE && cap.isEqual ( oscar_caps[i], 16 )  ||
-			   i == CAP_JIMM && cap.isEqual ( oscar_caps[i], 5 )        ||
-			   i == CAP_MICQ && cap.isEqual ( oscar_caps[i], 12 )       ||
-			   i == CAP_SIMNEW && cap.isEqual ( oscar_caps[i], 12 )     ||
-			   i == CAP_SIMOLD && cap.isEqual ( oscar_caps[i], 15 )     ||
-			   i == CAP_VMICQ && cap.isEqual ( oscar_caps[i], 6 )       ||
-			   i == CAP_LICQ && cap.isEqual ( oscar_caps[i], 12 )       ||
-			   i == CAP_ANDRQ && cap.isEqual ( oscar_caps[i], 9 )       ||
-			   i == CAP_RANDQ && cap.isEqual ( oscar_caps[i], 9 )       ||
-			     i == CAP_MCHAT && cap.isEqual ( oscar_caps[i], 10 ) )
+			if ( (i == CAP_KOPETE && cap.isEqual ( oscar_caps[i], 12 ) )    ||
+			     (i == CAP_MIRANDA && cap.isEqual ( oscar_caps[i], 8 ) )    ||
+			     (i == CAP_QIP && cap.isEqual ( oscar_caps[i], 16 ) )       ||
+			     (i == CAP_QIPINFIUM && cap.isEqual ( oscar_caps[i], 16 ) ) ||
+			     (i == CAP_QIPPDA && cap.isEqual ( oscar_caps[i], 16 ) )    ||
+			     (i == CAP_QIPSYMBIAN && cap.isEqual ( oscar_caps[i], 16 ) )||
+			     (i == CAP_QIPMOBILE && cap.isEqual ( oscar_caps[i], 16 ) ) ||
+			     (i == CAP_JIMM && cap.isEqual ( oscar_caps[i], 5 ) )       ||
+			     (i == CAP_MICQ && cap.isEqual ( oscar_caps[i], 12 ) )      ||
+			     (i == CAP_SIMNEW && cap.isEqual ( oscar_caps[i], 12 ) )    ||
+			     (i == CAP_SIMOLD && cap.isEqual ( oscar_caps[i], 15 ) )    ||
+			     (i == CAP_VMICQ && cap.isEqual ( oscar_caps[i], 6 ) )      ||
+			     (i == CAP_LICQ && cap.isEqual ( oscar_caps[i], 12 ) )      ||
+			     (i == CAP_ANDRQ && cap.isEqual ( oscar_caps[i], 9 ) )      ||
+			     (i == CAP_RANDQ && cap.isEqual ( oscar_caps[i], 9 ) )      ||
+			     (i == CAP_MCHAT && cap.isEqual ( oscar_caps[i], 10 ) ) )
 			{
 				m_capabilities[i] = true;
 				dbgCaps += capName(i);
@@ -215,7 +215,7 @@
 		}
 		if(!found && xStatus == -1)
 		{
-			for(i = 0; i < XSTAT_LAST; i++)
+			for(i = 0; i < XSTAT_LAST; ++i)
 			{
 				if(oscar_xStatus[i] == cap)
 				{
[prev in list] [next in list] [prev in thread] [next in thread]