diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-04-09 13:58:27 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-04-09 13:58:27 +0200 |
| commit | b915348a8288d68e2ff114fb3dd89ad22e699969 (patch) | |
| tree | 46ce54a62bef93a544ada376d2c42ad4ab50f596 /src/tools | |
| parent | c80f7a440de73dead499764b4073d39d54c68b9f (diff) | |
Add some missing override labels.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 10 | ||||
| -rw-r--r-- | src/tools/dcpomatic_batch.cc | 8 | ||||
| -rw-r--r-- | src/tools/dcpomatic_disk.cc | 10 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 12 | ||||
| -rw-r--r-- | src/tools/dcpomatic_playlist.cc | 8 | ||||
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 8 |
7 files changed, 30 insertions, 30 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 4d494bb63..42fc421e8 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1585,7 +1585,7 @@ public: private: - bool OnInit () + bool OnInit () override { try { wxInitAllImageHandlers (); @@ -1693,13 +1693,13 @@ private: return true; } - void OnInitCmdLine (wxCmdLineParser& parser) + void OnInitCmdLine (wxCmdLineParser& parser) override { parser.SetDesc (command_line_description); parser.SetSwitchChars (wxT ("-")); } - bool OnCmdLineParsed (wxCmdLineParser& parser) + bool OnCmdLineParsed (wxCmdLineParser& parser) override { if (parser.Found (wxT("version"))) { cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n"; @@ -1769,14 +1769,14 @@ private: } /* An unhandled exception has occurred inside the main event loop */ - bool OnExceptionInMainLoop () + bool OnExceptionInMainLoop () override { report_exception (); /* This will terminate the program */ return false; } - void OnUnhandledException () + void OnUnhandledException () override { report_exception (); } diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 29f79ff08..d3aa2500b 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -369,7 +369,7 @@ public: , _frame (frame) {} - void handle (shared_ptr<Socket> socket) + void handle (shared_ptr<Socket> socket) override { try { int const length = socket->read_uint32 (); @@ -390,7 +390,7 @@ private: class App : public wxApp { - bool OnInit () + bool OnInit () override { wxInitAllImageHandlers (); @@ -469,13 +469,13 @@ class App : public wxApp signal_manager->ui_idle (); } - void OnInitCmdLine (wxCmdLineParser& parser) + void OnInitCmdLine (wxCmdLineParser& parser) override { parser.SetDesc (command_line_description); parser.SetSwitchChars (wxT ("-")); } - bool OnCmdLineParsed (wxCmdLineParser& parser) + bool OnCmdLineParsed (wxCmdLineParser& parser) override { for (size_t i = 0; i < parser.GetParamCount(); ++i) { films_to_load.push_back (wx_to_std(parser.GetParam(i))); diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc index ec5d8e782..1907a6045 100644 --- a/src/tools/dcpomatic_disk.cc +++ b/src/tools/dcpomatic_disk.cc @@ -418,7 +418,7 @@ public: : _frame (nullptr) {} - bool OnInit () + bool OnInit () override { try { Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); @@ -489,13 +489,13 @@ public: return true; } - void OnInitCmdLine (wxCmdLineParser& parser) + void OnInitCmdLine (wxCmdLineParser& parser) override { parser.SetDesc (command_line_description); parser.SetSwitchChars (wxT ("-")); } - bool OnCmdLineParsed (wxCmdLineParser& parser) + bool OnCmdLineParsed (wxCmdLineParser& parser) override { _skip_alpha_check = parser.Found(wxT("sure")); @@ -549,14 +549,14 @@ public: } } - bool OnExceptionInMainLoop () + bool OnExceptionInMainLoop () override { report_exception (); /* This will terminate the program */ return false; } - void OnUnhandledException () + void OnUnhandledException () override { report_exception (); } diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 24bd3b4d7..481b0fb8b 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -620,7 +620,7 @@ public: private: - bool OnInit () + bool OnInit () override { wxSplashScreen* splash = nullptr; @@ -719,7 +719,7 @@ private: return false; } - void OnUnhandledException () + void OnUnhandledException () override { error_dialog (nullptr, _("An unknown exception occurred.") + " " + REPORT_PROBLEM); } diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 8c9f016d4..b83d9c482 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -1023,7 +1023,7 @@ public: , _frame (frame) {} - void handle (shared_ptr<Socket> socket) + void handle (shared_ptr<Socket> socket) override { try { int const length = socket->read_uint32 (); @@ -1057,7 +1057,7 @@ public: private: - bool OnInit () + bool OnInit () override { wxSplashScreen* splash = nullptr; try { @@ -1156,13 +1156,13 @@ private: return true; } - void OnInitCmdLine (wxCmdLineParser& parser) + void OnInitCmdLine (wxCmdLineParser& parser) override { parser.SetDesc (command_line_description); parser.SetSwitchChars (wxT ("-")); } - bool OnCmdLineParsed (wxCmdLineParser& parser) + bool OnCmdLineParsed (wxCmdLineParser& parser) override { if (parser.GetParamCount() > 0) { _dcp_to_load = wx_to_std (parser.GetParam (0)); @@ -1207,14 +1207,14 @@ private: } /* An unhandled exception has occurred inside the main event loop */ - bool OnExceptionInMainLoop () + bool OnExceptionInMainLoop () override { report_exception (); /* This will terminate the program */ return false; } - void OnUnhandledException () + void OnUnhandledException () override { report_exception (); } diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc index 6f06c0624..dbc5e81dd 100644 --- a/src/tools/dcpomatic_playlist.cc +++ b/src/tools/dcpomatic_playlist.cc @@ -85,7 +85,7 @@ public: return _content_view->selected (); } - shared_ptr<Content> get (string digest) const + shared_ptr<Content> get (string digest) const override { return _content_view->get (digest); } @@ -590,7 +590,7 @@ public: private: - bool OnInit () + bool OnInit () override try { wxInitAllImageHandlers (); @@ -645,7 +645,7 @@ private: } /* An unhandled exception has occurred inside the main event loop */ - bool OnExceptionInMainLoop () + bool OnExceptionInMainLoop () override { try { throw; @@ -674,7 +674,7 @@ private: return false; } - void OnUnhandledException () + void OnUnhandledException () override { error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM); } diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 401fb1077..de25f531d 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -87,7 +87,7 @@ public: boost::signals2::signal<void(int)> Removed; private: - void do_log (shared_ptr<const LogEntry> entry) + void do_log (shared_ptr<const LogEntry> entry) override { time_t const s = entry->seconds (); struct tm* local = localtime (&s); @@ -226,7 +226,7 @@ public: Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::quit, this), ID_quit); } - wxMenu* CreatePopupMenu () + wxMenu* CreatePopupMenu () override { auto menu = new wxMenu; menu->Append (ID_status, std_to_wx ("Status...")); @@ -273,7 +273,7 @@ public: private: - bool OnInit () + bool OnInit () override { if (!wxApp::OnInit()) { return false; @@ -327,7 +327,7 @@ private: return true; } - int OnExit () + int OnExit () override { delete _icon; return wxApp::OnExit (); |
