[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50763] trunk/blender: code cleanup: c++ - use empty() rather than size(), use prefix operators for non-primitive types - recommended for non primitive types .

[Campbell Barton]

Revision: 50763
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50763
Author:   campbellbarton
Date:     2012-09-20 00:55:32 +0000 (Thu, 20 Sep 2012)
Log Message:
-----------
code cleanup: c++ - use empty() rather than size(), use prefix operators for non-primitive types - recommended for non primitive types.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_EventManager.cpp
    trunk/blender/intern/ghost/intern/GHOST_TimerManager.cpp
    trunk/blender/intern/ghost/intern/GHOST_WindowManager.cpp
    trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
    trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    trunk/blender/source/gameengine/SceneGraph/SG_Tree.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_EventManager.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_EventManager.cpp	2012-09-20 00:53:25 UTC (rev 50762)
+++ trunk/blender/intern/ghost/intern/GHOST_EventManager.cpp	2012-09-20 00:55:32 UTC (rev 50763)
@@ -70,7 +70,7 @@
 {
 	GHOST_TUns32 numEvents = 0;
 	TEventStack::iterator p;
-	for (p = m_events.begin(); p != m_events.end(); p++) {
+	for (p = m_events.begin(); p != m_events.end(); ++p) {
 		if ((*p)->getType() == type) {
 			numEvents++;
 		}
@@ -82,7 +82,7 @@
 GHOST_IEvent *GHOST_EventManager::peekEvent()
 {
 	GHOST_IEvent *event = 0;
-	if (m_events.size() > 0) {
+	if (m_events.empty() == false) {
 		event = m_events.back();
 	}
 	return event;
@@ -110,7 +110,7 @@
 	if (event) {
 		handled = true;
 		TConsumerVector::iterator iter;
-		for (iter = m_consumers.begin(); iter != m_consumers.end(); iter++) {
+		for (iter = m_consumers.begin(); iter != m_consumers.end(); ++iter) {
 			if ((*iter)->processEvent(event)) {
 				handled = false;
 			}
@@ -212,7 +212,7 @@
 			iter = m_events.begin();
 		}
 		else {
-			iter++;
+			++iter;
 		}
 	}
 }
@@ -236,7 +236,7 @@
 			iter = m_events.begin();
 		}
 		else {
-			iter++;
+			++iter;
 		}
 	}
 }
@@ -254,7 +254,7 @@
 
 void GHOST_EventManager::disposeEvents()
 {
-	while (m_events.size() > 0) {
+	while (m_events.empty() == false) {
 		GHOST_ASSERT(m_events[0], "invalid event");
 		delete m_events[0];
 		m_events.pop_front();

Modified: trunk/blender/intern/ghost/intern/GHOST_TimerManager.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_TimerManager.cpp	2012-09-20 00:53:25 UTC (rev 50762)
+++ trunk/blender/intern/ghost/intern/GHOST_TimerManager.cpp	2012-09-20 00:55:32 UTC (rev 50763)
@@ -104,7 +104,7 @@
 	GHOST_TUns64 smallest = GHOST_kFireTimeNever;
 	TTimerVector::iterator iter;
 	
-	for (iter = m_timers.begin(); iter != m_timers.end(); iter++) {
+	for (iter = m_timers.begin(); iter != m_timers.end(); ++iter) {
 		GHOST_TUns64 next = (*iter)->getNext();
 		
 		if (next < smallest)
@@ -119,7 +119,7 @@
 	TTimerVector::iterator iter;
 	bool anyProcessed = false;
 
-	for (iter = m_timers.begin(); iter != m_timers.end(); iter++) {
+	for (iter = m_timers.begin(); iter != m_timers.end(); ++iter) {
 		if (fireTimer(time, *iter))
 			anyProcessed = true;
 	}
@@ -156,7 +156,7 @@
 
 void GHOST_TimerManager::disposeTimers()
 {
-	while (m_timers.size() > 0) {
+	while (m_timers.empty() == false) {
 		delete m_timers[0];
 		m_timers.erase(m_timers.begin());
 	}

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowManager.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowManager.cpp	2012-09-20 00:53:25 UTC (rev 50762)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowManager.cpp	2012-09-20 00:55:32 UTC (rev 50763)
@@ -195,7 +195,7 @@
 {
 	std::vector<GHOST_IWindow *>::iterator iter;
 
-	for (iter = m_windows.begin(); iter != m_windows.end(); iter++) {
+	for (iter = m_windows.begin(); iter != m_windows.end(); ++iter) {
 		if ((*iter)->getOSWindow() == osWindow)
 			return *iter;
 	}
@@ -208,7 +208,7 @@
 	bool isAnyModified = false;
 	std::vector<GHOST_IWindow *>::iterator iter;
 	
-	for (iter = m_windows.begin(); iter != m_windows.end(); iter++) {
+	for (iter = m_windows.begin(); iter != m_windows.end(); ++iter) {
 		if ((*iter)->getModifiedState())
 			isAnyModified = true;
 	}

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2012-09-20 00:53:25 UTC (rev 50762)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2012-09-20 00:55:32 UTC (rev 50763)
@@ -1326,7 +1326,7 @@
 	c_owner = XGetSelectionOwner(m_display, Clipboard_atom);
 	
 	std::map<unsigned int, Cursor>::iterator it = m_standard_cursors.begin();
-	for (; it != m_standard_cursors.end(); it++) {
+	for (; it != m_standard_cursors.end(); ++it) {
 		XFreeCursor(m_display, it->second);
 	}
 

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp	2012-09-20 00:53:25 UTC (rev 50762)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp	2012-09-20 00:55:32 UTC (rev 50763)
@@ -173,7 +173,7 @@
 
 RAS_MeshMaterial* RAS_MeshObject::GetMeshMaterial(unsigned int matid)
 {
-	if (m_materials.size() > 0 && (matid < m_materials.size()))
+	if ((m_materials.empty() == false) && (matid < m_materials.size()))
 	{
 		list<RAS_MeshMaterial>::iterator it = m_materials.begin();
 		while (matid--) ++it;

Modified: trunk/blender/source/gameengine/SceneGraph/SG_Tree.cpp
===================================================================
--- trunk/blender/source/gameengine/SceneGraph/SG_Tree.cpp	2012-09-20 00:53:25 UTC (rev 50762)
+++ trunk/blender/source/gameengine/SceneGraph/SG_Tree.cpp	2012-09-20 00:55:32 UTC (rev 50763)
@@ -236,7 +236,7 @@
 
 SG_Tree* SG_TreeFactory::MakeTreeDown(SG_BBox &bbox)
 {
-	if (m_objects.size() == 0)
+	if (m_objects.empty())
 		return NULL;
 	if (m_objects.size() == 1)
 		return *m_objects.begin();