style cleanup: ghost headers

This commit is contained in:
Campbell Barton
2012-05-19 09:23:08 +00:00
parent 03ed173fe6
commit 112b1a0779
49 changed files with 798 additions and 753 deletions

View File

@@ -87,8 +87,12 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_IEvent"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
void *operator new(size_t num_bytes) {
return MEM_mallocN(num_bytes, "GHOST:GHOST_IEvent");
}
void operator delete(void *mem) {
MEM_freeN(mem);
}
#endif
};

View File

@@ -165,13 +165,15 @@ protected:
* Constructor.
* Protected default constructor to force use of static createSystem member.
*/
GHOST_ISystem() {}
GHOST_ISystem() {
}
/**
* Destructor.
* Protected default constructor to force use of static dispose member.
*/
virtual ~GHOST_ISystem() {}
virtual ~GHOST_ISystem() {
}
public:
/***************************************************************************************
@@ -415,8 +417,12 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_ISystem"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
void *operator new(size_t num_bytes) {
return MEM_mallocN(num_bytes, "GHOST:GHOST_ISystem");
}
void operator delete(void *mem) {
MEM_freeN(mem);
}
#endif
};

View File

@@ -59,13 +59,15 @@ protected:
* Constructor.
* Protected default constructor to force use of static createSystem member.
*/
GHOST_ISystemPaths() {}
GHOST_ISystemPaths() {
}
/**
* Destructor.
* Protected default constructor to force use of static dispose member.
*/
virtual ~GHOST_ISystemPaths() {}
virtual ~GHOST_ISystemPaths() {
}
public:
/**

View File

@@ -86,8 +86,12 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_ITimerTask"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
void *operator new(size_t num_bytes) {
return MEM_mallocN(num_bytes, "GHOST:GHOST_ITimerTask");
}
void operator delete(void *mem) {
MEM_freeN(mem);
}
#endif
};

View File

@@ -56,19 +56,22 @@ public:
* @param b requested bottom coordinate of the rectangle
*/
GHOST_Rect(GHOST_TInt32 l = 0, GHOST_TInt32 t = 0, GHOST_TInt32 r = 0, GHOST_TInt32 b = 0)
: m_l(l), m_t(t), m_r(r), m_b(b) {}
: m_l(l), m_t(t), m_r(r), m_b(b)
{}
/**
* Copy constructor.
* @param r rectangle to copy
*/
GHOST_Rect(const GHOST_Rect& r)
: m_l(r.m_l), m_t(r.m_t), m_r(r.m_r), m_b(r.m_b) {}
: m_l(r.m_l), m_t(r.m_t), m_r(r.m_r), m_b(r.m_b)
{}
/**
* Destructor.
*/
virtual ~GHOST_Rect() {};
virtual ~GHOST_Rect()
{};
/**
* Access to rectangle width.

View File

@@ -52,10 +52,10 @@ public:
ULONG __stdcall Release(void);
/* IDropTarget implementation
+ The IDropTarget interface is one of the interfaces you implement to
provide drag-and-drop operations in your application. It contains methods
used in any application that can be a target for data during a
drag-and-drop operation. A drop-target application is responsible for:
* + The IDropTarget interface is one of the interfaces you implement to
* provide drag-and-drop operations in your application. It contains methods
* used in any application that can be a target for data during a
* drag-and-drop operation. A drop-target application is responsible for:
*
* - Determining the effect of the drop on the target application.
* - Incorporating any valid dropped data when the drop occurs.
@@ -152,7 +152,6 @@ private:
GHOST_SystemWin32 *m_system;
/* Data type of the dragged object */
GHOST_TDragnDropTypes m_draggedObjectType;
};
#endif // __GHOST_DROPTARGETWIN32_H__

View File

@@ -58,5 +58,4 @@ class GHOST_EventNDOFButton : public GHOST_Event
}
};
#endif // __GHOST_EVENTNDOF_H__

View File

