diff options
author | Nicholas Rishel <nicholas_rishel> | 2020-01-31 19:43:51 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-31 19:48:26 +0300 |
commit | 4633bb9939cd11a2429aeb2c0e5e3ede311a3126 (patch) | |
tree | 04f4b768b8bcf3842d843165081d01a94f0f4bd0 /intern | |
parent | eea3751c5bb2aef421cb7117add0f860da06d7af (diff) |
Cleanup: enforce immutability through const, instead of a comment
Differential Revision: https://developer.blender.org/D6504
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemSDL.cpp | 4 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 22 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowManager.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowManager.h | 6 |
4 files changed, 16 insertions, 18 deletions
diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp index d3295d5584c..7ed912b8218 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.cpp +++ b/intern/ghost/intern/GHOST_SystemSDL.cpp @@ -702,9 +702,9 @@ GHOST_WindowSDL *GHOST_SystemSDL::findGhostWindow(SDL_Window *sdl_win) // We should always check the window manager's list of windows // and only process events on these windows. - std::vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); + const std::vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); - std::vector<GHOST_IWindow *>::iterator win_it = win_vec.begin(); + std::vector<GHOST_IWindow *>::const_iterator win_it = win_vec.begin(); std::vector<GHOST_IWindow *>::const_iterator win_end = win_vec.end(); for (; win_it != win_end; ++win_it) { diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 4c77dbd7abe..2cc515ca3d7 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -546,9 +546,9 @@ GHOST_WindowX11 *GHOST_SystemX11::findGhostWindow(Window xwind) const * We should always check the window manager's list of windows * and only process events on these windows. */ - vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); + const vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); - vector<GHOST_IWindow *>::iterator win_it = win_vec.begin(); + vector<GHOST_IWindow *>::const_iterator win_it = win_vec.begin(); vector<GHOST_IWindow *>::const_iterator win_end = win_vec.end(); for (; win_it != win_end; ++win_it) { @@ -840,8 +840,8 @@ void GHOST_SystemX11::processEvent(XEvent *xe) /* update all window events */ { - vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); - vector<GHOST_IWindow *>::iterator win_it = win_vec.begin(); + const vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); + vector<GHOST_IWindow *>::const_iterator win_it = win_vec.begin(); vector<GHOST_IWindow *>::const_iterator win_end = win_vec.end(); for (; win_it != win_end; ++win_it) { @@ -1661,7 +1661,7 @@ void GHOST_SystemX11::addDirtyWindow(GHOST_WindowX11 *bad_wind) bool GHOST_SystemX11::generateWindowExposeEvents() { - vector<GHOST_WindowX11 *>::iterator w_start = m_dirty_windows.begin(); + vector<GHOST_WindowX11 *>::const_iterator w_start = m_dirty_windows.begin(); vector<GHOST_WindowX11 *>::const_iterator w_end = m_dirty_windows.end(); bool anyProcessed = false; @@ -1871,8 +1871,8 @@ void GHOST_SystemX11::getClipboard_xcout(const XEvent *evt, unsigned long pty_size, pty_items; unsigned char *ltxt = *txt; - vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); - vector<GHOST_IWindow *>::iterator win_it = win_vec.begin(); + const vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); + vector<GHOST_IWindow *>::const_iterator win_it = win_vec.begin(); GHOST_WindowX11 *window = static_cast<GHOST_WindowX11 *>(*win_it); Window win = window->getXWindow(); @@ -2077,8 +2077,8 @@ GHOST_TUns8 *GHOST_SystemX11::getClipboard(bool selection) const else sseln = m_atom.CLIPBOARD; - vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); - vector<GHOST_IWindow *>::iterator win_it = win_vec.begin(); + const vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); + vector<GHOST_IWindow *>::const_iterator win_it = win_vec.begin(); GHOST_WindowX11 *window = static_cast<GHOST_WindowX11 *>(*win_it); Window win = window->getXWindow(); @@ -2157,8 +2157,8 @@ void GHOST_SystemX11::putClipboard(GHOST_TInt8 *buffer, bool selection) const { Window m_window, owner; - vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); - vector<GHOST_IWindow *>::iterator win_it = win_vec.begin(); + const vector<GHOST_IWindow *> &win_vec = m_windowManager->getWindows(); + vector<GHOST_IWindow *>::const_iterator win_it = win_vec.begin(); GHOST_WindowX11 *window = static_cast<GHOST_WindowX11 *>(*win_it); m_window = window->getXWindow(); diff --git a/intern/ghost/intern/GHOST_WindowManager.cpp b/intern/ghost/intern/GHOST_WindowManager.cpp index 52a57edd4e9..d1d66c35de5 100644 --- a/intern/ghost/intern/GHOST_WindowManager.cpp +++ b/intern/ghost/intern/GHOST_WindowManager.cpp @@ -162,7 +162,7 @@ void GHOST_WindowManager::setWindowInactive(const GHOST_IWindow *window) } } -std::vector<GHOST_IWindow *> &GHOST_WindowManager::getWindows() +const std::vector<GHOST_IWindow *> &GHOST_WindowManager::getWindows() const { return m_windows; } diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h index 025d84f1f3d..c32689e4043 100644 --- a/intern/ghost/intern/GHOST_WindowManager.h +++ b/intern/ghost/intern/GHOST_WindowManager.h @@ -115,11 +115,9 @@ class GHOST_WindowManager { /** * Return a vector of the windows currently managed by this * class. - * \warning It is very dangerous to mess with the contents of - * this vector. Please do not destroy or add windows use the - * interface above for this, + * \return Const reference to the vector of windows managed */ - std::vector<GHOST_IWindow *> &getWindows(); + const std::vector<GHOST_IWindow *> &getWindows() const; /** * Finds the window associated with an OS window object/handle |