diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /intern/ghost/intern/GHOST_EventManager.cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'intern/ghost/intern/GHOST_EventManager.cpp')
-rw-r--r-- | intern/ghost/intern/GHOST_EventManager.cpp | 247 |
1 files changed, 118 insertions, 129 deletions
diff --git a/intern/ghost/intern/GHOST_EventManager.cpp b/intern/ghost/intern/GHOST_EventManager.cpp index 094467bb0dd..3c27e2c826a 100644 --- a/intern/ghost/intern/GHOST_EventManager.cpp +++ b/intern/ghost/intern/GHOST_EventManager.cpp @@ -21,7 +21,6 @@ * \ingroup GHOST */ - /** * Copyright (C) 2001 NaN Technologies B.V. */ @@ -29,186 +28,176 @@ #include "GHOST_EventManager.h" #include <algorithm> #include "GHOST_Debug.h" -#include <stdio.h> // [mce] temp debug +#include <stdio.h> // [mce] temp debug GHOST_EventManager::GHOST_EventManager() { } - GHOST_EventManager::~GHOST_EventManager() { - disposeEvents(); - - TConsumerVector::iterator iter = m_consumers.begin(); - while (iter != m_consumers.end()) { - GHOST_IEventConsumer *consumer = *iter; - delete consumer; - iter = m_consumers.erase(iter); - } + disposeEvents(); + + TConsumerVector::iterator iter = m_consumers.begin(); + while (iter != m_consumers.end()) { + GHOST_IEventConsumer *consumer = *iter; + delete consumer; + iter = m_consumers.erase(iter); + } } - GHOST_TUns32 GHOST_EventManager::getNumEvents() { - return (GHOST_TUns32) m_events.size(); + return (GHOST_TUns32)m_events.size(); } - 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) { - if ((*p)->getType() == type) { - numEvents++; - } - } - return numEvents; + GHOST_TUns32 numEvents = 0; + TEventStack::iterator p; + for (p = m_events.begin(); p != m_events.end(); ++p) { + if ((*p)->getType() == type) { + numEvents++; + } + } + return numEvents; } - GHOST_TSuccess GHOST_EventManager::pushEvent(GHOST_IEvent *event) { - GHOST_TSuccess success; - GHOST_ASSERT(event, "invalid event"); - if (m_events.size() < m_events.max_size()) { - m_events.push_front(event); - success = GHOST_kSuccess; - } - else { - success = GHOST_kFailure; - } - return success; + GHOST_TSuccess success; + GHOST_ASSERT(event, "invalid event"); + if (m_events.size() < m_events.max_size()) { + m_events.push_front(event); + success = GHOST_kSuccess; + } + else { + success = GHOST_kFailure; + } + return success; } - void GHOST_EventManager::dispatchEvent(GHOST_IEvent *event) { - TConsumerVector::iterator iter; + TConsumerVector::iterator iter; - for (iter = m_consumers.begin(); iter != m_consumers.end(); ++iter) { - (*iter)->processEvent(event); - } + for (iter = m_consumers.begin(); iter != m_consumers.end(); ++iter) { + (*iter)->processEvent(event); + } } - void GHOST_EventManager::dispatchEvent() { - GHOST_IEvent *event = m_events.back(); - m_events.pop_back(); - m_handled_events.push_back(event); + GHOST_IEvent *event = m_events.back(); + m_events.pop_back(); + m_handled_events.push_back(event); - dispatchEvent(event); + dispatchEvent(event); } - void GHOST_EventManager::dispatchEvents() { - while (!m_events.empty()) { - dispatchEvent(); - } + while (!m_events.empty()) { + dispatchEvent(); + } - disposeEvents(); + disposeEvents(); } - GHOST_TSuccess GHOST_EventManager::addConsumer(GHOST_IEventConsumer *consumer) { - GHOST_TSuccess success; - GHOST_ASSERT(consumer, "invalid consumer"); - - // Check to see whether the consumer is already in our list - TConsumerVector::const_iterator iter = std::find(m_consumers.begin(), m_consumers.end(), consumer); - - if (iter == m_consumers.end()) { - // Add the consumer - m_consumers.push_back(consumer); - success = GHOST_kSuccess; - } - else { - success = GHOST_kFailure; - } - return success; + GHOST_TSuccess success; + GHOST_ASSERT(consumer, "invalid consumer"); + + // Check to see whether the consumer is already in our list + TConsumerVector::const_iterator iter = std::find( + m_consumers.begin(), m_consumers.end(), consumer); + + if (iter == m_consumers.end()) { + // Add the consumer + m_consumers.push_back(consumer); + success = GHOST_kSuccess; + } + else { + success = GHOST_kFailure; + } + return success; } - GHOST_TSuccess GHOST_EventManager::removeConsumer(GHOST_IEventConsumer *consumer) { - GHOST_TSuccess success; - GHOST_ASSERT(consumer, "invalid consumer"); - - // Check to see whether the consumer is in our list - TConsumerVector::iterator iter = std::find(m_consumers.begin(), m_consumers.end(), consumer); - - if (iter != m_consumers.end()) { - // Remove the consumer - m_consumers.erase(iter); - success = GHOST_kSuccess; - } - else { - success = GHOST_kFailure; - } - return success; + GHOST_TSuccess success; + GHOST_ASSERT(consumer, "invalid consumer"); + + // Check to see whether the consumer is in our list + TConsumerVector::iterator iter = std::find(m_consumers.begin(), m_consumers.end(), consumer); + + if (iter != m_consumers.end()) { + // Remove the consumer + m_consumers.erase(iter); + success = GHOST_kSuccess; + } + else { + success = GHOST_kFailure; + } + return success; } - void GHOST_EventManager::removeWindowEvents(GHOST_IWindow *window) { - TEventStack::iterator iter; - iter = m_events.begin(); - while (iter != m_events.end()) { - GHOST_IEvent *event = *iter; - if (event->getWindow() == window) { - GHOST_PRINT("GHOST_EventManager::removeWindowEvents(): removing event\n"); - /* - * Found an event for this window, remove it. - * The iterator will become invalid. - */ - delete event; - m_events.erase(iter); - iter = m_events.begin(); - } - else { - ++iter; - } - } + TEventStack::iterator iter; + iter = m_events.begin(); + while (iter != m_events.end()) { + GHOST_IEvent *event = *iter; + if (event->getWindow() == window) { + GHOST_PRINT("GHOST_EventManager::removeWindowEvents(): removing event\n"); + /* + * Found an event for this window, remove it. + * The iterator will become invalid. + */ + delete event; + m_events.erase(iter); + iter = m_events.begin(); + } + else { + ++iter; + } + } } void GHOST_EventManager::removeTypeEvents(GHOST_TEventType type, GHOST_IWindow *window) { - TEventStack::iterator iter; - iter = m_events.begin(); - while (iter != m_events.end()) { - GHOST_IEvent *event = *iter; - if ((event->getType() == type) && (!window || (event->getWindow() == window))) { - GHOST_PRINT("GHOST_EventManager::removeTypeEvents(): removing event\n"); - /* - * Found an event of this type for the window, remove it. - * The iterator will become invalid. - */ - delete event; - m_events.erase(iter); - iter = m_events.begin(); - } - else { - ++iter; - } - } + TEventStack::iterator iter; + iter = m_events.begin(); + while (iter != m_events.end()) { + GHOST_IEvent *event = *iter; + if ((event->getType() == type) && (!window || (event->getWindow() == window))) { + GHOST_PRINT("GHOST_EventManager::removeTypeEvents(): removing event\n"); + /* + * Found an event of this type for the window, remove it. + * The iterator will become invalid. + */ + delete event; + m_events.erase(iter); + iter = m_events.begin(); + } + else { + ++iter; + } + } } - void GHOST_EventManager::disposeEvents() { - while (m_handled_events.empty() == false) { - GHOST_ASSERT(m_handled_events[0], "invalid event"); - delete m_handled_events[0]; - m_handled_events.pop_front(); - } - - while (m_events.empty() == false) { - GHOST_ASSERT(m_events[0], "invalid event"); - delete m_events[0]; - m_events.pop_front(); - } + while (m_handled_events.empty() == false) { + GHOST_ASSERT(m_handled_events[0], "invalid event"); + delete m_handled_events[0]; + m_handled_events.pop_front(); + } + + while (m_events.empty() == false) { + GHOST_ASSERT(m_events[0], "invalid event"); + delete m_events[0]; + m_events.pop_front(); + } } |