Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: c++ - use empty() rather than size(), use prefix operators for non-primitive types - recommended for non primitive types.

Browse Source
This commit is contained in:
Campbell Barton
2012-09-20 00:55:32 +00:00
parent 5205927892
commit 5d56a901a8
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
intern/ghost/intern/GHOST_EventManager.cpp
View File

@@ -70,7 +70,7 @@ GHOST_TUns32 GHOST_EventManager::getNumEvents(GHOST_TEventType type)
{ {
GHOST_TUns32 numEvents = 0; GHOST_TUns32 numEvents = 0;
TEventStack::iterator p; 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) { if ((*p)->getType() == type) {
numEvents++; numEvents++;
} }
@@ -82,7 +82,7 @@ GHOST_TUns32 GHOST_EventManager::getNumEvents(GHOST_TEventType type)
GHOST_IEvent *GHOST_EventManager::peekEvent() GHOST_IEvent *GHOST_EventManager::peekEvent()
{ {
GHOST_IEvent *event = 0; GHOST_IEvent *event = 0;
if (m_events.size() > 0) { if (m_events.empty() == false) {
event = m_events.back(); event = m_events.back();
} }
return event; return event;
@@ -110,7 +110,7 @@ bool GHOST_EventManager::dispatchEvent(GHOST_IEvent *event)
if (event) { if (event) {
handled = true; handled = true;
TConsumerVector::iterator iter; 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)) { if ((*iter)->processEvent(event)) {
handled = false; handled = false;
} }
@@ -212,7 +212,7 @@ void GHOST_EventManager::removeWindowEvents(GHOST_IWindow *window)
iter = m_events.begin(); iter = m_events.begin();
} }
else { else {
iter++; ++iter;
} }
} }
} }
@@ -236,7 +236,7 @@ void GHOST_EventManager::removeTypeEvents(GHOST_TEventType type, GHOST_IWindow *
iter = m_events.begin(); iter = m_events.begin();
} }
else { else {
iter++; ++iter;
} }
} }
} }
@@ -254,7 +254,7 @@ GHOST_IEvent *GHOST_EventManager::popEvent()
void GHOST_EventManager::disposeEvents() void GHOST_EventManager::disposeEvents()
{ {
while (m_events.size() > 0) { while (m_events.empty() == false) {
GHOST_ASSERT(m_events[0], "invalid event"); GHOST_ASSERT(m_events[0], "invalid event");
delete m_events[0]; delete m_events[0];
m_events.pop_front(); m_events.pop_front();

6
intern/ghost/intern/GHOST_TimerManager.cpp
View File

@@ -104,7 +104,7 @@ GHOST_TUns64 GHOST_TimerManager::nextFireTime()
GHOST_TUns64 smallest = GHOST_kFireTimeNever; GHOST_TUns64 smallest = GHOST_kFireTimeNever;
TTimerVector::iterator iter; 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(); GHOST_TUns64 next = (*iter)->getNext();
if (next < smallest) if (next < smallest)
@@ -119,7 +119,7 @@ bool GHOST_TimerManager::fireTimers(GHOST_TUns64 time)
TTimerVector::iterator iter; TTimerVector::iterator iter;
bool anyProcessed = false; 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)) if (fireTimer(time, *iter))
anyProcessed = true; anyProcessed = true;
} }
@@ -156,7 +156,7 @@ bool GHOST_TimerManager::fireTimer(GHOST_TUns64 time, GHOST_TimerTask *task)
void GHOST_TimerManager::disposeTimers() void GHOST_TimerManager::disposeTimers()
{ {
while (m_timers.size() > 0) { while (m_timers.empty() == false) {
delete m_timers[0]; delete m_timers[0];
m_timers.erase(m_timers.begin()); m_timers.erase(m_timers.begin());
} }

4
intern/ghost/intern/GHOST_WindowManager.cpp
View File

@@ -195,7 +195,7 @@ GHOST_IWindow *GHOST_WindowManager::getWindowAssociatedWithOSWindow(void *osWind
{ {
std::vector<GHOST_IWindow *>::iterator iter; 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) if ((*iter)->getOSWindow() == osWindow)
return *iter; return *iter;
} }
@@ -208,7 +208,7 @@ bool GHOST_WindowManager::getAnyModifiedState()
bool isAnyModified = false; bool isAnyModified = false;
std::vector<GHOST_IWindow *>::iterator iter; 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()) if ((*iter)->getModifiedState())
isAnyModified = true; isAnyModified = true;
} }

2
intern/ghost/intern/GHOST_WindowX11.cpp
View File

@@ -1326,7 +1326,7 @@ GHOST_WindowX11::
c_owner = XGetSelectionOwner(m_display, Clipboard_atom); c_owner = XGetSelectionOwner(m_display, Clipboard_atom);
std::map<unsigned int, Cursor>::iterator it = m_standard_cursors.begin(); 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); XFreeCursor(m_display, it->second);
} }

2
source/gameengine/Rasterizer/RAS_MeshObject.cpp
View File

@@ -173,7 +173,7 @@ const STR_String& RAS_MeshObject::GetMaterialName(unsigned int matid)
RAS_MeshMaterial* RAS_MeshObject::GetMeshMaterial(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<RAS_MeshMaterial>::iterator it = m_materials.begin(); list<RAS_MeshMaterial>::iterator it = m_materials.begin();
while (matid--) ++it; while (matid--) ++it;

2
source/gameengine/SceneGraph/SG_Tree.cpp
View File

@@ -236,7 +236,7 @@ void SG_TreeFactory::Add(SG_Tree* tree)
SG_Tree* SG_TreeFactory::MakeTreeDown(SG_BBox &bbox) SG_Tree* SG_TreeFactory::MakeTreeDown(SG_BBox &bbox)
{ {
if (m_objects.size() == 0) if (m_objects.empty())
return NULL; return NULL;
if (m_objects.size() == 1) if (m_objects.size() == 1)
return *m_objects.begin(); return *m_objects.begin();