From 37acc3b2fc79b3d93fd48b5f69f348bca606a673 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Wed, 27 Nov 2024 08:45:02 -0500 Subject: [PATCH] chore: IArchTaskBarReciver subclasses Icon pointer should not be a const --- src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp | 2 +- src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h | 2 +- src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp | 2 +- src/cmd/deskflowc/OSXClientTaskBarReceiver.h | 2 +- src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp | 2 +- src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h | 2 +- src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp | 2 +- src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h | 2 +- src/cmd/deskflows/OSXServerTaskBarReceiver.cpp | 2 +- src/cmd/deskflows/OSXServerTaskBarReceiver.h | 2 +- src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp | 2 +- src/cmd/deskflows/XWindowsServerTaskBarReceiver.h | 2 +- src/lib/arch/IArchTaskBarReceiver.h | 2 +- src/lib/deskflow/ClientTaskBarReceiver.h | 2 +- src/lib/deskflow/ServerTaskBarReceiver.h | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp index 015a1dd89..b4252d87c 100644 --- a/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp +++ b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp @@ -203,7 +203,7 @@ void MSWindowsClientTaskBarReceiver::primaryAction() showStatus(); } -const IArchTaskBarReceiver::Icon MSWindowsClientTaskBarReceiver::getIcon() const +IArchTaskBarReceiver::Icon MSWindowsClientTaskBarReceiver::getIcon() const { return static_cast(m_icon[getStatus()]); } diff --git a/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h index d6a00d63c..7989ce3b2 100644 --- a/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h +++ b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h @@ -37,7 +37,7 @@ public: virtual void showStatus(); virtual void runMenu(int x, int y); virtual void primaryAction(); - virtual const Icon getIcon() const; + virtual Icon getIcon() const; void cleanup(); protected: diff --git a/src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp b/src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp index baaae0445..dc8512c1c 100644 --- a/src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp +++ b/src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp @@ -50,7 +50,7 @@ void OSXClientTaskBarReceiver::primaryAction() // do nothing } -const IArchTaskBarReceiver::Icon OSXClientTaskBarReceiver::getIcon() const +IArchTaskBarReceiver::Icon OSXClientTaskBarReceiver::getIcon() const { return NULL; } diff --git a/src/cmd/deskflowc/OSXClientTaskBarReceiver.h b/src/cmd/deskflowc/OSXClientTaskBarReceiver.h index 0a2e9f292..9fd02bd5c 100644 --- a/src/cmd/deskflowc/OSXClientTaskBarReceiver.h +++ b/src/cmd/deskflowc/OSXClientTaskBarReceiver.h @@ -34,5 +34,5 @@ public: virtual void showStatus(); virtual void runMenu(int x, int y); virtual void primaryAction(); - virtual const Icon getIcon() const; + virtual Icon getIcon() const; }; diff --git a/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp index 84e3638c9..bb2d4e731 100644 --- a/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp +++ b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp @@ -50,7 +50,7 @@ void CXWindowsClientTaskBarReceiver::primaryAction() // do nothing } -const IArchTaskBarReceiver::Icon CXWindowsClientTaskBarReceiver::getIcon() const +IArchTaskBarReceiver::Icon CXWindowsClientTaskBarReceiver::getIcon() const { return NULL; } diff --git a/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h index afdd01372..eeff2b5ad 100644 --- a/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h +++ b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h @@ -39,5 +39,5 @@ public: virtual void showStatus(); virtual void runMenu(int x, int y); virtual void primaryAction(); - virtual const Icon getIcon() const; + virtual Icon getIcon() const; }; diff --git a/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp index 17ee86615..eb6ee5c0d 100644 --- a/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp +++ b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp @@ -229,7 +229,7 @@ void MSWindowsServerTaskBarReceiver::primaryAction() showStatus(); } -const IArchTaskBarReceiver::Icon MSWindowsServerTaskBarReceiver::getIcon() const +IArchTaskBarReceiver::Icon MSWindowsServerTaskBarReceiver::getIcon() const { return static_cast(m_icon[getStatus()]); } diff --git a/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h index 0906b5e2b..7c13dc982 100644 --- a/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h +++ b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h @@ -37,7 +37,7 @@ public: virtual void showStatus(); virtual void runMenu(int x, int y); virtual void primaryAction(); - virtual const Icon getIcon() const; + virtual Icon getIcon() const; void cleanup(); protected: diff --git a/src/cmd/deskflows/OSXServerTaskBarReceiver.cpp b/src/cmd/deskflows/OSXServerTaskBarReceiver.cpp index 004fab1c3..c3233bab2 100644 --- a/src/cmd/deskflows/OSXServerTaskBarReceiver.cpp +++ b/src/cmd/deskflows/OSXServerTaskBarReceiver.cpp @@ -50,7 +50,7 @@ void OSXServerTaskBarReceiver::primaryAction() // do nothing } -const IArchTaskBarReceiver::Icon OSXServerTaskBarReceiver::getIcon() const +IArchTaskBarReceiver::Icon OSXServerTaskBarReceiver::getIcon() const { return NULL; } diff --git a/src/cmd/deskflows/OSXServerTaskBarReceiver.h b/src/cmd/deskflows/OSXServerTaskBarReceiver.h index 69eeaf226..41121c40f 100644 --- a/src/cmd/deskflows/OSXServerTaskBarReceiver.h +++ b/src/cmd/deskflows/OSXServerTaskBarReceiver.h @@ -33,5 +33,5 @@ public: virtual void showStatus(); virtual void runMenu(int x, int y); virtual void primaryAction(); - virtual const Icon getIcon() const; + virtual Icon getIcon() const; }; diff --git a/src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp index 4857df2da..6e18ad94f 100644 --- a/src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp +++ b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp @@ -50,7 +50,7 @@ void CXWindowsServerTaskBarReceiver::primaryAction() // do nothing } -const IArchTaskBarReceiver::Icon CXWindowsServerTaskBarReceiver::getIcon() const +IArchTaskBarReceiver::Icon CXWindowsServerTaskBarReceiver::getIcon() const { return NULL; } diff --git a/src/cmd/deskflows/XWindowsServerTaskBarReceiver.h b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.h index 7cab6ea2f..fa4325640 100644 --- a/src/cmd/deskflows/XWindowsServerTaskBarReceiver.h +++ b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.h @@ -39,5 +39,5 @@ public: virtual void showStatus(); virtual void runMenu(int x, int y); virtual void primaryAction(); - virtual const Icon getIcon() const; + virtual Icon getIcon() const; }; diff --git a/src/lib/arch/IArchTaskBarReceiver.h b/src/lib/arch/IArchTaskBarReceiver.h index 110b08507..2635378fa 100644 --- a/src/lib/arch/IArchTaskBarReceiver.h +++ b/src/lib/arch/IArchTaskBarReceiver.h @@ -81,7 +81,7 @@ public: to set the icon is left to subclasses. Getting and setting the icon must be thread safe. */ - virtual const Icon getIcon() const = 0; + virtual Icon getIcon() const = 0; //! Get tooltip /*! diff --git a/src/lib/deskflow/ClientTaskBarReceiver.h b/src/lib/deskflow/ClientTaskBarReceiver.h index afaa7107c..e09024540 100644 --- a/src/lib/deskflow/ClientTaskBarReceiver.h +++ b/src/lib/deskflow/ClientTaskBarReceiver.h @@ -54,7 +54,7 @@ public: virtual void primaryAction() = 0; virtual void lock() const; virtual void unlock() const; - virtual const Icon getIcon() const = 0; + virtual Icon getIcon() const = 0; virtual std::string getToolTip() const; virtual void cleanup() { diff --git a/src/lib/deskflow/ServerTaskBarReceiver.h b/src/lib/deskflow/ServerTaskBarReceiver.h index 34f760dd2..30e289d2b 100644 --- a/src/lib/deskflow/ServerTaskBarReceiver.h +++ b/src/lib/deskflow/ServerTaskBarReceiver.h @@ -57,7 +57,7 @@ public: virtual void primaryAction() = 0; virtual void lock() const; virtual void unlock() const; - virtual const Icon getIcon() const = 0; + virtual Icon getIcon() const = 0; virtual std::string getToolTip() const; protected: