blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Cleanup: quiet unused argument warnings and minor changes in GHOST

This commit is contained in:
Campbell Barton 2022-10-28 17:05:13 +11:00
parent bb16a3af7f
commit d799388b02
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/CMakeLists.txt
View File

@ -385,9 +385,9 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
"${WAYLAND_PROTOCOLS_DIR}/unstable/primary-selection/primary-selection-unstable-v1.xml"
)
add_definitions(-DWITH_GHOST_WAYLAND)
unset(INC_DST)
add_definitions(-DWITH_GHOST_WAYLAND)
endif()
if(WITH_INPUT_NDOF)

2
intern/ghost/intern/GHOST_System.h
View File

@ -76,7 +76,7 @@ class GHOST_System : public GHOST_ISystem {
GHOST_ITimerTask *installTimer(uint64_t delay,
uint64_t interval,
GHOST_TimerProcPtr timerProc,
GHOST_TUserDataPtr userData = NULL);
GHOST_TUserDataPtr userData = nullptr);
/**
* Removes a timer.

5
intern/ghost/intern/GHOST_SystemWayland.cpp
View File

@ -777,13 +777,14 @@ struct GWL_Display {
std::vector<GWL_Output *> outputs;
std::vector<GWL_Seat *> seats;
/* Managers. */
struct wl_data_device_manager *wl_data_device_manager = nullptr;
struct zwp_tablet_manager_v2 *wp_tablet_manager = nullptr;
struct zwp_relative_pointer_manager_v1 *wp_relative_pointer_manager = nullptr;
struct zwp_primary_selection_device_manager_v1 *wp_primary_selection_device_manager = nullptr;
struct zwp_pointer_constraints_v1 *wp_pointer_constraints = nullptr;
struct zwp_pointer_gestures_v1 *wp_pointer_gestures = nullptr;
struct zwp_primary_selection_device_manager_v1 *wp_primary_selection_device_manager = nullptr;
};
/**

8
intern/ghost/intern/GHOST_Window.h
View File

@ -74,7 +74,7 @@ class GHOST_Window : public GHOST_IWindow {
*/
virtual bool getValid() const override
{
return m_context != NULL;
return m_context != nullptr;
}
/**
@ -283,8 +283,9 @@ class GHOST_Window : public GHOST_IWindow {
float getNativePixelSize(void) override
{
if (m_nativePixelSize > 0.0f)
if (m_nativePixelSize > 0.0f) {
return m_nativePixelSize;
}
return 1.0f;
}
@ -298,7 +299,8 @@ class GHOST_Window : public GHOST_IWindow {
}
#ifdef WITH_INPUT_IME
virtual void beginIME(int32_t x, int32_t y, int32_t w, int32_t h, bool completed) override
virtual void beginIME(
int32_t /*x*/, int32_t /*y*/, int32_t /*w*/, int32_t /*h*/, bool /*completed*/) override
{
/* do nothing temporarily if not in windows */
}