[Bf-blender-cvs] [36584bbc2d3] master: Cleanup: quiet discarded-qualifiers warning
Campbell Barton
noreply at git.blender.org
Tue Jul 6 04:10:37 CEST 2021
Commit: 36584bbc2d347cc1df9fd77b59ff1a3d3d7fef53
Author: Campbell Barton
Date: Tue Jul 6 12:05:25 2021 +1000
Branches: master
https://developer.blender.org/rB36584bbc2d347cc1df9fd77b59ff1a3d3d7fef53
Cleanup: quiet discarded-qualifiers warning
===================================================================
M intern/ghost/GHOST_C-api.h
M intern/ghost/GHOST_ISystem.h
M intern/ghost/intern/GHOST_C-api.cpp
M intern/ghost/intern/GHOST_System.h
M intern/ghost/intern/GHOST_SystemCocoa.h
M intern/ghost/intern/GHOST_SystemCocoa.mm
M intern/ghost/intern/GHOST_SystemNULL.h
M intern/ghost/intern/GHOST_SystemSDL.cpp
M intern/ghost/intern/GHOST_SystemSDL.h
M intern/ghost/intern/GHOST_SystemWayland.cpp
M intern/ghost/intern/GHOST_SystemWayland.h
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/ghost/intern/GHOST_SystemWin32.h
M intern/ghost/intern/GHOST_SystemX11.cpp
M intern/ghost/intern/GHOST_SystemX11.h
===================================================================
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index 0feb6f4c6cb..db3f9bd561e 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -893,7 +893,7 @@ extern char *GHOST_getClipboard(bool selection);
* \param buffer: the string buffer to set.
* \param selection: Set the selection instead, X11 only feature.
*/
-extern void GHOST_putClipboard(char *buffer, bool selection);
+extern void GHOST_putClipboard(const char *buffer, bool selection);
/**
* Toggles console
diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h
index 86737589e06..4c395f720df 100644
--- a/intern/ghost/GHOST_ISystem.h
+++ b/intern/ghost/GHOST_ISystem.h
@@ -436,7 +436,7 @@ class GHOST_ISystem {
/**
* Put data to the Clipboard
*/
- virtual void putClipboard(char *buffer, bool selection) const = 0;
+ virtual void putClipboard(const char *buffer, bool selection) const = 0;
/***************************************************************************************
* System Message Box.
diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp
index daa228ccef6..cb409595e50 100644
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@ -803,7 +803,7 @@ char *GHOST_getClipboard(bool selection)
return system->getClipboard(selection);
}
-void GHOST_putClipboard(char *buffer, bool selection)
+void GHOST_putClipboard(const char *buffer, bool selection)
{
GHOST_ISystem *system = GHOST_ISystem::getSystem();
system->putClipboard(buffer, selection);
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h
index 4c10ba814b3..9164687c5b5 100644
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.h
@@ -315,7 +315,7 @@ class GHOST_System : public GHOST_ISystem {
* \param buffer: The buffer to copy to the clipboard.
* \param selection: The clipboard to copy too only used on X11.
*/
- virtual void putClipboard(char *buffer, bool selection) const = 0;
+ virtual void putClipboard(const char *buffer, bool selection) const = 0;
/**
* Show a system message box
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h
index 161fea62236..48a64b155fc 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.h
+++ b/intern/ghost/intern/GHOST_SystemCocoa.h
@@ -215,7 +215,7 @@ class GHOST_SystemCocoa : public GHOST_System {
* \param buffer: The buffer to be copied.
* \param selection: Indicates which buffer to copy too, only used on X11.
*/
- void putClipboard(char *buffer, bool selection) const;
+ void putClipboard(const char *buffer, bool selection) const;
/**
* Handles a window event. Called by GHOST_WindowCocoa window delegate
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index bff18e99f67..0f10d5815f4 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1969,7 +1969,7 @@ char *GHOST_SystemCocoa::getClipboard(bool selection) const
}
}
-void GHOST_SystemCocoa::putClipboard(char *buffer, bool selection) const
+void GHOST_SystemCocoa::putClipboard(const char *buffer, bool selection) const
{
if (selection)
return; // for copying the selection, used on X11
diff --git a/intern/ghost/intern/GHOST_SystemNULL.h b/intern/ghost/intern/GHOST_SystemNULL.h
index 573b35a878c..5dbc42b53a2 100644
--- a/intern/ghost/intern/GHOST_SystemNULL.h
+++ b/intern/ghost/intern/GHOST_SystemNULL.h
@@ -56,7 +56,7 @@ class GHOST_SystemNULL : public GHOST_System {
{
return NULL;
}
- void putClipboard(char *buffer, bool selection) const
+ void putClipboard(const char *buffer, bool selection) const
{ /* nop */
}
uint64_t getMilliSeconds() const
diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp
index 7c078a09419..f2f1b26b8e5 100644
--- a/intern/ghost/intern/GHOST_SystemSDL.cpp
+++ b/intern/ghost/intern/GHOST_SystemSDL.cpp
@@ -748,7 +748,7 @@ char *GHOST_SystemSDL::getClipboard(bool selection) const
return (char *)SDL_GetClipboardText();
}
-void GHOST_SystemSDL::putClipboard(char *buffer, bool selection) const
+void GHOST_SystemSDL::putClipboard(const char *buffer, bool selection) const
{
SDL_SetClipboardText(buffer);
}
diff --git a/intern/ghost/intern/GHOST_SystemSDL.h b/intern/ghost/intern/GHOST_SystemSDL.h
index 506c53f76fd..051bb6777b1 100644
--- a/intern/ghost/intern/GHOST_SystemSDL.h
+++ b/intern/ghost/intern/GHOST_SystemSDL.h
@@ -58,7 +58,7 @@ class GHOST_SystemSDL : public GHOST_System {
char *getClipboard(bool selection) const;
- void putClipboard(char *buffer, bool selection) const;
+ void putClipboard(const char *buffer, bool selection) const;
uint64_t getMilliSeconds();
diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp
index 8e17b7761ba..aaf7c6f5f12 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cpp
@@ -1517,7 +1517,7 @@ char *GHOST_SystemWayland::getClipboard(bool /*selection*/) const
return clipboard;
}
-void GHOST_SystemWayland::putClipboard(char *buffer, bool /*selection*/) const
+void GHOST_SystemWayland::putClipboard(const char *buffer, bool /*selection*/) const
{
if (!d->data_device_manager || d->inputs.empty()) {
return;
diff --git a/intern/ghost/intern/GHOST_SystemWayland.h b/intern/ghost/intern/GHOST_SystemWayland.h
index e6936470537..9f02afb9d5a 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.h
+++ b/intern/ghost/intern/GHOST_SystemWayland.h
@@ -61,7 +61,7 @@ class GHOST_SystemWayland : public GHOST_System {
char *getClipboard(bool selection) const override;
- void putClipboard(char *buffer, bool selection) const override;
+ void putClipboard(const char *buffer, bool selection) const override;
uint8_t getNumDisplays() const override;
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index e2cc37b0d16..4f5e957077d 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -2059,7 +2059,7 @@ char *GHOST_SystemWin32::getClipboard(bool selection) const
}
}
-void GHOST_SystemWin32::putClipboard(char *buffer, bool selection) const
+void GHOST_SystemWin32::putClipboard(const char *buffer, bool selection) const
{
if (selection) {
return;
diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h
index 7b4f4ae86c4..6c786aedfb1 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.h
+++ b/intern/ghost/intern/GHOST_SystemWin32.h
@@ -229,7 +229,7 @@ class GHOST_SystemWin32 : public GHOST_System {
* \param selection: Used by X11 only.
* \return No return.
*/
- void putClipboard(char *buffer, bool selection) const;
+ void putClipboard(const char *buffer, bool selection) const;
/**
* Show a system message box
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 342a3ac4413..172fcbeb3de 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -2242,7 +2242,7 @@ char *GHOST_SystemX11::getClipboard(bool selection) const
return NULL;
}
-void GHOST_SystemX11::putClipboard(char *buffer, bool selection) const
+void GHOST_SystemX11::putClipboard(const char *buffer, bool selection) const
{
Window m_window, owner;
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index 37a18be8fbf..15ccde4a14b 100644
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -229,7 +229,7 @@ class GHOST_SystemX11 : public GHOST_System {
* \param buffer: The buffer to copy to the clipboard.
* \param selection: Set the selection into the clipboard, X11 only feature.
*/
- void putClipboard(char *buffer, bool selection) const;
+ void putClipboard(const char *buffer, bool selection) const;
/**
* Show a system message box
More information about the Bf-blender-cvs
mailing list