forked from bartvdbraak/blender
code cleanup: c++ - use empty() rather than size(), use prefix operators for non-primitive types - recommended for non primitive types.
This commit is contained in:
parent
5205927892
commit
5d56a901a8
@ -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();
|
||||
|
@ -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());
|
||||
}
|
||||
|
@ -195,7 +195,7 @@ GHOST_IWindow *GHOST_WindowManager::getWindowAssociatedWithOSWindow(void *osWind
|
||||
{
|
||||
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 GHOST_WindowManager::getAnyModifiedState()
|
||||
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;
|
||||
}
|
||||
|
@ -1326,7 +1326,7 @@ GHOST_WindowX11::
|
||||
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);
|
||||
}
|
||||
|
||||
|
@ -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<RAS_MeshMaterial>::iterator it = m_materials.begin();
|
||||
while (matid--) ++it;
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user