diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-01 13:59:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-01 13:59:50 +0100 |
| commit | 05654d0e1799746a9df3ccab040c92e0ed825cac (patch) | |
| tree | 59f89a17bf9b9fd9e1056a55653724b616703a2c /src/tools | |
| parent | b63118dafbd7224e9196a40895d9c7cb96504717 (diff) | |
| parent | 6bc83f72f12c8513a1e9e9b6fd880697a73f968f (diff) | |
Merge master.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_batch.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_cli.cc | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic_create.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_server_cli.cc | 2 | ||||
| -rw-r--r-- | src/tools/server_test.cc | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 1fb7feb7d..fb63ae997 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -392,7 +392,7 @@ private: ); int r; - while (1) { + while (true) { r = c->ShowModal (); if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) { error_dialog (this, _("You did not select a folder. Make sure that you select a folder before clicking Open.")); diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 58fbaec98..49b341443 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -173,7 +173,7 @@ private: } int r; - while (1) { + while (true) { r = c->ShowModal (); if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) { error_dialog (this, _("You did not select a folder. Make sure that you select a folder before clicking Open.")); diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index acd1335e6..7dd820b95 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -69,7 +69,7 @@ main (int argc, char* argv[]) bool keep_going = false; int option_index = 0; - while (1) { + while (true) { static struct option long_options[] = { { "version", no_argument, 0, 'v'}, { "help", no_argument, 0, 'h'}, @@ -212,7 +212,7 @@ main (int argc, char* argv[]) } if (keep_going) { - while (1) { + while (true) { dcpomatic_sleep (3600); } } diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index b0a67c6d9..304f4f697 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -81,7 +81,7 @@ main (int argc, char* argv[]) boost::filesystem::path output; int option_index = 0; - while (1) { + while (true) { static struct option long_options[] = { { "version", no_argument, 0, 'v'}, { "help", no_argument, 0, 'h'}, diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index fa14dd141..2ad07cce7 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -116,7 +116,7 @@ int main (int argc, char* argv[]) program_name = argv[0]; int option_index = 0; - while (1) { + while (true) { static struct option long_options[] = { { "help", no_argument, 0, 'h'}, { "output", required_argument, 0, 'o'}, diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc index 56802d8ae..e4ac85f4c 100644 --- a/src/tools/dcpomatic_server_cli.cc +++ b/src/tools/dcpomatic_server_cli.cc @@ -66,7 +66,7 @@ main (int argc, char* argv[]) bool write_log = false; int option_index = 0; - while (1) { + while (true) { static struct option long_options[] = { { "version", no_argument, 0, 'v'}, { "help", no_argument, 0, 'h'}, diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 3c2ea4b36..5997caab6 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -103,7 +103,7 @@ main (int argc, char* argv[]) string film_dir; string server_host; - while (1) { + while (true) { static struct option long_options[] = { { "help", no_argument, 0, 'h'}, { "server", required_argument, 0, 's'}, |