summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-02-08 18:39:09 +0000
committerCarl Hetherington <cth@carlh.net>2015-02-08 18:39:09 +0000
commitc30f9b2c7fc20e05e73b0d5ebf9dae9a1d87eeb9 (patch)
treefd93b08f723ac33d38d7517da7e8f7e51798ace8 /src
parent9d1fb717654dc38e9412d99bb84efdbced2e03ac (diff)
Fix a few warnings from Coverity; nothing dangerous, I don't think.
Diffstat (limited to 'src')
-rw-r--r--src/tools/dcpomatic.cc8
-rw-r--r--src/wx/config_dialog.cc48
-rw-r--r--src/wx/download_certificate_dialog.cc4
-rw-r--r--src/wx/kdm_dialog.cc6
-rw-r--r--src/wx/screen_dialog.cc6
5 files changed, 66 insertions, 6 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index e929f185d..21cd10c26 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -755,6 +755,14 @@ static const wxCmdLineEntryDesc command_line_description[] = {
*/
class App : public wxApp
{
+public:
+ App ()
+ : wxApp ()
+ , _frame (0)
+ {}
+
+private:
+
bool OnInit ()
try
{
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index e8cf8b263..368a94636 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -86,6 +86,11 @@ public:
GeneralPage (wxSize panel_size, int border)
: wxStockPreferencesPage (Kind_General)
, Page (panel_size, border)
+ , _set_language (0)
+ , _language (0)
+ , _num_local_encoding_threads (0)
+ , _check_for_updates (0)
+ , _check_for_test_updates (0)
{}
wxWindow* CreateWindow (wxWindow* parent)
@@ -234,6 +239,14 @@ class DefaultsPage : public wxPreferencesPage, public Page
public:
DefaultsPage (wxSize panel_size, int border)
: Page (panel_size, border)
+ , _j2k_bandwidth (0)
+ , _audio_delay (0)
+ , _isdcf_metadata_button (0)
+ , _still_length (0)
+ , _directory (0)
+ , _container (0)
+ , _dcp_content_type (0)
+ , _issuer (0)
{}
wxString GetName () const
@@ -424,6 +437,8 @@ class EncodingServersPage : public wxPreferencesPage, public Page
public:
EncodingServersPage (wxSize panel_size, int border)
: Page (panel_size, border)
+ , _use_any_servers (0)
+ , _servers_list (0)
{}
wxString GetName () const
@@ -528,6 +543,18 @@ class KeysPage : public wxPreferencesPage, public Page
public:
KeysPage (wxSize panel_size, int border)
: Page (panel_size, border)
+ , _panel (0)
+ , _certificates (0)
+ , _add_certificate (0)
+ , _remove_certificate (0)
+ , _remake_certificates (0)
+ , _signer_private_key (0)
+ , _load_signer_private_key (0)
+ , _decryption_certificate (0)
+ , _load_decryption_certificate (0)
+ , _decryption_private_key (0)
+ , _load_decryption_private_key (0)
+ , _export_decryption_certificate (0)
{}
wxString GetName () const
@@ -861,6 +888,10 @@ class TMSPage : public wxPreferencesPage, public Page
public:
TMSPage (wxSize panel_size, int border)
: Page (panel_size, border)
+ , _tms_ip (0)
+ , _tms_path (0)
+ , _tms_user (0)
+ , _tms_password (0)
{}
wxString GetName () const
@@ -946,6 +977,15 @@ public:
KDMEmailPage (wxSize panel_size, int border)
: Page (panel_size, border)
+ , _mail_server (0)
+ , _mail_user (0)
+ , _mail_password (0)
+ , _kdm_subject (0)
+ , _kdm_from (0)
+ , _kdm_cc (0)
+ , _kdm_bcc (0)
+ , _kdm_email (0)
+ , _reset_kdm_email (0)
{}
wxString GetName () const
@@ -1106,6 +1146,12 @@ public:
AdvancedPage (wxSize panel_size, int border)
: wxStockPreferencesPage (Kind_Advanced)
, Page (panel_size, border)
+ , _maximum_j2k_bandwidth (0)
+ , _allow_any_dcp_frame_rate (0)
+ , _log_general (0)
+ , _log_warning (0)
+ , _log_error (0)
+ , _log_timing (0)
{}
wxWindow* CreateWindow (wxWindow* parent)
diff --git a/src/wx/download_certificate_dialog.cc b/src/wx/download_certificate_dialog.cc
index abb1e6126..a8a712334 100644
--- a/src/wx/download_certificate_dialog.cc
+++ b/src/wx/download_certificate_dialog.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,6 +26,8 @@ using boost::function;
DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent, function<void (boost::filesystem::path)> load)
: TableDialog (parent, _("Download certificate"), 2, true)
, _load (load)
+ , _message (0)
+ , _download (0)
{
}
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 9b1d6bc98..3e6301482 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -274,7 +274,9 @@ KDMDialog::setup_sensitivity ()
_remove_screen->Enable (ss);
wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK));
- ok->Enable ((selected_cinemas().size() > 0 || selected_screens().size() > 0) && sd);
+ if (ok) {
+ ok->Enable ((selected_cinemas().size() > 0 || selected_screens().size() > 0) && sd);
+ }
_folder->Enable (_write_to->GetValue ());
}
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 503745683..8285ddb96 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -128,7 +128,9 @@ void
ScreenDialog::setup_sensitivity ()
{
wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
- ok->Enable (_certificate);
+ if (ok) {
+ ok->Enable (_certificate);
+ }
_download_certificate->Enable (
_manufacturer->GetStringSelection() == _("Doremi") ||