chore: IArchTaskBarReciver subclasses Icon pointer should not be a const
This commit is contained in:
committed by
Chris Rizzitello
parent
b783f6e754
commit
37acc3b2fc
@ -203,7 +203,7 @@ void MSWindowsClientTaskBarReceiver::primaryAction()
|
||||
showStatus();
|
||||
}
|
||||
|
||||
const IArchTaskBarReceiver::Icon MSWindowsClientTaskBarReceiver::getIcon() const
|
||||
IArchTaskBarReceiver::Icon MSWindowsClientTaskBarReceiver::getIcon() const
|
||||
{
|
||||
return static_cast<Icon>(m_icon[getStatus()]);
|
||||
}
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -50,7 +50,7 @@ void OSXClientTaskBarReceiver::primaryAction()
|
||||
// do nothing
|
||||
}
|
||||
|
||||
const IArchTaskBarReceiver::Icon OSXClientTaskBarReceiver::getIcon() const
|
||||
IArchTaskBarReceiver::Icon OSXClientTaskBarReceiver::getIcon() const
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
};
|
||||
|
||||
@ -50,7 +50,7 @@ void CXWindowsClientTaskBarReceiver::primaryAction()
|
||||
// do nothing
|
||||
}
|
||||
|
||||
const IArchTaskBarReceiver::Icon CXWindowsClientTaskBarReceiver::getIcon() const
|
||||
IArchTaskBarReceiver::Icon CXWindowsClientTaskBarReceiver::getIcon() const
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
};
|
||||
|
||||
@ -229,7 +229,7 @@ void MSWindowsServerTaskBarReceiver::primaryAction()
|
||||
showStatus();
|
||||
}
|
||||
|
||||
const IArchTaskBarReceiver::Icon MSWindowsServerTaskBarReceiver::getIcon() const
|
||||
IArchTaskBarReceiver::Icon MSWindowsServerTaskBarReceiver::getIcon() const
|
||||
{
|
||||
return static_cast<Icon>(m_icon[getStatus()]);
|
||||
}
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -50,7 +50,7 @@ void OSXServerTaskBarReceiver::primaryAction()
|
||||
// do nothing
|
||||
}
|
||||
|
||||
const IArchTaskBarReceiver::Icon OSXServerTaskBarReceiver::getIcon() const
|
||||
IArchTaskBarReceiver::Icon OSXServerTaskBarReceiver::getIcon() const
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
};
|
||||
|
||||
@ -50,7 +50,7 @@ void CXWindowsServerTaskBarReceiver::primaryAction()
|
||||
// do nothing
|
||||
}
|
||||
|
||||
const IArchTaskBarReceiver::Icon CXWindowsServerTaskBarReceiver::getIcon() const
|
||||
IArchTaskBarReceiver::Icon CXWindowsServerTaskBarReceiver::getIcon() const
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
};
|
||||
|
||||
@ -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
|
||||
/*!
|
||||
|
||||
@ -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()
|
||||
{
|
||||
|
||||
@ -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:
|
||||
|
||||
Reference in New Issue
Block a user