[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42852] trunk/blender/intern/ghost: Formatting edits <120 length lines
Campbell Barton
ideasman42 at gmail.com
Sat Dec 24 03:32:17 CET 2011
Revision: 42852
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42852
Author: campbellbarton
Date: 2011-12-24 02:32:08 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
Formatting edits <120 length lines
Modified Paths:
--------------
trunk/blender/intern/ghost/GHOST_C-api.h
trunk/blender/intern/ghost/GHOST_ISystem.h
trunk/blender/intern/ghost/GHOST_IWindow.h
trunk/blender/intern/ghost/intern/GHOST_C-api.cpp
trunk/blender/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
trunk/blender/intern/ghost/intern/GHOST_Debug.h
trunk/blender/intern/ghost/intern/GHOST_DisplayManager.h
trunk/blender/intern/ghost/intern/GHOST_EventDragnDrop.h
trunk/blender/intern/ghost/intern/GHOST_EventKey.h
trunk/blender/intern/ghost/intern/GHOST_EventNDOF.h
trunk/blender/intern/ghost/intern/GHOST_EventTrackpad.h
trunk/blender/intern/ghost/intern/GHOST_System.cpp
trunk/blender/intern/ghost/intern/GHOST_System.h
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.h
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/intern/ghost/intern/GHOST_TimerTask.h
trunk/blender/intern/ghost/intern/GHOST_Window.cpp
trunk/blender/intern/ghost/intern/GHOST_Window.h
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.h
trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
Modified: trunk/blender/intern/ghost/GHOST_C-api.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_C-api.h 2011-12-24 01:22:48 UTC (rev 42851)
+++ trunk/blender/intern/ghost/GHOST_C-api.h 2011-12-24 02:32:08 UTC (rev 42852)
@@ -81,7 +81,8 @@
* @param eventCallback The event callback routine.
* @param userdata Pointer to user data returned to the callback routine.
*/
-extern GHOST_EventConsumerHandle GHOST_CreateEventConsumer(GHOST_EventCallbackProcPtr eventCallback, GHOST_TUserDataPtr userdata);
+extern GHOST_EventConsumerHandle GHOST_CreateEventConsumer(GHOST_EventCallbackProcPtr eventCallback,
+ GHOST_TUserDataPtr userdata);
/**
* Disposes an event consumer object
Modified: trunk/blender/intern/ghost/GHOST_ISystem.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_ISystem.h 2011-12-24 01:22:48 UTC (rev 42851)
+++ trunk/blender/intern/ghost/GHOST_ISystem.h 2011-12-24 02:32:08 UTC (rev 42852)
@@ -181,7 +181,10 @@
* @param userData Placeholder for user data.
* @return A timer task (0 if timer task installation failed).
*/
- virtual GHOST_ITimerTask* installTimer(GHOST_TUns64 delay, GHOST_TUns64 interval, GHOST_TimerProcPtr timerProc, GHOST_TUserDataPtr userData = 0) = 0;
+ virtual GHOST_ITimerTask* installTimer(GHOST_TUns64 delay,
+ GHOST_TUns64 interval,
+ GHOST_TimerProcPtr timerProc,
+ GHOST_TUserDataPtr userData = 0) = 0;
/**
* Removes a timer.
Modified: trunk/blender/intern/ghost/GHOST_IWindow.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_IWindow.h 2011-12-24 01:22:48 UTC (rev 42851)
+++ trunk/blender/intern/ghost/GHOST_IWindow.h 2011-12-24 02:32:08 UTC (rev 42852)
@@ -303,7 +303,7 @@
* @param grab The new grab state of the cursor.
* @return Indication of success.
*/
- virtual GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode mode, GHOST_Rect *bounds) { return GHOST_kSuccess; };
+ virtual GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode mode, GHOST_Rect *bounds) { return GHOST_kSuccess; }
#ifdef WITH_CXX_GUARDEDALLOC
public:
Modified: trunk/blender/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_C-api.cpp 2011-12-24 01:22:48 UTC (rev 42851)
+++ trunk/blender/intern/ghost/intern/GHOST_C-api.cpp 2011-12-24 02:32:08 UTC (rev 42852)
@@ -65,7 +65,8 @@
}
-GHOST_EventConsumerHandle GHOST_CreateEventConsumer(GHOST_EventCallbackProcPtr eventCallback, GHOST_TUserDataPtr userdata)
+GHOST_EventConsumerHandle GHOST_CreateEventConsumer(GHOST_EventCallbackProcPtr eventCallback,
+ GHOST_TUserDataPtr userdata)
{
return (GHOST_EventConsumerHandle) new GHOST_CallbackEventConsumer (eventCallback, userdata);
}
Modified: trunk/blender/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp 2011-12-24 01:22:48 UTC (rev 42851)
+++ trunk/blender/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp 2011-12-24 02:32:08 UTC (rev 42852)
@@ -42,7 +42,7 @@
#include "GHOST_CallbackEventConsumer.h"
GHOST_CallbackEventConsumer::GHOST_CallbackEventConsumer(GHOST_EventCallbackProcPtr eventCallback,
- GHOST_TUserDataPtr userData)
+ GHOST_TUserDataPtr userData)
{
m_eventCallback = eventCallback;
m_userData = userData;
Modified: trunk/blender/intern/ghost/intern/GHOST_Debug.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_Debug.h 2011-12-24 01:22:48 UTC (rev 42851)
+++ trunk/blender/intern/ghost/intern/GHOST_Debug.h 2011-12-24 02:32:08 UTC (rev 42852)
@@ -34,35 +34,42 @@
#define _GHOST_DEBUG_H_
#if defined(WIN32) && !defined(FREE_WINDOWS)
- #ifdef DEBUG
- #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
- // #define GHOST_DEBUG
- #endif // DEBUG
+# ifdef DEBUG
+# pragma warning (disable:4786) // suppress stl-MSVC debug info warning
+ // #define GHOST_DEBUG
+# endif // DEBUG
#endif // WIN32
#ifdef WITH_GHOST_DEBUG
- #define GHOST_DEBUG // spit ghost events to stdout
+# define GHOST_DEBUG // spit ghost events to stdout
#endif // WITH_GHOST_DEBUG
#ifdef GHOST_DEBUG
- #include <iostream>
- #include <stdio.h> //for printf()
+# include <iostream>
+# include <stdio.h> //for printf()
#endif // GHOST_DEBUG
#ifdef GHOST_DEBUG
- #define GHOST_PRINT(x) { std::cout << x; }
- #define GHOST_PRINTF(x, ...) { printf(x, __VA_ARGS__); }
+# define GHOST_PRINT(x) { std::cout << x; }
+# define GHOST_PRINTF(x, ...) { printf(x, __VA_ARGS__); }
#else // GHOST_DEBUG
- #define GHOST_PRINT(x)
- #define GHOST_PRINTF(x, ...)
+# define GHOST_PRINT(x)
+# define GHOST_PRINTF(x, ...)
#endif // GHOST_DEBUG
#ifdef GHOST_DEBUG
- #define GHOST_ASSERT(x, info) { if (!(x)) {GHOST_PRINT("assertion failed: "); GHOST_PRINT(info); GHOST_PRINT("\n"); } }
+# define GHOST_ASSERT(x, info) \
+ { \
+ if (!(x)) { \
+ GHOST_PRINT("assertion failed: "); \
+ GHOST_PRINT(info); \
+ GHOST_PRINT("\n"); \
+ } \
+ }
#else // GHOST_DEBUG
- #define GHOST_ASSERT(x, info)
+# define GHOST_ASSERT(x, info)
#endif // GHOST_DEBUG
#endif // _GHOST_DEBUG_H_
Modified: trunk/blender/intern/ghost/intern/GHOST_DisplayManager.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DisplayManager.h 2011-12-24 01:22:48 UTC (rev 42851)
+++ trunk/blender/intern/ghost/intern/GHOST_DisplayManager.h 2011-12-24 02:32:08 UTC (rev 42852)
@@ -75,7 +75,8 @@
* @param numSettings The number of settings of the display device with this index.
* @return Indication of success.
*/
- virtual GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const;
+ virtual GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display,
+ GHOST_TInt32& numSettings) const;
/**
* Returns the current setting for this display device.
@@ -84,7 +85,9 @@
* @param setting The setting of the display device with this index.
* @return Indication of success.
*/
- virtual GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting) const;
+ virtual GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display,
+ GHOST_TInt32 index,
+ GHOST_DisplaySetting& setting) const;
/**
* Returns the current setting for this display device.
@@ -92,7 +95,8 @@
* @param setting The current setting of the display device with this index.
* @return Indication of success.
*/
- virtual GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display, GHOST_DisplaySetting& setting) const;
+ virtual GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display,
+ GHOST_DisplaySetting& setting) const;
/**
* Changes the current setting for this display device.
@@ -102,7 +106,8 @@
* @param setting The setting of the display device to be matched and activated.
* @return Indication of success.
*/
- virtual GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display, const GHOST_DisplaySetting& setting);
+ virtual GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display,
+ const GHOST_DisplaySetting& setting);
protected:
typedef std::vector<GHOST_DisplaySetting> GHOST_DisplaySettings;
@@ -114,7 +119,9 @@
* @param match The optimal display setting.
* @return Indication of success.
*/
- GHOST_TSuccess findMatch(GHOST_TUns8 display, const GHOST_DisplaySetting& setting, GHOST_DisplaySetting& match) const;
+ GHOST_TSuccess findMatch(GHOST_TUns8 display,
+ const GHOST_DisplaySetting& setting,
+ GHOST_DisplaySetting& match) const;
/**
* Retrieves settings for each display device and stores them.
Modified: trunk/blender/intern/ghost/intern/GHOST_EventDragnDrop.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_EventDragnDrop.h 2011-12-24 01:22:48 UTC (rev 42851)
+++ trunk/blender/intern/ghost/intern/GHOST_EventDragnDrop.h 2011-12-24 02:32:08 UTC (rev 42852)
@@ -44,19 +44,21 @@
*
* The dragging sequence is performed in four phases:
*
- * <li> Start sequence (GHOST_kEventDraggingEntered) that tells a drag'n'drop operation has started. Already gives the object data type,
- * and the entering mouse location
+ * <li> Start sequence (GHOST_kEventDraggingEntered) that tells a drag'n'drop operation has started.
+ * Already gives the object data type, and the entering mouse location
*
- * <li> Update mouse position (GHOST_kEventDraggingUpdated) sent upon each mouse move until the drag'n'drop operation stops, to give the updated mouse position.
- * Useful to highlight a potential destination, and update the status (through GHOST_setAcceptDragOperation) telling if the object can be dropped at
+ * <li> Update mouse position (GHOST_kEventDraggingUpdated) sent upon each mouse move until the drag'n'drop operation
+ * stops, to give the updated mouse position. Useful to highlight a potential destination, and update the status
+ * (through GHOST_setAcceptDragOperation) telling if the object can be dropped at
* the current cursor position.
*
* <li> Abort drag'n'drop sequence (GHOST_kEventDraggingExited) sent when the user moved the mouse outside the window.
*
* <li> Send the dropped data (GHOST_kEventDraggingDropDone)
*
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list