projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
334e250
)
Add a load of explicit keywords.
author
Carl Hetherington
<cth@carlh.net>
Tue, 27 Feb 2018 15:34:45 +0000
(15:34 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 27 Feb 2018 15:34:45 +0000
(15:34 +0000)
78 files changed:
src/lib/audio_analysis.h
patch
|
blob
|
history
src/lib/audio_buffers.h
patch
|
blob
|
history
src/lib/audio_content.h
patch
|
blob
|
history
src/lib/audio_delay.h
patch
|
blob
|
history
src/lib/audio_filter.h
patch
|
blob
|
history
src/lib/audio_merger.h
patch
|
blob
|
history
src/lib/audio_point.h
patch
|
blob
|
history
src/lib/cinema.h
patch
|
blob
|
history
src/lib/colour_conversion.h
patch
|
blob
|
history
src/lib/content.h
patch
|
blob
|
history
src/lib/content_part.h
patch
|
blob
|
history
src/lib/content_subtitle.h
patch
|
blob
|
history
src/lib/dcp.h
patch
|
blob
|
history
src/lib/dcp_examiner.h
patch
|
blob
|
history
src/lib/dcpomatic_socket.h
patch
|
blob
|
history
src/lib/dkdm_wrapper.h
patch
|
blob
|
history
src/lib/event_history.h
patch
|
blob
|
history
src/lib/exceptions.h
patch
|
blob
|
history
src/lib/ffmpeg.h
patch
|
blob
|
history
src/lib/ffmpeg_stream.h
patch
|
blob
|
history
src/lib/ffmpeg_subtitle_period.h
patch
|
blob
|
history
src/lib/file_group.h
patch
|
blob
|
history
src/lib/file_log.h
patch
|
blob
|
history
src/lib/film.h
patch
|
blob
|
history
src/lib/font.h
patch
|
blob
|
history
src/lib/image.h
patch
|
blob
|
history
src/lib/isdcf_metadata.h
patch
|
blob
|
history
src/lib/job.h
patch
|
blob
|
history
src/lib/json_server.h
patch
|
blob
|
history
src/lib/log_entry.h
patch
|
blob
|
history
src/lib/magick_image_proxy.h
patch
|
blob
|
history
src/lib/raw_image_proxy.h
patch
|
blob
|
history
src/lib/rgba.h
patch
|
blob
|
history
src/lib/screen.h
patch
|
blob
|
history
src/lib/signaller.h
patch
|
blob
|
history
src/lib/subtitle_content.h
patch
|
blob
|
history
src/lib/subtitle_string.h
patch
|
blob
|
history
src/lib/text_subtitle.h
patch
|
blob
|
history
src/lib/timer.h
patch
|
blob
|
history
src/lib/transcode_job.h
patch
|
blob
|
history
src/lib/types.h
patch
|
blob
|
history
src/lib/upload_job.h
patch
|
blob
|
history
src/lib/upmixer_a.h
patch
|
blob
|
history
src/lib/upmixer_b.h
patch
|
blob
|
history
src/lib/video_content.h
patch
|
blob
|
history
src/lib/video_content_scale.h
patch
|
blob
|
history
src/lib/video_mxf_examiner.h
patch
|
blob
|
history
src/tools/dcpomatic.cc
patch
|
blob
|
history
src/tools/dcpomatic_batch.cc
patch
|
blob
|
history
src/tools/dcpomatic_kdm.cc
patch
|
blob
|
history
src/wx/about_dialog.h
patch
|
blob
|
history
src/wx/audio_mapping_view.h
patch
|
blob
|
history
src/wx/audio_panel.h
patch
|
blob
|
history
src/wx/audio_plot.h
patch
|
blob
|
history
src/wx/content_menu.h
patch
|
blob
|
history
src/wx/dir_picker_ctrl.h
patch
|
blob
|
history
src/wx/download_certificate_dialog.h
patch
|
blob
|
history
src/wx/email_dialog.h
patch
|
blob
|
history
src/wx/export_dialog.h
patch
|
blob
|
history
src/wx/gain_calculator_dialog.h
patch
|
blob
|
history
src/wx/image_sequence_dialog.h
patch
|
blob
|
history
src/wx/kdm_timing_panel.h
patch
|
blob
|
history
src/wx/new_dkdm_folder_dialog.h
patch
|
blob
|
history
src/wx/rename_template_dialog.h
patch
|
blob
|
history
src/wx/repeat_dialog.h
patch
|
blob
|
history
src/wx/save_template_dialog.h
patch
|
blob
|
history
src/wx/screen_dialog.cc
patch
|
blob
|
history
src/wx/screens_panel.h
patch
|
blob
|
history
src/wx/server_dialog.h
patch
|
blob
|
history
src/wx/servers_list_dialog.h
patch
|
blob
|
history
src/wx/subtitle_panel.h
patch
|
blob
|
history
src/wx/system_font_dialog.h
patch
|
blob
|
history
src/wx/templates_dialog.h
patch
|
blob
|
history
src/wx/timeline_labels_view.h
patch
|
blob
|
history
src/wx/timeline_view.h
patch
|
blob
|
history
src/wx/video_panel.h
patch
|
blob
|
history
src/wx/wx_signal_manager.h
patch
|
blob
|
history
test/job_test.cc
patch
|
blob
|
history
diff --git
a/src/lib/audio_analysis.h
b/src/lib/audio_analysis.h
index a8ef4fb2d74007e1a984133492b8a841eaa53964..6da651c95a06bf670719222052a307b43a160b25 100644
(file)
--- a/
src/lib/audio_analysis.h
+++ b/
src/lib/audio_analysis.h
@@
-37,8
+37,8
@@
class Playlist;
class AudioAnalysis : public boost::noncopyable
{
public:
class AudioAnalysis : public boost::noncopyable
{
public:
- AudioAnalysis (int c);
- AudioAnalysis (boost::filesystem::path);
+
explicit
AudioAnalysis (int c);
+
explicit
AudioAnalysis (boost::filesystem::path);
void add_point (int c, AudioPoint const & p);
void add_point (int c, AudioPoint const & p);
diff --git
a/src/lib/audio_buffers.h
b/src/lib/audio_buffers.h
index f4a0c1f1c052dc8b8d0e3bc78484ae1e2486ea78..64ad4ba9539e5e665eb6efe61704bd0954e88e93 100644
(file)
--- a/
src/lib/audio_buffers.h
+++ b/
src/lib/audio_buffers.h
@@
-40,7
+40,7
@@
class AudioBuffers
public:
AudioBuffers (int channels, int32_t frames);
AudioBuffers (AudioBuffers const &);
public:
AudioBuffers (int channels, int32_t frames);
AudioBuffers (AudioBuffers const &);
- AudioBuffers (boost::shared_ptr<const AudioBuffers>);
+
explicit
AudioBuffers (boost::shared_ptr<const AudioBuffers>);
~AudioBuffers ();
AudioBuffers & operator= (AudioBuffers const &);
~AudioBuffers ();
AudioBuffers & operator= (AudioBuffers const &);
diff --git
a/src/lib/audio_content.h
b/src/lib/audio_content.h
index e582bca2092c101e66f4243bb2c7e6c25544af31..a1f5ba8a0aecbe05b8c6d6b450fdb54dfbe15f80 100644
(file)
--- a/
src/lib/audio_content.h
+++ b/
src/lib/audio_content.h
@@
-43,7
+43,7
@@
public:
class AudioContent : public ContentPart
{
public:
class AudioContent : public ContentPart
{
public:
- AudioContent (Content* parent);
+
explicit
AudioContent (Content* parent);
AudioContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
AudioContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
diff --git
a/src/lib/audio_delay.h
b/src/lib/audio_delay.h
index 644ca1fb465138df374787b722d6c4e0f672cb50..22be33478b58dbf4d152ceb49a4ec80179c31e27 100644
(file)
--- a/
src/lib/audio_delay.h
+++ b/
src/lib/audio_delay.h
@@
-25,7
+25,7
@@
class AudioBuffers;
class AudioDelay
{
public:
class AudioDelay
{
public:
- AudioDelay (int samples);
+
explicit
AudioDelay (int samples);
boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers> in);
void flush ();
boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers> in);
void flush ();
diff --git
a/src/lib/audio_filter.h
b/src/lib/audio_filter.h
index b6b75cbb02c27ea5f0241b54de44feafba379346..fb7b7b92ccb64283d7bc01235b35d486f0c5422b 100644
(file)
--- a/
src/lib/audio_filter.h
+++ b/
src/lib/audio_filter.h
@@
-32,7
+32,7
@@
struct audio_filter_impulse_input_test;
class AudioFilter
{
public:
class AudioFilter
{
public:
- AudioFilter (float transition_bandwidth)
+
explicit
AudioFilter (float transition_bandwidth)
: _ir (0)
{
_M = 4 / transition_bandwidth;
: _ir (0)
{
_M = 4 / transition_bandwidth;
diff --git
a/src/lib/audio_merger.h
b/src/lib/audio_merger.h
index 6c9d87097c6fc4458706317338f3dac426d863d8..dbc0c869103b44d69b5bbe301e9134bcdb752f02 100644
(file)
--- a/
src/lib/audio_merger.h
+++ b/
src/lib/audio_merger.h
@@
-31,7
+31,7
@@
class AudioMerger
{
public:
class AudioMerger
{
public:
- AudioMerger (int frame_rate);
+
explicit
AudioMerger (int frame_rate);
std::list<std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> > pull (DCPTime time);
void push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time);
std::list<std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> > pull (DCPTime time);
void push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time);
diff --git
a/src/lib/audio_point.h
b/src/lib/audio_point.h
index cc5e4943df4be126507420b2ed07b6599cae8375..91f0cb0e9caebd7188189ced776b6f35f63438e5 100644
(file)
--- a/
src/lib/audio_point.h
+++ b/
src/lib/audio_point.h
@@
-37,7
+37,7
@@
public:
};
AudioPoint ();
};
AudioPoint ();
- AudioPoint (cxml::ConstNodePtr node);
+
explicit
AudioPoint (cxml::ConstNodePtr node);
AudioPoint (AudioPoint const &);
AudioPoint& operator= (AudioPoint const &);
AudioPoint (AudioPoint const &);
AudioPoint& operator= (AudioPoint const &);
diff --git
a/src/lib/cinema.h
b/src/lib/cinema.h
index 3cb17502bed46eed17d1b118ef68b81328962540..6a3d89845dbc11b747a694338ab34e5f6688b6a5 100644
(file)
--- a/
src/lib/cinema.h
+++ b/
src/lib/cinema.h
@@
-48,7
+48,7
@@
public:
, _utc_offset_minute (utc_offset_minute)
{}
, _utc_offset_minute (utc_offset_minute)
{}
- Cinema (cxml::ConstNodePtr);
+
explicit
Cinema (cxml::ConstNodePtr);
void read_screens (cxml::ConstNodePtr);
void read_screens (cxml::ConstNodePtr);
diff --git
a/src/lib/colour_conversion.h
b/src/lib/colour_conversion.h
index 90405f2829df0659f84c4f455425493306846af0..73b6ad23ccf558f469b2e29a5369d562301ba505 100644
(file)
--- a/
src/lib/colour_conversion.h
+++ b/
src/lib/colour_conversion.h
@@
-37,7
+37,7
@@
class ColourConversion : public dcp::ColourConversion
{
public:
ColourConversion ();
{
public:
ColourConversion ();
- ColourConversion (dcp::ColourConversion);
+
explicit
ColourConversion (dcp::ColourConversion);
ColourConversion (cxml::NodePtr, int version);
virtual ~ColourConversion () {}
ColourConversion (cxml::NodePtr, int version);
virtual ~ColourConversion () {}
diff --git
a/src/lib/content.h
b/src/lib/content.h
index 836a3bd77e01c50d52a7233b38d1e147c7d49ad4..ea764907a2a2f6990b28f79b2efee9f42f8dd85f 100644
(file)
--- a/
src/lib/content.h
+++ b/
src/lib/content.h
@@
-63,7
+63,7
@@
public:
class Content : public boost::enable_shared_from_this<Content>, public Signaller, public boost::noncopyable
{
public:
class Content : public boost::enable_shared_from_this<Content>, public Signaller, public boost::noncopyable
{
public:
- Content (boost::shared_ptr<const Film>);
+
explicit
Content (boost::shared_ptr<const Film>);
Content (boost::shared_ptr<const Film>, DCPTime);
Content (boost::shared_ptr<const Film>, boost::filesystem::path);
Content (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
Content (boost::shared_ptr<const Film>, DCPTime);
Content (boost::shared_ptr<const Film>, boost::filesystem::path);
Content (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
diff --git
a/src/lib/content_part.h
b/src/lib/content_part.h
index d3b9b310d97747a31af4fe3ebfafb02a03df50a3..4f6e9e396bbb70325505cfd7f7cce191ead95e3b 100644
(file)
--- a/
src/lib/content_part.h
+++ b/
src/lib/content_part.h
@@
-1,3
+1,4
@@
+
/*
Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
@@
-31,7
+32,7
@@
class Film;
class ContentPart
{
public:
class ContentPart
{
public:
- ContentPart (Content* parent)
+
explicit
ContentPart (Content* parent)
: _parent (parent)
{}
: _parent (parent)
{}
diff --git
a/src/lib/content_subtitle.h
b/src/lib/content_subtitle.h
index 8751d56cb58f512d971428176f1545d762963017..f834fe197c202eba95fb2f78d26d01dae4412527 100644
(file)
--- a/
src/lib/content_subtitle.h
+++ b/
src/lib/content_subtitle.h
@@
-32,7
+32,7
@@
class Image;
class ContentSubtitle
{
public:
class ContentSubtitle
{
public:
- ContentSubtitle (ContentTime f)
+
explicit
ContentSubtitle (ContentTime f)
: _from (f)
{}
: _from (f)
{}
diff --git
a/src/lib/dcp.h
b/src/lib/dcp.h
index e2e83e96e20cb5ff92f22d01d2a49d535bb19886..575bcc8034b993d8a36cd3b7466afe5015a31997 100644
(file)
--- a/
src/lib/dcp.h
+++ b/
src/lib/dcp.h
@@
-33,7
+33,7
@@
public:
std::list<boost::shared_ptr<dcp::CPL> > cpls () const;
protected:
std::list<boost::shared_ptr<dcp::CPL> > cpls () const;
protected:
- DCP (boost::shared_ptr<const DCPContent> content)
+
explicit
DCP (boost::shared_ptr<const DCPContent> content)
: _dcp_content (content)
{}
: _dcp_content (content)
{}
diff --git
a/src/lib/dcp_examiner.h
b/src/lib/dcp_examiner.h
index d9c372c3c590a37510ff18b91bbc36dedddd66de..aaeec6d3249c6405bee61bda579527ddbf367105 100644
(file)
--- a/
src/lib/dcp_examiner.h
+++ b/
src/lib/dcp_examiner.h
@@
-31,7
+31,7
@@
class DCPContent;
class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
{
public:
class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
{
public:
- DCPExaminer (boost::shared_ptr<const DCPContent>);
+
explicit
DCPExaminer (boost::shared_ptr<const DCPContent>);
boost::optional<double> video_frame_rate () const {
return _video_frame_rate;
boost::optional<double> video_frame_rate () const {
return _video_frame_rate;
diff --git
a/src/lib/dcpomatic_socket.h
b/src/lib/dcpomatic_socket.h
index fa5250a1ad184225f6994f0c6767dd072c28e9c5..6f7c05e225e880321ef4adfb1fdcea2baec46c78 100644
(file)
--- a/
src/lib/dcpomatic_socket.h
+++ b/
src/lib/dcpomatic_socket.h
@@
-30,7
+30,7
@@
class Socket : public boost::noncopyable
{
public:
class Socket : public boost::noncopyable
{
public:
- Socket (int timeout = 30);
+
explicit
Socket (int timeout = 30);
/** @return Our underlying socket */
boost::asio::ip::tcp::socket& socket () {
/** @return Our underlying socket */
boost::asio::ip::tcp::socket& socket () {
diff --git
a/src/lib/dkdm_wrapper.h
b/src/lib/dkdm_wrapper.h
index 0c8b5fbfd25a063053b8593cb91db54c317171ef..09e9d25c428c3808869fc6b20429edcc9fa73876 100644
(file)
--- a/
src/lib/dkdm_wrapper.h
+++ b/
src/lib/dkdm_wrapper.h
@@
-52,7
+52,7
@@
private:
class DKDM : public DKDMBase
{
public:
class DKDM : public DKDMBase
{
public:
- DKDM (dcp::EncryptedKDM k)
+
explicit
DKDM (dcp::EncryptedKDM k)
: _dkdm (k)
{}
: _dkdm (k)
{}
@@
-70,7
+70,7
@@
private:
class DKDMGroup : public DKDMBase
{
public:
class DKDMGroup : public DKDMBase
{
public:
- DKDMGroup (std::string name)
+
explicit
DKDMGroup (std::string name)
: _name (name)
{}
: _name (name)
{}
diff --git
a/src/lib/event_history.h
b/src/lib/event_history.h
index f723591fbd19bd81c0fa052e997a59c88195a22c..e194f633335f0c3e0850a4db3c101d54aadabfef 100644
(file)
--- a/
src/lib/event_history.h
+++ b/
src/lib/event_history.h
@@
-27,7
+27,7
@@
class EventHistory
{
public:
class EventHistory
{
public:
- EventHistory (int size);
+
explicit
EventHistory (int size);
float rate () const;
void event ();
float rate () const;
void event ();
diff --git
a/src/lib/exceptions.h
b/src/lib/exceptions.h
index 08cbcb1d66bf6a593be12c84af52fd2479b5816b..5efb045b74906cdbb77e782d61023ba709c6c77d 100644
(file)
--- a/
src/lib/exceptions.h
+++ b/
src/lib/exceptions.h
@@
-39,7
+39,7
@@
extern "C" {
class DecodeError : public std::runtime_error
{
public:
class DecodeError : public std::runtime_error
{
public:
- DecodeError (std::string s)
+
explicit
DecodeError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-50,7
+50,7
@@
public:
class EncodeError : public std::runtime_error
{
public:
class EncodeError : public std::runtime_error
{
public:
- EncodeError (std::string s)
+
explicit
EncodeError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-84,7
+84,7
@@
private:
class JoinError : public std::runtime_error
{
public:
class JoinError : public std::runtime_error
{
public:
- JoinError (std::string s)
+
explicit
JoinError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-158,7
+158,7
@@
class MissingSettingError : public SettingError
{
public:
/** @param s Name of setting that was required */
{
public:
/** @param s Name of setting that was required */
- MissingSettingError (std::string s);
+
explicit
MissingSettingError (std::string s);
};
/** @class BadSettingError
};
/** @class BadSettingError
@@
-181,7
+181,7
@@
public:
class NetworkError : public std::runtime_error
{
public:
class NetworkError : public std::runtime_error
{
public:
- NetworkError (std::string s)
+
explicit
NetworkError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-192,7
+192,7
@@
public:
class KDMError : public std::runtime_error
{
public:
class KDMError : public std::runtime_error
{
public:
- KDMError (std::string s)
+
explicit
KDMError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-218,7
+218,7
@@
public:
class DCPError : public std::runtime_error
{
public:
class DCPError : public std::runtime_error
{
public:
- DCPError (std::string s)
+
explicit
DCPError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-227,7
+227,7
@@
class InvalidSignerError : public std::runtime_error
{
public:
InvalidSignerError ();
{
public:
InvalidSignerError ();
- InvalidSignerError (std::string reason);
+
explicit
InvalidSignerError (std::string reason);
};
class ProgrammingError : public std::runtime_error
};
class ProgrammingError : public std::runtime_error
@@
-239,7
+239,7
@@
public:
class TextEncodingError : public std::runtime_error
{
public:
class TextEncodingError : public std::runtime_error
{
public:
- TextEncodingError (std::string s)
+
explicit
TextEncodingError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-247,7
+247,7
@@
public:
class OldFormatError : public std::runtime_error
{
public:
class OldFormatError : public std::runtime_error
{
public:
- OldFormatError (std::string s)
+
explicit
OldFormatError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
diff --git
a/src/lib/ffmpeg.h
b/src/lib/ffmpeg.h
index 95a8bf5d9aa1bb7f860d1365b69bfc7fc550b058..dab67ead9fec3369b5c90379dcbd6516df1cef9c 100644
(file)
--- a/
src/lib/ffmpeg.h
+++ b/
src/lib/ffmpeg.h
@@
-40,7
+40,7
@@
class Log;
class FFmpeg
{
public:
class FFmpeg
{
public:
- FFmpeg (boost::shared_ptr<const FFmpegContent>);
+
explicit
FFmpeg (boost::shared_ptr<const FFmpegContent>);
virtual ~FFmpeg ();
boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
virtual ~FFmpeg ();
boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
diff --git
a/src/lib/ffmpeg_stream.h
b/src/lib/ffmpeg_stream.h
index ec27a30f0efbaa480d7acc9d53a40eea265612cf..84b2a8853317082b676f651bee47f11de3bc940b 100644
(file)
--- a/
src/lib/ffmpeg_stream.h
+++ b/
src/lib/ffmpeg_stream.h
@@
-35,7
+35,7
@@
public:
, _id (i)
{}
, _id (i)
{}
- FFmpegStream (cxml::ConstNodePtr);
+
explicit
FFmpegStream (cxml::ConstNodePtr);
void as_xml (xmlpp::Node *) const;
void as_xml (xmlpp::Node *) const;
diff --git
a/src/lib/ffmpeg_subtitle_period.h
b/src/lib/ffmpeg_subtitle_period.h
index 1c2c05975ba4c4e0fbf1b35d311db0cb63af7256..42c7bf76325fdf766e33ccf88a8770e347dd396c 100644
(file)
--- a/
src/lib/ffmpeg_subtitle_period.h
+++ b/
src/lib/ffmpeg_subtitle_period.h
@@
-24,7
+24,7
@@
class FFmpegSubtitlePeriod
{
public:
class FFmpegSubtitlePeriod
{
public:
- FFmpegSubtitlePeriod (ContentTime f)
+
explicit
FFmpegSubtitlePeriod (ContentTime f)
: from (f)
{}
: from (f)
{}
diff --git
a/src/lib/file_group.h
b/src/lib/file_group.h
index 865e6bd223966f059b6f0fdd055c4f5941ab20c5..800d9a059ec949e19497f2aca0256ab7bd9feeb2 100644
(file)
--- a/
src/lib/file_group.h
+++ b/
src/lib/file_group.h
@@
-35,8
+35,8
@@
class FileGroup
{
public:
FileGroup ();
{
public:
FileGroup ();
- FileGroup (boost::filesystem::path);
- FileGroup (std::vector<boost::filesystem::path> const &);
+
explicit
FileGroup (boost::filesystem::path);
+
explicit
FileGroup (std::vector<boost::filesystem::path> const &);
~FileGroup ();
void set_paths (std::vector<boost::filesystem::path> const &);
~FileGroup ();
void set_paths (std::vector<boost::filesystem::path> const &);
diff --git
a/src/lib/file_log.h
b/src/lib/file_log.h
index bd6a7bf6a4e49288d9c6883af1e78c8d440bf9d2..6904bfd77436def72047217d00dbd9823771ddf2 100644
(file)
--- a/
src/lib/file_log.h
+++ b/
src/lib/file_log.h
@@
-23,7
+23,7
@@
class FileLog : public Log
{
public:
class FileLog : public Log
{
public:
- FileLog (boost::filesystem::path file);
+
explicit
FileLog (boost::filesystem::path file);
std::string head_and_tail (int amount = 1024) const;
std::string head_and_tail (int amount = 1024) const;
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 355a41da531f4078aa23999b499e4efd17c615b0..20a1e2ca6551ad9f7c6ddaf9ddb4e2409e51c453 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-67,7
+67,7
@@
struct isdcf_name_test;
class Film : public boost::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
{
public:
class Film : public boost::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
{
public:
- Film (boost::optional<boost::filesystem::path> dir);
+
explicit
Film (boost::optional<boost::filesystem::path> dir);
~Film ();
boost::filesystem::path info_file (DCPTimePeriod p) const;
~Film ();
boost::filesystem::path info_file (DCPTimePeriod p) const;
diff --git
a/src/lib/font.h
b/src/lib/font.h
index bbf88b34ad0247d1bf9468bb826e11710e4128ab..cb18e4798b6e7b29ef1863ddc8216a6c759431e1 100644
(file)
--- a/
src/lib/font.h
+++ b/
src/lib/font.h
@@
-31,10
+31,10
@@
class Font
{
public:
class Font
{
public:
- Font (std::string id)
+
explicit
Font (std::string id)
: _id (id) {}
: _id (id) {}
- Font (cxml::NodePtr node);
+
explicit
Font (cxml::NodePtr node);
void as_xml (xmlpp::Node* node);
void as_xml (xmlpp::Node* node);
diff --git
a/src/lib/image.h
b/src/lib/image.h
index 8de0a2c69e53c5576a28baf62a8b9b4873667125..f71a47b0c7c9a1c3cf9f4e66105f817689a29fb9 100644
(file)
--- a/
src/lib/image.h
+++ b/
src/lib/image.h
@@
-41,8
+41,8
@@
class Image
{
public:
Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
{
public:
Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
- Image (AVFrame *);
- Image (Image const &);
+
explicit
Image (AVFrame *);
+
explicit
Image (Image const &);
Image (boost::shared_ptr<const Image>, bool);
Image& operator= (Image const &);
~Image ();
Image (boost::shared_ptr<const Image>, bool);
Image& operator= (Image const &);
~Image ();
diff --git
a/src/lib/isdcf_metadata.h
b/src/lib/isdcf_metadata.h
index 5d0e865fb476a287f0935e4c8a8cca169d3c4fc2..49d204cf42b4fa552d40082c8c10517101f70145 100644
(file)
--- a/
src/lib/isdcf_metadata.h
+++ b/
src/lib/isdcf_metadata.h
@@
-39,7
+39,7
@@
public:
, two_d_version_of_three_d (false)
{}
, two_d_version_of_three_d (false)
{}
- ISDCFMetadata (cxml::ConstNodePtr);
+
explicit
ISDCFMetadata (cxml::ConstNodePtr);
void as_xml (xmlpp::Node *) const;
void read_old_metadata (std::string, std::string);
void as_xml (xmlpp::Node *) const;
void read_old_metadata (std::string, std::string);
diff --git
a/src/lib/job.h
b/src/lib/job.h
index 185273e2d590a1d604ed62632ea39d12ce66c9fe..e5552e49ea8f63acec13443fccf29cc3d6f6b7a9 100644
(file)
--- a/
src/lib/job.h
+++ b/
src/lib/job.h
@@
-40,7
+40,7
@@
class Film;
class Job : public boost::enable_shared_from_this<Job>, public Signaller, public boost::noncopyable
{
public:
class Job : public boost::enable_shared_from_this<Job>, public Signaller, public boost::noncopyable
{
public:
- Job (boost::shared_ptr<const Film> film);
+
explicit
Job (boost::shared_ptr<const Film> film);
virtual ~Job ();
/** @return user-readable name of this job */
virtual ~Job ();
/** @return user-readable name of this job */
diff --git
a/src/lib/json_server.h
b/src/lib/json_server.h
index 996b9bf79eb1077fe7db19346c2ca3ccfe7ccfa0..f36e621f3f6fdbc23ee27d811c5213b0408b422f 100644
(file)
--- a/
src/lib/json_server.h
+++ b/
src/lib/json_server.h
@@
-23,7
+23,7
@@
class JSONServer
{
public:
class JSONServer
{
public:
- JSONServer (int port);
+
explicit
JSONServer (int port);
private:
void run (int port);
private:
void run (int port);
diff --git
a/src/lib/log_entry.h
b/src/lib/log_entry.h
index ba358f5a3941da9a93a70e02cad80b2dd713a0be..3d6a9f371990387e8c1d5bc8f7eb6399a3c9a4a9 100644
(file)
--- a/
src/lib/log_entry.h
+++ b/
src/lib/log_entry.h
@@
-36,7
+36,7
@@
public:
static const int TYPE_TIMING;
static const int TYPE_DEBUG_EMAIL;
static const int TYPE_TIMING;
static const int TYPE_DEBUG_EMAIL;
- LogEntry (int type);
+
explicit
LogEntry (int type);
virtual ~LogEntry () {}
virtual std::string message () const = 0;
virtual ~LogEntry () {}
virtual std::string message () const = 0;
diff --git
a/src/lib/magick_image_proxy.h
b/src/lib/magick_image_proxy.h
index 1db45d73bf35b3b98b41a315e6c3c3b038e4ba12..32d2f7efb1dd0e772b55ec5fcf15396197609ca3 100644
(file)
--- a/
src/lib/magick_image_proxy.h
+++ b/
src/lib/magick_image_proxy.h
@@
-26,7
+26,7
@@
class MagickImageProxy : public ImageProxy
{
public:
class MagickImageProxy : public ImageProxy
{
public:
- MagickImageProxy (boost::filesystem::path);
+
explicit
MagickImageProxy (boost::filesystem::path);
MagickImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
boost::shared_ptr<Image> image (
MagickImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
boost::shared_ptr<Image> image (
diff --git
a/src/lib/raw_image_proxy.h
b/src/lib/raw_image_proxy.h
index 2b64cbd9b812e9d14f0159eb0c2ba2f213e9861c..9f8424eb34df8061154ee96925b679a8d6939890 100644
(file)
--- a/
src/lib/raw_image_proxy.h
+++ b/
src/lib/raw_image_proxy.h
@@
-26,7
+26,7
@@
class RawImageProxy : public ImageProxy
{
public:
class RawImageProxy : public ImageProxy
{
public:
- RawImageProxy (boost::shared_ptr<Image>);
+
explicit
RawImageProxy (boost::shared_ptr<Image>);
RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
boost::shared_ptr<Image> image (
RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
boost::shared_ptr<Image> image (
diff --git
a/src/lib/rgba.h
b/src/lib/rgba.h
index b6f0cc1f1241bbf197b6b807ecb7366b5a8ca789..c9521f311b0151648de41447efbb85d5500307a9 100644
(file)
--- a/
src/lib/rgba.h
+++ b/
src/lib/rgba.h
@@
-45,7
+45,7
@@
public:
, a (a_)
{}
, a (a_)
{}
- RGBA (cxml::ConstNodePtr node);
+
explicit
RGBA (cxml::ConstNodePtr node);
void as_xml (xmlpp::Node* parent) const;
void as_xml (xmlpp::Node* parent) const;
diff --git
a/src/lib/screen.h
b/src/lib/screen.h
index cea5fe29cef4b73ebbf6903b6e3c0eeed3009430..5e8f1f9759723ddcb7b3e8fe4e9bbd605458f685 100644
(file)
--- a/
src/lib/screen.h
+++ b/
src/lib/screen.h
@@
-40,7
+40,7
@@
public:
, trusted_devices (td)
{}
, trusted_devices (td)
{}
- Screen (cxml::ConstNodePtr);
+
explicit
Screen (cxml::ConstNodePtr);
void as_xml (xmlpp::Element *) const;
void as_xml (xmlpp::Element *) const;
diff --git
a/src/lib/signaller.h
b/src/lib/signaller.h
index a6c74c954feb7eea674e51f608d8235c5feccb34..b67a639173cf3e4a5547568bf17797c266f0b761 100644
(file)
--- a/
src/lib/signaller.h
+++ b/
src/lib/signaller.h
@@
-71,7
+71,7
@@
template <class T>
class Wrapper : public WrapperBase
{
public:
class Wrapper : public WrapperBase
{
public:
- Wrapper (T signal)
+
explicit
Wrapper (T signal)
: _signal (signal)
{
: _signal (signal)
{
diff --git
a/src/lib/subtitle_content.h
b/src/lib/subtitle_content.h
index 58dc51510a8084ba4222e44d810871d32c4334d2..b64e4787b536b1d7fec96519027155ab9312e736 100644
(file)
--- a/
src/lib/subtitle_content.h
+++ b/
src/lib/subtitle_content.h
@@
-57,7
+57,7
@@
public:
class SubtitleContent : public ContentPart
{
public:
class SubtitleContent : public ContentPart
{
public:
- SubtitleContent (Content* parent);
+
explicit
SubtitleContent (Content* parent);
SubtitleContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
SubtitleContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
diff --git
a/src/lib/subtitle_string.h
b/src/lib/subtitle_string.h
index c1b0b14a8bb61c36117fd0df4f416380194a9738..81ebc274484856c069f8bcf43f487896fac9872f 100644
(file)
--- a/
src/lib/subtitle_string.h
+++ b/
src/lib/subtitle_string.h
@@
-30,7
+30,7
@@
class SubtitleString : public dcp::SubtitleString
{
public:
class SubtitleString : public dcp::SubtitleString
{
public:
- SubtitleString (dcp::SubtitleString dcp_)
+
explicit
SubtitleString (dcp::SubtitleString dcp_)
: dcp::SubtitleString (dcp_)
, outline_width (2)
{}
: dcp::SubtitleString (dcp_)
, outline_width (2)
{}
diff --git
a/src/lib/text_subtitle.h
b/src/lib/text_subtitle.h
index 94adb5cc58e9400b0d3b03b4dd144fa929a49d60..c72486ca01ee6330b5dbfd5484338ffd2cf08d86 100644
(file)
--- a/
src/lib/text_subtitle.h
+++ b/
src/lib/text_subtitle.h
@@
-35,7
+35,7
@@
class text_subtitle_parse_test;
class TextSubtitle
{
public:
class TextSubtitle
{
public:
- TextSubtitle (boost::shared_ptr<const TextSubtitleContent>);
+
explicit
TextSubtitle (boost::shared_ptr<const TextSubtitleContent>);
boost::optional<ContentTime> first () const;
ContentTime length () const;
boost::optional<ContentTime> first () const;
ContentTime length () const;
diff --git
a/src/lib/timer.h
b/src/lib/timer.h
index a7d4c8d019e8c3f3677ef570cbd2dbcfd6866d36..9ea95c7203850f329b67178c3a3e5c9f5f73c822 100644
(file)
--- a/
src/lib/timer.h
+++ b/
src/lib/timer.h
@@
-37,7
+37,7
@@
class PeriodTimer
{
public:
class PeriodTimer
{
public:
- PeriodTimer (std::string n);
+
explicit
PeriodTimer (std::string n);
~PeriodTimer ();
private:
~PeriodTimer ();
private:
diff --git
a/src/lib/transcode_job.h
b/src/lib/transcode_job.h
index 47611525a30fdc4c536ab827282f9e47892afcba..9dd9e36846abf5036fc894c743eb717585dfece2 100644
(file)
--- a/
src/lib/transcode_job.h
+++ b/
src/lib/transcode_job.h
@@
-33,7
+33,7
@@
class Encoder;
class TranscodeJob : public Job
{
public:
class TranscodeJob : public Job
{
public:
- TranscodeJob (boost::shared_ptr<const Film> film);
+
explicit
TranscodeJob (boost::shared_ptr<const Film> film);
std::string name () const;
std::string json_name () const;
std::string name () const;
std::string json_name () const;
diff --git
a/src/lib/types.h
b/src/lib/types.h
index 8f99b8881ffe0efec990721dee7ca7751c0a292f..ed3746f45ae5c99e76cbaea0461130273cccec0f 100644
(file)
--- a/
src/lib/types.h
+++ b/
src/lib/types.h
@@
-134,7
+134,7
@@
struct Crop
{
Crop () : left (0), right (0), top (0), bottom (0) {}
Crop (int l, int r, int t, int b) : left (l), right (r), top (t), bottom (b) {}
{
Crop () : left (0), right (0), top (0), bottom (0) {}
Crop (int l, int r, int t, int b) : left (l), right (r), top (t), bottom (b) {}
- Crop (boost::shared_ptr<cxml::Node>);
+
explicit
Crop (boost::shared_ptr<cxml::Node>);
/** Number of pixels to remove from the left-hand side */
int left;
/** Number of pixels to remove from the left-hand side */
int left;
diff --git
a/src/lib/upload_job.h
b/src/lib/upload_job.h
index 4d376851520fa3ab22e5dcfb6cdd1df2d4c5d479..407094ab839851fb1b49f0b3801bb4a5530a949c 100644
(file)
--- a/
src/lib/upload_job.h
+++ b/
src/lib/upload_job.h
@@
-27,7
+27,7
@@
class UploadJob : public Job
{
public:
class UploadJob : public Job
{
public:
- UploadJob (boost::shared_ptr<const Film>);
+
explicit
UploadJob (boost::shared_ptr<const Film>);
std::string name () const;
std::string json_name () const;
std::string name () const;
std::string json_name () const;
diff --git
a/src/lib/upmixer_a.h
b/src/lib/upmixer_a.h
index de02a8d959d7f09d4d5f070b60bd58c6341ac438..fe6a373ca44afb27ac231ce577f566c72acc55fb 100644
(file)
--- a/
src/lib/upmixer_a.h
+++ b/
src/lib/upmixer_a.h
@@
-31,7
+31,7
@@
class UpmixerA : public AudioProcessor
{
public:
class UpmixerA : public AudioProcessor
{
public:
- UpmixerA (int sampling_rate);
+
explicit
UpmixerA (int sampling_rate);
std::string name () const;
std::string id () const;
std::string name () const;
std::string id () const;
diff --git
a/src/lib/upmixer_b.h
b/src/lib/upmixer_b.h
index 0c724b36ca047f51272363d786445c50082ecf0f..47b4fadef1c9ef440a087d572e91b432f9539ed6 100644
(file)
--- a/
src/lib/upmixer_b.h
+++ b/
src/lib/upmixer_b.h
@@
-29,7
+29,7
@@
class UpmixerB : public AudioProcessor
{
public:
class UpmixerB : public AudioProcessor
{
public:
- UpmixerB (int sampling_rate);
+
explicit
UpmixerB (int sampling_rate);
std::string name () const;
std::string id () const;
std::string name () const;
std::string id () const;
diff --git
a/src/lib/video_content.h
b/src/lib/video_content.h
index 84b3d2268bbd2006ed376f3f504edc68b21d3e2a..774210c13ff191eb37521b6be328a110d79035d1 100644
(file)
--- a/
src/lib/video_content.h
+++ b/
src/lib/video_content.h
@@
-51,7
+51,7
@@
public:
class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
{
public:
class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
{
public:
- VideoContent (Content* parent);
+
explicit
VideoContent (Content* parent);
VideoContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
VideoContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
diff --git
a/src/lib/video_content_scale.h
b/src/lib/video_content_scale.h
index 1054234bc0d5a01edc0fff213a15c72c397c2fbf..2f161b1a7069d05e5c5756945fb09bafa9175e16 100644
(file)
--- a/
src/lib/video_content_scale.h
+++ b/
src/lib/video_content_scale.h
@@
-40,9
+40,9
@@
class VideoContentScale
{
public:
VideoContentScale ();
{
public:
VideoContentScale ();
- VideoContentScale (Ratio const *);
- VideoContentScale (bool);
- VideoContentScale (boost::shared_ptr<cxml::Node>);
+
explicit
VideoContentScale (Ratio const *);
+
explicit
VideoContentScale (bool);
+
explicit
VideoContentScale (boost::shared_ptr<cxml::Node>);
dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size display_container, dcp::Size film_container) const;
std::string id () const;
dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size display_container, dcp::Size film_container) const;
std::string id () const;
diff --git
a/src/lib/video_mxf_examiner.h
b/src/lib/video_mxf_examiner.h
index 43e82da4d2e12e33dcf097bc28837440cd9710d5..3a0189a2fc3bc2a190e74efee52afd35bd6e5f45 100644
(file)
--- a/
src/lib/video_mxf_examiner.h
+++ b/
src/lib/video_mxf_examiner.h
@@
-29,7
+29,7
@@
namespace dcp {
class VideoMXFExaminer : public VideoExaminer
{
public:
class VideoMXFExaminer : public VideoExaminer
{
public:
- VideoMXFExaminer (boost::shared_ptr<const VideoMXFContent>);
+
explicit
VideoMXFExaminer (boost::shared_ptr<const VideoMXFContent>);
boost::optional<double> video_frame_rate () const;
dcp::Size video_size () const;
boost::optional<double> video_frame_rate () const;
dcp::Size video_size () const;
diff --git
a/src/tools/dcpomatic.cc
b/src/tools/dcpomatic.cc
index 05534cc608a57697025ed1a18bbd791d1ba3adca..b221201435deac4504cf1090b2602e2edac9457a 100644
(file)
--- a/
src/tools/dcpomatic.cc
+++ b/
src/tools/dcpomatic.cc
@@
-113,7
+113,7
@@
using dcp::raw_convert;
class FilmChangedClosingDialog : public boost::noncopyable
{
public:
class FilmChangedClosingDialog : public boost::noncopyable
{
public:
- FilmChangedClosingDialog (string name)
+
explicit
FilmChangedClosingDialog (string name)
{
_dialog = new wxMessageDialog (
0,
{
_dialog = new wxMessageDialog (
0,
@@
-146,7
+146,7
@@
private:
class FilmChangedDuplicatingDialog : public boost::noncopyable
{
public:
class FilmChangedDuplicatingDialog : public boost::noncopyable
{
public:
- FilmChangedDuplicatingDialog (string name)
+
explicit
FilmChangedDuplicatingDialog (string name)
{
_dialog = new wxMessageDialog (
0,
{
_dialog = new wxMessageDialog (
0,
@@
-223,7
+223,7
@@
enum {
class DOMFrame : public wxFrame
{
public:
class DOMFrame : public wxFrame
{
public:
- DOMFrame (wxString const & title)
+
explicit
DOMFrame (wxString const & title)
: wxFrame (NULL, -1, title)
, _video_waveform_dialog (0)
, _hints_dialog (0)
: wxFrame (NULL, -1, title)
, _video_waveform_dialog (0)
, _hints_dialog (0)
diff --git
a/src/tools/dcpomatic_batch.cc
b/src/tools/dcpomatic_batch.cc
index 3cfe6c0a09e25dfdfec1d44afdbf08f5a9f5d90f..f6197b1e22f7bc473cfb9fc2622c1f7e11383d66 100644
(file)
--- a/
src/tools/dcpomatic_batch.cc
+++ b/
src/tools/dcpomatic_batch.cc
@@
-91,7
+91,7
@@
setup_menu (wxMenuBar* m)
class DOMFrame : public wxFrame
{
public:
class DOMFrame : public wxFrame
{
public:
- DOMFrame (wxString const & title)
+
explicit
DOMFrame (wxString const & title)
: wxFrame (NULL, -1, title)
, _sizer (new wxBoxSizer (wxVERTICAL))
, _config_dialog (0)
: wxFrame (NULL, -1, title)
, _sizer (new wxBoxSizer (wxVERTICAL))
, _config_dialog (0)
@@
-252,7
+252,7
@@
static const wxCmdLineEntryDesc command_line_description[] = {
class JobServer : public Server
{
public:
class JobServer : public Server
{
public:
- JobServer (DOMFrame* frame)
+
explicit
JobServer (DOMFrame* frame)
: Server (BATCH_JOB_PORT)
, _frame (frame)
{}
: Server (BATCH_JOB_PORT)
, _frame (frame)
{}
diff --git
a/src/tools/dcpomatic_kdm.cc
b/src/tools/dcpomatic_kdm.cc
index 5b296b3002f971268fdcfaf25de5bce818f2d205..65326efb3e52139cfda31536c63b5f0bf02c3102 100644
(file)
--- a/
src/tools/dcpomatic_kdm.cc
+++ b/
src/tools/dcpomatic_kdm.cc
@@
-79,7
+79,7
@@
enum {
class DOMFrame : public wxFrame
{
public:
class DOMFrame : public wxFrame
{
public:
- DOMFrame (wxString const & title)
+
explicit
DOMFrame (wxString const & title)
: wxFrame (0, -1, title)
, _config_dialog (0)
, _job_view (0)
: wxFrame (0, -1, title)
, _config_dialog (0)
, _job_view (0)
diff --git
a/src/wx/about_dialog.h
b/src/wx/about_dialog.h
index 5e895490898fe054d161cb25db3d04745a3aae2b..c1965459998ced7f4859b14113b87c017dad42bb 100644
(file)
--- a/
src/wx/about_dialog.h
+++ b/
src/wx/about_dialog.h
@@
-32,11
+32,10
@@
class wxNotebook;
class AboutDialog : public wxDialog
{
public:
class AboutDialog : public wxDialog
{
public:
- AboutDialog (wxWindow *);
+
explicit
AboutDialog (wxWindow *);
private:
void add_section (wxString, wxArrayString);
wxNotebook* _notebook; ///< notebook used to keep each list of names for the credits
};
private:
void add_section (wxString, wxArrayString);
wxNotebook* _notebook; ///< notebook used to keep each list of names for the credits
};
-
diff --git
a/src/wx/audio_mapping_view.h
b/src/wx/audio_mapping_view.h
index 6d2265784b1fd64aaa373538d3c62861f9da232f..18ab2540772a2c4ede6ad79fb88ab7ab52ef8cfb 100644
(file)
--- a/
src/wx/audio_mapping_view.h
+++ b/
src/wx/audio_mapping_view.h
@@
-46,7
+46,7
@@
class AudioMappingView : public wxPanel
{
public:
class AudioMappingView : public wxPanel
{
public:
- AudioMappingView (wxWindow *);
+
explicit
AudioMappingView (wxWindow *);
void set (AudioMapping);
void set_input_channels (std::vector<std::string> const & names);
void set (AudioMapping);
void set_input_channels (std::vector<std::string> const & names);
diff --git
a/src/wx/audio_panel.h
b/src/wx/audio_panel.h
index fe9f1cdec59b536ce379641783d8ca986809bd55..ede0ddb26689a6f6e0107dbd34489f0f12360601 100644
(file)
--- a/
src/wx/audio_panel.h
+++ b/
src/wx/audio_panel.h
@@
-32,7
+32,7
@@
class AudioDialog;
class AudioPanel : public ContentSubPanel
{
public:
class AudioPanel : public ContentSubPanel
{
public:
- AudioPanel (ContentPanel *);
+
explicit
AudioPanel (ContentPanel *);
~AudioPanel ();
void film_changed (Film::Property);
~AudioPanel ();
void film_changed (Film::Property);
diff --git
a/src/wx/audio_plot.h
b/src/wx/audio_plot.h
index 2f4b224e853854cc295321982da7e4606a776422..49f7e4ab3ad684b8ef0d791ead9d2cff13cec422 100644
(file)
--- a/
src/wx/audio_plot.h
+++ b/
src/wx/audio_plot.h
@@
-29,7
+29,7
@@
struct Metrics;
class AudioPlot : public wxPanel
{
public:
class AudioPlot : public wxPanel
{
public:
- AudioPlot (wxWindow *);
+
explicit
AudioPlot (wxWindow *);
void set_analysis (boost::shared_ptr<AudioAnalysis>);
void set_channel_visible (int c, bool v);
void set_analysis (boost::shared_ptr<AudioAnalysis>);
void set_channel_visible (int c, bool v);
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index 0647331038b64d00477ca0e293abcf793d81a864..a38109b0738e84914139a38ca0350c47b6c54604 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-34,7
+34,7
@@
class DCPContent;
class ContentMenu : public boost::noncopyable
{
public:
class ContentMenu : public boost::noncopyable
{
public:
- ContentMenu (wxWindow* p);
+
explicit
ContentMenu (wxWindow* p);
void popup (boost::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
void popup (boost::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
diff --git
a/src/wx/dir_picker_ctrl.h
b/src/wx/dir_picker_ctrl.h
index 2a486d891c351a61d575c92edf63db4cf2d516fa..659fe07ea157ae80607c9bf7b7e197185f0de821 100644
(file)
--- a/
src/wx/dir_picker_ctrl.h
+++ b/
src/wx/dir_picker_ctrl.h
@@
-23,7
+23,7
@@
class DirPickerCtrl : public wxPanel
{
public:
class DirPickerCtrl : public wxPanel
{
public:
- DirPickerCtrl (wxWindow *);
+
explicit
DirPickerCtrl (wxWindow *);
wxString GetPath () const;
void SetPath (wxString);
wxString GetPath () const;
void SetPath (wxString);
diff --git
a/src/wx/download_certificate_dialog.h
b/src/wx/download_certificate_dialog.h
index cae5f59d87ec3bbaf4d55c0edfeb7cf4406cbba3..dcb0a952ae1f014e63afad3d67d982b9e55493ad 100644
(file)
--- a/
src/wx/download_certificate_dialog.h
+++ b/
src/wx/download_certificate_dialog.h
@@
-26,7
+26,7
@@
class DownloadCertificatePanel;
class DownloadCertificateDialog : public wxDialog
{
public:
class DownloadCertificateDialog : public wxDialog
{
public:
- DownloadCertificateDialog (wxWindow* parent);
+
explicit
DownloadCertificateDialog (wxWindow* parent);
~DownloadCertificateDialog ();
dcp::Certificate certificate () const;
~DownloadCertificateDialog ();
dcp::Certificate certificate () const;
diff --git
a/src/wx/email_dialog.h
b/src/wx/email_dialog.h
index 40a6fdb741f5743a6dd3ae100e0875370ea90301..932dd8714be3028e6e87912853898b34f6fdb072 100644
(file)
--- a/
src/wx/email_dialog.h
+++ b/
src/wx/email_dialog.h
@@
-24,7
+24,7
@@
class EmailDialog : public TableDialog
{
public:
class EmailDialog : public TableDialog
{
public:
- EmailDialog (wxWindow *);
+
explicit
EmailDialog (wxWindow *);
void set (std::string);
boost::optional<std::string> get () const;
void set (std::string);
boost::optional<std::string> get () const;
diff --git
a/src/wx/export_dialog.h
b/src/wx/export_dialog.h
index 0406c562f1aac5c1c246b911b80e210154f0c44c..d785d910d6577c051c8ccc7bbb8337a595c9d615 100644
(file)
--- a/
src/wx/export_dialog.h
+++ b/
src/wx/export_dialog.h
@@
-28,7
+28,7
@@
class FilePickerCtrl;
class ExportDialog : public TableDialog
{
public:
class ExportDialog : public TableDialog
{
public:
- ExportDialog (wxWindow* parent);
+
explicit
ExportDialog (wxWindow* parent);
boost::filesystem::path path () const;
FFmpegEncoder::Format format () const;
boost::filesystem::path path () const;
FFmpegEncoder::Format format () const;
diff --git
a/src/wx/gain_calculator_dialog.h
b/src/wx/gain_calculator_dialog.h
index c68e9426fd4ef43197327cc838a7e127aaacc3b5..e1ed026b8744a71635a68ca9d1a9c985e8e71fdc 100644
(file)
--- a/
src/wx/gain_calculator_dialog.h
+++ b/
src/wx/gain_calculator_dialog.h
@@
-24,7
+24,7
@@
class GainCalculatorDialog : public TableDialog
{
public:
class GainCalculatorDialog : public TableDialog
{
public:
- GainCalculatorDialog (wxWindow* parent);
+
explicit
GainCalculatorDialog (wxWindow* parent);
float actual_fader () const;
float wanted_fader () const;
float actual_fader () const;
float wanted_fader () const;
diff --git
a/src/wx/image_sequence_dialog.h
b/src/wx/image_sequence_dialog.h
index 3104cef48515ee90eceb18c39f13cfe8ec2d9f40..65d1cb922bbed968aec689ce98ac39e7c46555e8 100644
(file)
--- a/
src/wx/image_sequence_dialog.h
+++ b/
src/wx/image_sequence_dialog.h
@@
-24,7
+24,7
@@
class ImageSequenceDialog : public TableDialog
{
public:
class ImageSequenceDialog : public TableDialog
{
public:
- ImageSequenceDialog (wxWindow* parent);
+
explicit
ImageSequenceDialog (wxWindow* parent);
double frame_rate () const;
double frame_rate () const;
diff --git
a/src/wx/kdm_timing_panel.h
b/src/wx/kdm_timing_panel.h
index 368b451463e949f0bfaf898d5caed4dc83ba07a5..a926864dbb72da8ee1904c68271064b6229c0a3a 100644
(file)
--- a/
src/wx/kdm_timing_panel.h
+++ b/
src/wx/kdm_timing_panel.h
@@
-28,7
+28,7
@@
class TimePicker;
class KDMTimingPanel : public wxPanel
{
public:
class KDMTimingPanel : public wxPanel
{
public:
- KDMTimingPanel (wxWindow* parent);
+
explicit
KDMTimingPanel (wxWindow* parent);
/** @return KDM from time in local time */
boost::posix_time::ptime from () const;
/** @return KDM from time in local time */
boost::posix_time::ptime from () const;
diff --git
a/src/wx/new_dkdm_folder_dialog.h
b/src/wx/new_dkdm_folder_dialog.h
index 3f4a1503e34741270df625bfe1f1e4be426d6776..ff99aad61cc031eccf591900d1268f557bb543d3 100644
(file)
--- a/
src/wx/new_dkdm_folder_dialog.h
+++ b/
src/wx/new_dkdm_folder_dialog.h
@@
-23,7
+23,7
@@
class NewDKDMFolderDialog : public TableDialog
{
public:
class NewDKDMFolderDialog : public TableDialog
{
public:
- NewDKDMFolderDialog (wxWindow* parent);
+
explicit
NewDKDMFolderDialog (wxWindow* parent);
void set (wxString n);
wxString get () const;
void set (wxString n);
wxString get () const;
diff --git
a/src/wx/rename_template_dialog.h
b/src/wx/rename_template_dialog.h
index bef9f542b43c159bebd830cc80f61b36273fe183..4ad4ee4c4dcb8a37a8980d1c54bd461a0436b8d2 100644
(file)
--- a/
src/wx/rename_template_dialog.h
+++ b/
src/wx/rename_template_dialog.h
@@
-23,7
+23,7
@@
class RenameTemplateDialog : public TableDialog
{
public:
class RenameTemplateDialog : public TableDialog
{
public:
- RenameTemplateDialog (wxWindow* parent);
+
explicit
RenameTemplateDialog (wxWindow* parent);
void set (wxString n);
wxString get () const;
void set (wxString n);
wxString get () const;
diff --git
a/src/wx/repeat_dialog.h
b/src/wx/repeat_dialog.h
index a3ae7f8dafaf7644052c340fd29cf891e7e61ff8..0c4fb6a865345b0331849b0f14d619b07f3f3afd 100644
(file)
--- a/
src/wx/repeat_dialog.h
+++ b/
src/wx/repeat_dialog.h
@@
-25,7
+25,7
@@
class RepeatDialog : public TableDialog
{
public:
class RepeatDialog : public TableDialog
{
public:
- RepeatDialog (wxWindow *);
+
explicit
RepeatDialog (wxWindow *);
int number () const;
int number () const;
diff --git
a/src/wx/save_template_dialog.h
b/src/wx/save_template_dialog.h
index 5fc4300f8ea9378da5ecb4f4e21ff920d9fa03ed..3ccf17ed0254d602249118d8544a48698b018f2a 100644
(file)
--- a/
src/wx/save_template_dialog.h
+++ b/
src/wx/save_template_dialog.h
@@
-23,7
+23,7
@@
class SaveTemplateDialog : public TableDialog
{
public:
class SaveTemplateDialog : public TableDialog
{
public:
- SaveTemplateDialog (wxWindow* parent);
+
explicit
SaveTemplateDialog (wxWindow* parent);
std::string name () const;
std::string name () const;
diff --git
a/src/wx/screen_dialog.cc
b/src/wx/screen_dialog.cc
index e6c2b6dd8efbf8a4717c1da58b0812e7c7022c01..c7684d77fbad025a9ac845a0cb9bc0ddd1dd8c8e 100644
(file)
--- a/
src/wx/screen_dialog.cc
+++ b/
src/wx/screen_dialog.cc
@@
-45,7
+45,7
@@
column (dcp::Certificate c)
class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
{
public:
class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
{
public:
- CertificateFileDialogWrapper (wxWindow* parent)
+
explicit
CertificateFileDialogWrapper (wxWindow* parent)
: FileDialogWrapper<dcp::Certificate> (parent, _("Select certificate file"))
{
: FileDialogWrapper<dcp::Certificate> (parent, _("Select certificate file"))
{
diff --git
a/src/wx/screens_panel.h
b/src/wx/screens_panel.h
index 87f12c701b8cb5641b73e187b8ff945a860f235d..71817905232aa5011c8f596f8c9be699f2d5c3e9 100644
(file)
--- a/
src/wx/screens_panel.h
+++ b/
src/wx/screens_panel.h
@@
-31,7
+31,7
@@
class Screen;
class ScreensPanel : public wxPanel
{
public:
class ScreensPanel : public wxPanel
{
public:
- ScreensPanel (wxWindow* parent);
+
explicit
ScreensPanel (wxWindow* parent);
~ScreensPanel ();
std::list<boost::shared_ptr<Screen> > screens () const;
~ScreensPanel ();
std::list<boost::shared_ptr<Screen> > screens () const;
diff --git
a/src/wx/server_dialog.h
b/src/wx/server_dialog.h
index 8c02490172d62d7a18926af49ca68b3bb887dbe3..92b417a4c5ca6cdfc3aa36e08f1b1a60fff2a0e9 100644
(file)
--- a/
src/wx/server_dialog.h
+++ b/
src/wx/server_dialog.h
@@
-24,7
+24,7
@@
class ServerDialog : public TableDialog
{
public:
class ServerDialog : public TableDialog
{
public:
- ServerDialog (wxWindow *);
+
explicit
ServerDialog (wxWindow *);
void set (std::string);
boost::optional<std::string> get () const;
void set (std::string);
boost::optional<std::string> get () const;
diff --git
a/src/wx/servers_list_dialog.h
b/src/wx/servers_list_dialog.h
index 114e6b851367791077f0511e067a7d52d9960636..309cde77e39fc0405890120c7b2f82396425658e 100644
(file)
--- a/
src/wx/servers_list_dialog.h
+++ b/
src/wx/servers_list_dialog.h
@@
-26,7
+26,7
@@
class ServersListDialog : public wxDialog
{
public:
class ServersListDialog : public wxDialog
{
public:
- ServersListDialog (wxWindow *);
+
explicit
ServersListDialog (wxWindow *);
private:
void servers_list_changed ();
private:
void servers_list_changed ();
diff --git
a/src/wx/subtitle_panel.h
b/src/wx/subtitle_panel.h
index 16836eb3614509beaf545303c9a570393dd16c38..5e619a995b9d5cbeaed16e15cba3dc62926ef34f 100644
(file)
--- a/
src/wx/subtitle_panel.h
+++ b/
src/wx/subtitle_panel.h
@@
-28,7
+28,7
@@
class FontsDialog;
class SubtitlePanel : public ContentSubPanel
{
public:
class SubtitlePanel : public ContentSubPanel
{
public:
- SubtitlePanel (ContentPanel *);
+
explicit
SubtitlePanel (ContentPanel *);
void film_changed (Film::Property);
void film_content_changed (int);
void film_changed (Film::Property);
void film_content_changed (int);
diff --git
a/src/wx/system_font_dialog.h
b/src/wx/system_font_dialog.h
index 9cced4956f0426cef9480ac6ae28a1c0ba81b67d..48a31a839160223d4408da4347a6e3575d55ab8a 100644
(file)
--- a/
src/wx/system_font_dialog.h
+++ b/
src/wx/system_font_dialog.h
@@
-36,7
+36,7
@@
class wxListCtrl;
class SystemFontDialog : public wxDialog
{
public:
class SystemFontDialog : public wxDialog
{
public:
- SystemFontDialog (wxWindow* parent);
+
explicit
SystemFontDialog (wxWindow* parent);
boost::optional<boost::filesystem::path> get_font () const;
boost::optional<boost::filesystem::path> get_font () const;
diff --git
a/src/wx/templates_dialog.h
b/src/wx/templates_dialog.h
index 0395739329d56a9936708843719d8691b265a358..8ef0d956ccf78099fa70f5e3782d2c6ead0d00c7 100644
(file)
--- a/
src/wx/templates_dialog.h
+++ b/
src/wx/templates_dialog.h
@@
-25,7
+25,7
@@
class TemplatesDialog : public wxDialog
{
public:
class TemplatesDialog : public wxDialog
{
public:
- TemplatesDialog (wxWindow* parent);
+
explicit
TemplatesDialog (wxWindow* parent);
void refresh ();
void layout ();
void refresh ();
void layout ();
diff --git
a/src/wx/timeline_labels_view.h
b/src/wx/timeline_labels_view.h
index 87b3cc90284a734f923a660f785a8878a67f7867..90293768c4364fcf2fc4565e493ef360e3ff1c5b 100644
(file)
--- a/
src/wx/timeline_labels_view.h
+++ b/
src/wx/timeline_labels_view.h
@@
-25,7
+25,7
@@
class wxWindow;
class TimelineLabelsView : public TimelineView
{
public:
class TimelineLabelsView : public TimelineView
{
public:
- TimelineLabelsView (Timeline& tl);
+
explicit
TimelineLabelsView (Timeline& tl);
dcpomatic::Rect<int> bbox () const;
dcpomatic::Rect<int> bbox () const;
diff --git
a/src/wx/timeline_view.h
b/src/wx/timeline_view.h
index c99faad06c7427591975dbbbd4271a27b882449c..f0ded7bce1583c8478f3c663f95036448f0e1e29 100644
(file)
--- a/
src/wx/timeline_view.h
+++ b/
src/wx/timeline_view.h
@@
-34,7
+34,7
@@
class Timeline;
class TimelineView : public boost::noncopyable
{
public:
class TimelineView : public boost::noncopyable
{
public:
- TimelineView (Timeline& t);
+
explicit
TimelineView (Timeline& t);
virtual ~TimelineView () {}
void paint (wxGraphicsContext* g, std::list<dcpomatic::Rect<int> > overlaps);
virtual ~TimelineView () {}
void paint (wxGraphicsContext* g, std::list<dcpomatic::Rect<int> > overlaps);
diff --git
a/src/wx/video_panel.h
b/src/wx/video_panel.h
index c405822be59d14c5c2b9bc0754adf7152c55cdf1..2be7eb049ffa69e1ad3043c8b2c5df9318dd9c3d 100644
(file)
--- a/
src/wx/video_panel.h
+++ b/
src/wx/video_panel.h
@@
-39,7
+39,7
@@
class wxButton;
class VideoPanel : public ContentSubPanel
{
public:
class VideoPanel : public ContentSubPanel
{
public:
- VideoPanel (ContentPanel *);
+
explicit
VideoPanel (ContentPanel *);
void film_changed (Film::Property);
void film_content_changed (int);
void film_changed (Film::Property);
void film_content_changed (int);
diff --git
a/src/wx/wx_signal_manager.h
b/src/wx/wx_signal_manager.h
index 6671b8318b8e1889480dac1e439ca5af2a70c942..2e6ddc3007c0d9bf886d70f15159ee7138d9214e 100644
(file)
--- a/
src/wx/wx_signal_manager.h
+++ b/
src/wx/wx_signal_manager.h
@@
-29,7
+29,7
@@
class wxEvtHandler;
class wxSignalManager : public SignalManager
{
public:
class wxSignalManager : public SignalManager
{
public:
- wxSignalManager (wxEvtHandler *);
+
explicit
wxSignalManager (wxEvtHandler *);
void wake_ui ();
private:
void wake_ui ();
private:
diff --git
a/test/job_test.cc
b/test/job_test.cc
index f4c9658bfcc704f42562fef6a1f1ed29f501a728..fa48904703b8ced194cc34a11c42f70039b66694 100644
(file)
--- a/
test/job_test.cc
+++ b/
test/job_test.cc
@@
-34,7
+34,7
@@
using boost::shared_ptr;
class TestJob : public Job
{
public:
class TestJob : public Job
{
public:
- TestJob (shared_ptr<Film> film)
+
explicit
TestJob (shared_ptr<Film> film)
: Job (film)
{
: Job (film)
{