More enum class additions.

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 7040c5127e1d071fd5e3c0e4cc6d0a5c37e08aa4..c0750bb4eeb3d35d61db716135444c90be85fb20 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -88,7 +88,7 @@ Config::set_defaults ()
        _use_any_servers = true;
        _servers.clear ();
        _only_servers_encode = false;
-       _tms_protocol = FILE_TRANSFER_PROTOCOL_SCP;
+       _tms_protocol = FileTransferProtocol::SCP;
        _tms_ip = "";
        _tms_path = ".";
        _tms_user = "";
@@ -107,7 +107,7 @@ Config::set_defaults ()
        _upload_after_make_dcp = false;
        _mail_server = "";
        _mail_port = 25;
-       _mail_protocol = EMAIL_PROTOCOL_AUTO;
+       _mail_protocol = EmailProtocol::AUTO;
        _mail_user = "";
        _mail_password = "";
        _kdm_from = "";
@@ -269,7 +269,7 @@ try
        }
 
        _only_servers_encode = f.optional_bool_child ("OnlyServersEncode").get_value_or (false);
-       _tms_protocol = static_cast<FileTransferProtocol>(f.optional_number_child<int>("TMSProtocol").get_value_or(static_cast<int>(FILE_TRANSFER_PROTOCOL_SCP)));
+       _tms_protocol = static_cast<FileTransferProtocol>(f.optional_number_child<int>("TMSProtocol").get_value_or(static_cast<int>(FileTransferProtocol::SCP)));
        _tms_ip = f.string_child ("TMSIP");
        _tms_path = f.string_child ("TMSPath");
        _tms_user = f.string_child ("TMSUser");
@@ -331,13 +331,13 @@ try
                /* Make sure this matches the code in write_config */
                string const protocol = f.optional_string_child("MailProtocol").get_value_or("Auto");
                if (protocol == "Auto") {
-                       _mail_protocol = EMAIL_PROTOCOL_AUTO;
+                       _mail_protocol = EmailProtocol::AUTO;
                } else if (protocol == "Plain") {
-                       _mail_protocol = EMAIL_PROTOCOL_PLAIN;
+                       _mail_protocol = EmailProtocol::PLAIN;
                } else if (protocol == "STARTTLS") {
-                       _mail_protocol = EMAIL_PROTOCOL_STARTTLS;
+                       _mail_protocol = EmailProtocol::STARTTLS;
                } else if (protocol == "SSL") {
-                       _mail_protocol = EMAIL_PROTOCOL_SSL;
+                       _mail_protocol = EmailProtocol::SSL;
                }
        }
 
@@ -701,16 +701,16 @@ Config::write_config () const
        root->add_child("MailPort")->add_child_text (raw_convert<string> (_mail_port));
        /* [XML] MailProtocol Protocol to use on SMTP server (Auto, Plain, STARTTLS or SSL) */
        switch (_mail_protocol) {
-       case EMAIL_PROTOCOL_AUTO:
+       case EmailProtocol::AUTO:
                root->add_child("MailProtocol")->add_child_text("Auto");
                break;
-       case EMAIL_PROTOCOL_PLAIN:
+       case EmailProtocol::PLAIN:
                root->add_child("MailProtocol")->add_child_text("Plain");
                break;
-       case EMAIL_PROTOCOL_STARTTLS:
+       case EmailProtocol::STARTTLS:
                root->add_child("MailProtocol")->add_child_text("STARTTLS");
                break;
-       case EMAIL_PROTOCOL_SSL:
+       case EmailProtocol::SSL:
                root->add_child("MailProtocol")->add_child_text("SSL");
                break;
        }