diff options
Diffstat (limited to 'intern/ghost')
-rw-r--r-- | intern/ghost/intern/GHOST_ContextGLX.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_DisplayManagerCocoa.mm | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/intern/ghost/intern/GHOST_ContextGLX.cpp b/intern/ghost/intern/GHOST_ContextGLX.cpp index ecf824aafb7..da8b1fd4941 100644 --- a/intern/ghost/intern/GHOST_ContextGLX.cpp +++ b/intern/ghost/intern/GHOST_ContextGLX.cpp @@ -124,7 +124,7 @@ GHOST_TSuccess GHOST_ContextGLX::initializeDrawingContext() GHOST_X11_ERROR_HANDLERS_OVERRIDE(handler_store); /* -------------------------------------------------------------------- */ - /* Begin Inline Glew */ + /* Begin Inline Glew */ #ifdef USE_GLXEW_INIT_WORKAROUND const GLubyte *extStart = (GLubyte *)""; diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm index 954c3efb22c..d899bb1c3c7 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm @@ -161,5 +161,5 @@ GHOST_TSuccess GHOST_DisplayManagerCocoa::setCurrentDisplaySetting( // CGDisplayErr err = ::CGDisplaySwitchToMode(m_displayIDs[display], displayModeValues); - return /*err == CGDisplayNoErr ?*/ GHOST_kSuccess /*: GHOST_kFailure*/; + return /* err == CGDisplayNoErr ? */ GHOST_kSuccess /* : GHOST_kFailure */; } diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 34b44fde48a..ee312e2fc40 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -589,9 +589,7 @@ static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep) } } -/* This function borrowed from Qt's X11 support - * qclipboard_x11.cpp - * */ +/* This function borrowed from Qt's X11 support qclipboard_x11.cpp */ struct init_timestamp_data { Time timestamp; }; @@ -2675,8 +2673,8 @@ void GHOST_SystemX11::refreshXInputDevices() xtablet.PressureLevels = xvi->axes[2].max_value; if (xvi->num_axes > 3) { - /* this is assuming that the tablet has the same tilt resolution in both - * positive and negative directions. It would be rather weird if it didn't.. */ + /* This is assuming that the tablet has the same tilt resolution in both + * positive and negative directions. It would be rather weird if it didn't. */ xtablet.XtiltLevels = xvi->axes[3].max_value; xtablet.YtiltLevels = xvi->axes[4].max_value; } |