From 47c373c7a970fa4bd26453a6e35a4b066f2b77e4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 27 Feb 2012 10:35:39 +0000 Subject: style cleanup (mostly whitespace) --- intern/ghost/GHOST_C-api.h | 4 ++-- intern/ghost/intern/GHOST_SystemPathsX11.cpp | 2 +- intern/ghost/intern/GHOST_SystemWin32.cpp | 2 +- intern/ghost/intern/GHOST_SystemX11.h | 4 ++-- intern/ghost/intern/GHOST_WindowSDL.cpp | 2 +- intern/ghost/intern/GHOST_WindowX11.cpp | 12 ++++++------ intern/ghost/intern/GHOST_WindowX11.h | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'intern/ghost') diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index b47c4444081..a22b6bc371c 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -494,7 +494,7 @@ extern void GHOST_SetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhandle, * @param windowhandle The handle to the window * @return The validity of the window. */ -extern int GHOST_GetValid(GHOST_WindowHandle windowhandle) ; +extern int GHOST_GetValid(GHOST_WindowHandle windowhandle); /** * Returns the type of drawing context used in this window. @@ -592,7 +592,7 @@ extern void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle, GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32* outX, - GHOST_TInt32* outY) ; + GHOST_TInt32* outY); /** * Converts a point in screen coordinates to client rectangle coordinates diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.cpp b/intern/ghost/intern/GHOST_SystemPathsX11.cpp index 726149138ed..6dad3661a57 100644 --- a/intern/ghost/intern/GHOST_SystemPathsX11.cpp +++ b/intern/ghost/intern/GHOST_SystemPathsX11.cpp @@ -47,7 +47,7 @@ #endif #ifdef PREFIX -static const char *static_path= PREFIX "/share" ; +static const char *static_path= PREFIX "/share"; #else static const char *static_path= NULL; #endif diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 98c4785797d..f4b39d01d9e 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -716,7 +716,7 @@ GHOST_EventKey* GHOST_SystemWin32::processKeyEvent(GHOST_IWindow *window, RAWINP GHOST_EventKey* event; if (key != GHOST_kKeyUnknown) { - char utf8_char[6] = {0} ; + char utf8_char[6] = {0}; char ascii = 0; wchar_t utf16[2]={0}; diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 62f5ba341d4..d236c73dabd 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -174,7 +174,7 @@ public: GHOST_TSuccess getModifierKeys( GHOST_ModifierKeys& keys - ) const ; + ) const; /** * Returns the state of the mouse buttons (ouside the message queue). @@ -310,7 +310,7 @@ private : GHOST_WindowX11 * findGhostWindow( Window xwind - ) const ; + ) const; void processEvent( diff --git a/intern/ghost/intern/GHOST_WindowSDL.cpp b/intern/ghost/intern/GHOST_WindowSDL.cpp index dce844949ad..b8cbf9b474d 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.cpp +++ b/intern/ghost/intern/GHOST_WindowSDL.cpp @@ -67,7 +67,7 @@ GHOST_WindowSDL::GHOST_WindowSDL(GHOST_SystemSDL *system, m_sdl_glcontext= SDL_GL_CreateContext(m_sdl_win); //fprintf(stderr, "Ignoring Xlib error: error code %d request code %d\n", - // theEvent->error_code, theEvent->request_code) ; + // theEvent->error_code, theEvent->request_code); setTitle(title); } diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 3ceafcab3ce..85a9163ec91 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -373,7 +373,7 @@ GHOST_WindowX11( XFree(xsizehints); XClassHint * xclasshint = XAllocClassHint(); - int len = title.Length() +1 ; + const int len = title.Length() + 1; char *wmclass = (char *)malloc(sizeof(char) * len); strncpy(wmclass, (const char*)title, sizeof(char) * len); xclasshint->res_name = wmclass; @@ -485,10 +485,10 @@ GHOST_WindowX11( static int ApplicationErrorHandler(Display *display, XErrorEvent *theEvent) { fprintf(stderr, "Ignoring Xlib error: error code %d request code %d\n", - theEvent->error_code, theEvent->request_code) ; + theEvent->error_code, theEvent->request_code); /* No exit! - but keep lint happy */ - return 0 ; + return 0; } /* These C functions are copied from Wine 1.1.13's wintab.c */ @@ -588,7 +588,7 @@ static BOOL is_eraser(const char *name, const char *type) void GHOST_WindowX11::initXInputDevices() { - static XErrorHandler old_handler = (XErrorHandler) 0 ; + static XErrorHandler old_handler = (XErrorHandler) 0; XExtensionVersion *version = XGetExtensionVersion(m_display, INAME); if(version && (version != (XExtensionVersion*)NoSuchExtension)) { @@ -600,7 +600,7 @@ void GHOST_WindowX11::initXInputDevices() m_xtablet.CommonData.Active= GHOST_kTabletModeNone; /* Install our error handler to override Xlib's termination behavior */ - old_handler = XSetErrorHandler(ApplicationErrorHandler) ; + old_handler = XSetErrorHandler(ApplicationErrorHandler); for(int i=0; i