From 5d56a901a8b5f103cc2511941e70f6daa0bd9a3a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 20 Sep 2012 00:55:32 +0000 Subject: [PATCH] code cleanup: c++ - use empty() rather than size(), use prefix operators for non-primitive types - recommended for non primitive types. --- intern/ghost/intern/GHOST_EventManager.cpp | 12 ++++++------ intern/ghost/intern/GHOST_TimerManager.cpp | 6 +++--- intern/ghost/intern/GHOST_WindowManager.cpp | 4 ++-- intern/ghost/intern/GHOST_WindowX11.cpp | 2 +- source/gameengine/Rasterizer/RAS_MeshObject.cpp | 2 +- source/gameengine/SceneGraph/SG_Tree.cpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/intern/ghost/intern/GHOST_EventManager.cpp b/intern/ghost/intern/GHOST_EventManager.cpp index b8660b3038e..014eef85aa8 100644 --- a/intern/ghost/intern/GHOST_EventManager.cpp +++ b/intern/ghost/intern/GHOST_EventManager.cpp @@ -70,7 +70,7 @@ GHOST_TUns32 GHOST_EventManager::getNumEvents(GHOST_TEventType type) { 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_TUns32 GHOST_EventManager::getNumEvents(GHOST_TEventType type) 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 @@ bool GHOST_EventManager::dispatchEvent(GHOST_IEvent *event) 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 @@ void GHOST_EventManager::removeWindowEvents(GHOST_IWindow *window) iter = m_events.begin(); } else { - iter++; + ++iter; } } } @@ -236,7 +236,7 @@ void GHOST_EventManager::removeTypeEvents(GHOST_TEventType type, GHOST_IWindow * iter = m_events.begin(); } else { - iter++; + ++iter; } } } @@ -254,7 +254,7 @@ GHOST_IEvent *GHOST_EventManager::popEvent() 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(); diff --git a/intern/ghost/intern/GHOST_TimerManager.cpp b/intern/ghost/intern/GHOST_TimerManager.cpp index b1186507028..601359984de 100644 --- a/intern/ghost/intern/GHOST_TimerManager.cpp +++ b/intern/ghost/intern/GHOST_TimerManager.cpp @@ -104,7 +104,7 @@ GHOST_TUns64 GHOST_TimerManager::nextFireTime() 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 @@ bool GHOST_TimerManager::fireTimers(GHOST_TUns64 time) 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 @@ bool GHOST_TimerManager::fireTimer(GHOST_TUns64 time, GHOST_TimerTask *task) void GHOST_TimerManager::disposeTimers() { - while (m_timers.size() > 0) { + while (m_timers.empty() == false) { delete m_timers[0]; m_timers.erase(m_timers.begin()); } diff --git a/intern/ghost/intern/GHOST_WindowManager.cpp b/intern/ghost/intern/GHOST_WindowManager.cpp index 1816c57a150..daf1c2f2d22 100644 --- a/intern/ghost/intern/GHOST_WindowManager.cpp +++ b/intern/ghost/intern/GHOST_WindowManager.cpp @@ -195,7 +195,7 @@ GHOST_IWindow *GHOST_WindowManager::getWindowAssociatedWithOSWindow(void *osWind { std::vector::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 GHOST_WindowManager::getAnyModifiedState() bool isAnyModified = false; std::vector::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; } diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 4ad95fcab53..52a8408c41d 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -1326,7 +1326,7 @@ GHOST_WindowX11:: c_owner = XGetSelectionOwner(m_display, Clipboard_atom); std::map::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); } diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp index 25afefbcc5a..c50aa28e9fc 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp +++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp @@ -173,7 +173,7 @@ const STR_String& RAS_MeshObject::GetMaterialName(unsigned int matid) 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::iterator it = m_materials.begin(); while (matid--) ++it; diff --git a/source/gameengine/SceneGraph/SG_Tree.cpp b/source/gameengine/SceneGraph/SG_Tree.cpp index 0f8264985de..99f68ef625a 100644 --- a/source/gameengine/SceneGraph/SG_Tree.cpp +++ b/source/gameengine/SceneGraph/SG_Tree.cpp @@ -236,7 +236,7 @@ void SG_TreeFactory::Add(SG_Tree* tree) 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();