@@ -52,7 +52,8 @@ public:
* @param data_ptr Pointer to the (unformatted) data associated with the event
*/
GHOST_EventString(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow *window, GHOST_TEventDataPtr data_ptr)
: GHOST_Event(msec, type, window) {
: GHOST_Event(msec, type, window)
{
m_data = data_ptr;
}

View File

@@ -41,8 +41,7 @@
* @author Maarten Gribnau
* @date May 17, 2001
*/
struct GHOST_ModifierKeys
{
struct GHOST_ModifierKeys {
/**
* Constructor.
*/

View File

@@ -193,7 +193,9 @@ public:
/**
* @see GHOST_ISystem
*/
int toggleConsole(int action) { return 0; }
int toggleConsole(int action) {
return 0;
}
protected:
/**

View File

@@ -227,7 +227,9 @@ public:
/**
* @see GHOST_ISystem
*/
int toggleConsole(int action) { return 0; }
int toggleConsole(int action) {
return 0;
}
protected:

View File

@@ -76,8 +76,8 @@ public:
GHOST_TDrawingContextType type,
bool stereoVisual,
const GHOST_TUns16 numOfAASamples,
const GHOST_TEmbedderWindowID parentWindow
) {
const GHOST_TEmbedderWindowID parentWindow)
{
return new GHOST_WindowNULL(this, title, left, top, width, height, state, parentWindow, type, stereoVisual, 1);
}
};

View File

@@ -190,12 +190,16 @@ public:
* Sets the progress bar value displayed in the window/application icon
* @param progress The progress % (0.0 to 1.0)
*/
virtual GHOST_TSuccess setProgressBar(float progress) {return GHOST_kFailure;};
virtual GHOST_TSuccess setProgressBar(float progress) {
return GHOST_kFailure;
};
/**
* Hides the progress bar in the icon
*/
virtual GHOST_TSuccess endProgressBar() {return GHOST_kFailure;};
virtual GHOST_TSuccess endProgressBar() {
return GHOST_kFailure;
};
/**
* Tells if the ongoing drag'n'drop object can be accepted upon mouse drop
@@ -278,7 +282,9 @@ protected:
* Sets the cursor grab on the window using
* native window system calls.
*/
virtual GHOST_TSuccess setWindowCursorGrab(GHOST_TGrabCursorMode mode) { return GHOST_kSuccess; };
virtual GHOST_TSuccess setWindowCursorGrab(GHOST_TGrabCursorMode mode) {
return GHOST_kSuccess;
};
/**
* Sets the cursor shape on the window using

View File

@@ -212,10 +212,14 @@ public:
const GHOST_TabletData *GetTabletData()
{ return &m_tablet; }
{
return &m_tablet;
}
GHOST_TabletData& GetCarbonTabletData()
{ return m_tablet; }
{
return m_tablet;
}
protected:
/**
* Tries to install a rendering context in this window.
@@ -286,14 +290,14 @@ protected:
bool m_fullScreenDirty;
/** specific MacOs X full screen window setting as we use partially system mechanism
values : 0 not maximizable default
1 normal state
2 maximized state
this will be reworked when rebuilding GHOST carbon to use new OS X apis
in order to be unified with GHOST fullscreen/maximised settings
(lukep)
* values : 0 not maximizable default
* 1 normal state
* 2 maximized state
*
* this will be reworked when rebuilding GHOST carbon to use new OS X apis
* in order to be unified with GHOST fullscreen/maximised settings
*
* (lukep)
**/
short mac_windowState;

View File

@@ -243,10 +243,14 @@ public:
const GHOST_TabletData *GetTabletData()
{ return &m_tablet; }
{
return &m_tablet;
}
GHOST_TabletData& GetCocoaTabletData()
{ return m_tablet; }
{
return m_tablet;
}
/**
* Sets the progress bar value displayed in the window/application icon

View File

@@ -54,7 +54,9 @@ private :
public:
const GHOST_TabletData* GetTabletData() { return NULL; }
const GHOST_TabletData *GetTabletData() {
return NULL;
}
GHOST_WindowSDL(GHOST_SystemSDL *system,
const STR_String& title,
@@ -158,7 +160,11 @@ protected:
GHOST_TWindowState
getState() const;
GHOST_TSuccess setOrder(GHOST_TWindowOrder order) { return GHOST_kSuccess; } // TODO
GHOST_TSuccess setOrder(GHOST_TWindowOrder order)
{
// TODO
return GHOST_kSuccess;
}
};

View File

@@ -236,7 +236,9 @@ public:
* Returns the name of the window class.
* @return The name of the window class.
*/
static wchar_t* getWindowClassName() { return s_windowClassName; }
static wchar_t *getWindowClassName() {
return s_windowClassName;
}
/**
* Register a mouse click event (should be called
@@ -265,7 +267,9 @@ public:
void loadCursor(bool visible, GHOST_TStandardCursor cursorShape) const;
const GHOST_TabletData *GetTabletData()
{ return m_tabletData; }
{
return m_tabletData;
}
void processWin32TabletInitEvent();
void processWin32TabletEvent(WPARAM wParam, LPARAM lParam);