solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept

Browse source 
Don't use deprecated macros in wxWidgets itself.
This commit is contained in:
PB 2022-10-12 17:07:48 +02:00 • committed by Vadim Zeitlin
parent be5095acdd
commit 88d526660f
1282 changed files with 11878 additions and 11878 deletions
Download patch file Download diff file Expand all files Collapse all files

18
samples/ipc/baseclient.cpp
View file

@ -46,8 +46,8 @@ class MyApp : public wxApp
public:
MyApp() { Bind(wxEVT_IDLE, &MyApp::OnIdle, this); }
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
private:
void OnIdle(wxIdleEvent& event);
@ -58,11 +58,11 @@ private:
class MyConnection : public MyConnectionBase
{
public:
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE;
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnDisconnect() wxOVERRIDE;
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) override;
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) override;
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) override;
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) override;
virtual bool OnDisconnect() override;
};
class MyClient : public wxClient,
@ -74,10 +74,10 @@ public:
bool Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic);
void Disconnect();
wxConnectionBase *OnMakeConnection() wxOVERRIDE;
wxConnectionBase *OnMakeConnection() override;
bool IsConnected() { return m_connection != NULL; }
virtual void Notify() wxOVERRIDE;
virtual void Notify() override;
void StartNextTestIfNecessary();

28
samples/ipc/baseserver.cpp
View file

@ -42,28 +42,28 @@
class MyConnection : public MyConnectionBase, public wxTimer
{
public:
virtual bool Disconnect() wxOVERRIDE { return wxConnection::Disconnect(); }
virtual bool Disconnect() override { return wxConnection::Disconnect(); }
virtual bool OnExecute(const wxString& topic,
const void *data,
size_t size,
wxIPCFormat format) wxOVERRIDE;
wxIPCFormat format) override;
virtual const void *OnRequest(const wxString& topic,
const wxString& item,
size_t *size,
wxIPCFormat format) wxOVERRIDE;
wxIPCFormat format) override;
virtual bool OnPoke(const wxString& topic,
const wxString& item,
const void *data,
size_t size,
wxIPCFormat format) wxOVERRIDE;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
wxIPCFormat format) override;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) override;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) override;
virtual bool DoAdvise(const wxString& item,
const void *data,
size_t size,
wxIPCFormat format) wxOVERRIDE;
virtual bool OnDisconnect() wxOVERRIDE;
virtual void Notify() wxOVERRIDE;
wxIPCFormat format) override;
virtual bool OnDisconnect() override;
virtual void Notify() override;
private:
wxString m_sAdvise;
@ -83,9 +83,9 @@ public:
const wxString& item,
const void *data,
size_t size,
wxIPCFormat format) wxOVERRIDE;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
wxIPCFormat format) override;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) override;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) override;
private:
// return true if this is the supported topic+item combination, log an
@ -112,7 +112,7 @@ public:
void Disconnect();
bool IsConnected() { return m_connection != NULL; }
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE;
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) override;
private:
wxConnection *m_connection;
@ -122,7 +122,7 @@ private:
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
protected:
MyServer m_server;

16
samples/ipc/client.h
View file

@ -29,8 +29,8 @@ class MyFrame;
class MyApp: public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual int OnExit() wxOVERRIDE;
virtual bool OnInit() override;
virtual int OnExit() override;
MyFrame *GetFrame() { return m_frame; }
protected:
@ -81,11 +81,11 @@ protected:
class MyConnection : public MyConnectionBase
{
public:
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE;
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnDisconnect() wxOVERRIDE;
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) override;
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) override;
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) override;
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) override;
virtual bool OnDisconnect() override;
};
class MyClient: public wxClient
@ -95,7 +95,7 @@ public:
~MyClient();
bool Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic);
void Disconnect();
wxConnectionBase *OnMakeConnection() wxOVERRIDE;
wxConnectionBase *OnMakeConnection() override;
bool IsConnected() { return m_connection != NULL; }
MyConnection *GetConnection() { return m_connection; }

18
samples/ipc/server.h
View file

@ -25,7 +25,7 @@ class MyFrame;
class MyApp : public wxApp
{
public:
virtual bool OnInit() wxOVERRIDE;
virtual bool OnInit() override;
MyFrame *GetFrame() { return m_frame; }
protected:
@ -65,13 +65,13 @@ protected:
class MyConnection : public MyConnectionBase
{
public:
virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
virtual bool DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool OnDisconnect() wxOVERRIDE;
virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format) override;
virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format) override;
virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) override;
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) override;
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) override;
virtual bool DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format) override;
virtual bool OnDisconnect() override;
// topic for which we advise the client or empty if none
wxString m_advise;
@ -95,7 +95,7 @@ public:
void Advise();
bool CanAdvise() { return m_connection && !m_connection->m_advise.empty(); }
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE;
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) override;
protected:
MyConnection *m_connection;