[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46792] trunk/blender/intern/ghost: style cleanup: ghost
Campbell Barton
ideasman42 at gmail.com
Sat May 19 11:57:55 CEST 2012
Revision: 46792
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46792
Author: campbellbarton
Date: 2012-05-19 09:57:55 +0000 (Sat, 19 May 2012)
Log Message:
-----------
style cleanup: ghost
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_Buttons.cpp
trunk/blender/intern/ghost/intern/GHOST_C-api.cpp
trunk/blender/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
trunk/blender/intern/ghost/intern/GHOST_DisplayManager.cpp
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_EventManager.cpp
trunk/blender/intern/ghost/intern/GHOST_EventPrinter.cpp
trunk/blender/intern/ghost/intern/GHOST_ISystem.cpp
trunk/blender/intern/ghost/intern/GHOST_ISystemPaths.cpp
trunk/blender/intern/ghost/intern/GHOST_ModifierKeys.cpp
trunk/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
trunk/blender/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_Path-api.cpp
trunk/blender/intern/ghost/intern/GHOST_Rect.cpp
trunk/blender/intern/ghost/intern/GHOST_System.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemSDL.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_TimerManager.cpp
trunk/blender/intern/ghost/intern/GHOST_Window.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
trunk/blender/intern/ghost/intern/GHOST_WindowManager.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowSDL.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
trunk/blender/intern/ghost/test/gears/GHOST_Test.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_Buttons.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_Buttons.cpp 2012-05-19 09:46:41 UTC (rev 46791)
+++ trunk/blender/intern/ghost/intern/GHOST_Buttons.cpp 2012-05-19 09:57:55 UTC (rev 46792)
@@ -42,37 +42,38 @@
bool GHOST_Buttons::get(GHOST_TButtonMask mask) const
{
- switch (mask) {
- case GHOST_kButtonMaskLeft:
- return m_ButtonLeft;
- case GHOST_kButtonMaskMiddle:
- return m_ButtonMiddle;
- case GHOST_kButtonMaskRight:
- return m_ButtonRight;
- default:
- return false;
- }
+ switch (mask) {
+ case GHOST_kButtonMaskLeft:
+ return m_ButtonLeft;
+ case GHOST_kButtonMaskMiddle:
+ return m_ButtonMiddle;
+ case GHOST_kButtonMaskRight:
+ return m_ButtonRight;
+ default:
+ return false;
+ }
}
void GHOST_Buttons::set(GHOST_TButtonMask mask, bool down)
{
- switch (mask) {
- case GHOST_kButtonMaskLeft:
- m_ButtonLeft = down; break;
- case GHOST_kButtonMaskMiddle:
- m_ButtonMiddle = down; break;
- case GHOST_kButtonMaskRight:
- m_ButtonRight = down; break;
- default:
- break;
- }
+ switch (mask) {
+ case GHOST_kButtonMaskLeft:
+ m_ButtonLeft = down; break;
+ case GHOST_kButtonMaskMiddle:
+ m_ButtonMiddle = down; break;
+ case GHOST_kButtonMaskRight:
+ m_ButtonRight = down; break;
+ default:
+ break;
+ }
}
void GHOST_Buttons::clear()
{
- m_ButtonLeft = false;
- m_ButtonMiddle = false;
- m_ButtonRight = false;
+ m_ButtonLeft = false;
+ m_ButtonMiddle = false;
+ m_ButtonRight = false;
}
-GHOST_Buttons::~GHOST_Buttons() {}
+GHOST_Buttons::~GHOST_Buttons() {
+}
Modified: trunk/blender/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_C-api.cpp 2012-05-19 09:46:41 UTC (rev 46791)
+++ trunk/blender/intern/ghost/intern/GHOST_C-api.cpp 2012-05-19 09:57:55 UTC (rev 46792)
@@ -50,7 +50,7 @@
GHOST_SystemHandle GHOST_CreateSystem(void)
{
GHOST_ISystem::createSystem();
- GHOST_ISystem* system = GHOST_ISystem::getSystem();
+ GHOST_ISystem *system = GHOST_ISystem::getSystem();
return (GHOST_SystemHandle)system;
}
@@ -59,7 +59,7 @@
GHOST_TSuccess GHOST_DisposeSystem(GHOST_SystemHandle systemhandle)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
return system->disposeSystem();
}
@@ -68,20 +68,20 @@
GHOST_EventConsumerHandle GHOST_CreateEventConsumer(GHOST_EventCallbackProcPtr eventCallback,
GHOST_TUserDataPtr userdata)
{
- return (GHOST_EventConsumerHandle) new GHOST_CallbackEventConsumer (eventCallback, userdata);
+ return (GHOST_EventConsumerHandle) new GHOST_CallbackEventConsumer(eventCallback, userdata);
}
GHOST_TSuccess GHOST_DisposeEventConsumer(GHOST_EventConsumerHandle consumerhandle)
{
- delete ((GHOST_CallbackEventConsumer*)consumerhandle);
+ delete ((GHOST_CallbackEventConsumer *)consumerhandle);
return GHOST_kSuccess;
}
GHOST_TUns64 GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
return system->getMilliSeconds();
}
@@ -89,12 +89,12 @@
GHOST_TimerTaskHandle GHOST_InstallTimer(GHOST_SystemHandle systemhandle,
- GHOST_TUns64 delay,
- GHOST_TUns64 interval,
- GHOST_TimerProcPtr timerproc,
- GHOST_TUserDataPtr userdata)
+ GHOST_TUns64 delay,
+ GHOST_TUns64 interval,
+ GHOST_TimerProcPtr timerproc,
+ GHOST_TUserDataPtr userdata)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
return (GHOST_TimerTaskHandle) system->installTimer(delay, interval, timerproc, userdata);
}
@@ -102,10 +102,10 @@
GHOST_TSuccess GHOST_RemoveTimer(GHOST_SystemHandle systemhandle,
- GHOST_TimerTaskHandle timertaskhandle)
+ GHOST_TimerTaskHandle timertaskhandle)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
- GHOST_ITimerTask* timertask = (GHOST_ITimerTask*) timertaskhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
+ GHOST_ITimerTask *timertask = (GHOST_ITimerTask *) timertaskhandle;
return system->removeTimer(timertask);
}
@@ -114,7 +114,7 @@
GHOST_TUns8 GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
return system->getNumDisplays();
}
@@ -122,10 +122,10 @@
void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
- GHOST_TUns32* width,
- GHOST_TUns32* height)
+ GHOST_TUns32 *width,
+ GHOST_TUns32 *height)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
system->getMainDisplayDimensions(*width, *height);
}
@@ -133,46 +133,46 @@
GHOST_WindowHandle GHOST_CreateWindow(GHOST_SystemHandle systemhandle,
- const char* title,
- GHOST_TInt32 left,
- GHOST_TInt32 top,
- GHOST_TUns32 width,
- GHOST_TUns32 height,
- GHOST_TWindowState state,
- GHOST_TDrawingContextType type,
- const int stereoVisual,
- const GHOST_TUns16 numOfAASamples)
+ const char *title,
+ GHOST_TInt32 left,
+ GHOST_TInt32 top,
+ GHOST_TUns32 width,
+ GHOST_TUns32 height,
+ GHOST_TWindowState state,
+ GHOST_TDrawingContextType type,
+ const int stereoVisual,
+ const GHOST_TUns16 numOfAASamples)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
bool bstereoVisual;
- if(stereoVisual)
+ if (stereoVisual)
bstereoVisual = true;
else
bstereoVisual = false;
return (GHOST_WindowHandle) system->createWindow(title, left, top, width, height,
- state, type, bstereoVisual, numOfAASamples);
+ state, type, bstereoVisual, numOfAASamples);
}
GHOST_TUserDataPtr GHOST_GetWindowUserData(GHOST_WindowHandle windowhandle)
{
- GHOST_IWindow* window = (GHOST_IWindow*) windowhandle;
+ GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
return window->getUserData();
}
void GHOST_SetWindowUserData(GHOST_WindowHandle windowhandle, GHOST_TUserDataPtr userdata)
{
- GHOST_IWindow* window = (GHOST_IWindow*) windowhandle;
+ GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
window->setUserData(userdata);
}
GHOST_TSuccess GHOST_DisposeWindow(GHOST_SystemHandle systemhandle,
- GHOST_WindowHandle windowhandle)
+ GHOST_WindowHandle windowhandle)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
- GHOST_IWindow* window = (GHOST_IWindow*) windowhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
+ GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
return system->disposeWindow(window);
}
@@ -180,10 +180,10 @@
int GHOST_ValidWindow(GHOST_SystemHandle systemhandle,
- GHOST_WindowHandle windowhandle)
+ GHOST_WindowHandle windowhandle)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
- GHOST_IWindow* window = (GHOST_IWindow*) windowhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
+ GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
return (int) system->validWindow(window);
}
@@ -191,14 +191,14 @@
GHOST_WindowHandle GHOST_BeginFullScreen(GHOST_SystemHandle systemhandle,
- GHOST_DisplaySetting* setting,
- const int stereoVisual)
+ GHOST_DisplaySetting *setting,
+ const int stereoVisual)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
- GHOST_IWindow* window = NULL;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
+ GHOST_IWindow *window = NULL;
bool bstereoVisual;
- if(stereoVisual)
+ if (stereoVisual)
bstereoVisual = true;
else
bstereoVisual = false;
@@ -212,7 +212,7 @@
GHOST_TSuccess GHOST_EndFullScreen(GHOST_SystemHandle systemhandle)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
return system->endFullScreen();
}
@@ -221,7 +221,7 @@
int GHOST_GetFullScreen(GHOST_SystemHandle systemhandle)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
return (int) system->getFullScreen();
}
@@ -230,16 +230,16 @@
int GHOST_ProcessEvents(GHOST_SystemHandle systemhandle, int waitForEvent)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
- return (int) system->processEvents(waitForEvent?true:false);
+ return (int) system->processEvents(waitForEvent ? true : false);
}
int GHOST_DispatchEvents(GHOST_SystemHandle systemhandle)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
return (int) system->dispatchEvents();
}
@@ -247,28 +247,28 @@
GHOST_TSuccess GHOST_AddEventConsumer(GHOST_SystemHandle systemhandle, GHOST_EventConsumerHandle consumerhandle)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
+ GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
- return system->addEventConsumer((GHOST_CallbackEventConsumer*)consumerhandle);
+ return system->addEventConsumer((GHOST_CallbackEventConsumer *)consumerhandle);
}
GHOST_TSuccess GHOST_RemoveEventConsumer(GHOST_SystemHandle systemhandle, GHOST_EventConsumerHandle consumerhandle)
{
- GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list