GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed TYPE_BOOL to avoid name collision on MacOS.

Browse Source
This commit is contained in:
Vincent Richard 2013-01-15 13:21:10 +01:00
parent b74955cee5
commit ea06bc1de1
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example7.cpp
View File

@ -91,7 +91,7 @@ int main()
{ {
case vmime::net::serviceInfos::property::TYPE_INTEGER: type = "TYPE_INTEGER"; break; case vmime::net::serviceInfos::property::TYPE_INTEGER: type = "TYPE_INTEGER"; break;
case vmime::net::serviceInfos::property::TYPE_STRING: type = "TYPE_STRING"; break; case vmime::net::serviceInfos::property::TYPE_STRING: type = "TYPE_STRING"; break;
case vmime::net::serviceInfos::property::TYPE_BOOL: type = "TYPE_BOOL"; break; case vmime::net::serviceInfos::property::TYPE_BOOLEAN: type = "TYPE_BOOLEAN"; break;
default: type = "(unknown)"; break; default: type = "(unknown)"; break;
} }

8
src/net/imap/IMAPServiceInfos.cpp
View File

@ -56,8 +56,8 @@ const IMAPServiceInfos::props& IMAPServiceInfos::getProperties() const
{ {
// IMAP-specific options // IMAP-specific options
#if VMIME_HAVE_SASL_SUPPORT #if VMIME_HAVE_SASL_SUPPORT
property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"), property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "true"), property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
#endif // VMIME_HAVE_SASL_SUPPORT #endif // VMIME_HAVE_SASL_SUPPORT
// Common properties // Common properties
@ -77,8 +77,8 @@ const IMAPServiceInfos::props& IMAPServiceInfos::getProperties() const
{ {
// IMAP-specific options // IMAP-specific options
#if VMIME_HAVE_SASL_SUPPORT #if VMIME_HAVE_SASL_SUPPORT
property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"), property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "true"), property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
#endif // VMIME_HAVE_SASL_SUPPORT #endif // VMIME_HAVE_SASL_SUPPORT
// Common properties // Common properties

16
src/net/pop3/POP3ServiceInfos.cpp
View File

@ -55,11 +55,11 @@ const POP3ServiceInfos::props& POP3ServiceInfos::getProperties() const
static props pop3Props = static props pop3Props =
{ {
// POP3-specific options // POP3-specific options
property("options.apop", serviceInfos::property::TYPE_BOOL, "true"), property("options.apop", serviceInfos::property::TYPE_BOOLEAN, "true"),
property("options.apop.fallback", serviceInfos::property::TYPE_BOOL, "true"), property("options.apop.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
#if VMIME_HAVE_SASL_SUPPORT #if VMIME_HAVE_SASL_SUPPORT
property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"), property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "true"), property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
#endif // VMIME_HAVE_SASL_SUPPORT #endif // VMIME_HAVE_SASL_SUPPORT
// Common properties // Common properties
@ -78,11 +78,11 @@ const POP3ServiceInfos::props& POP3ServiceInfos::getProperties() const
static props pop3sProps = static props pop3sProps =
{ {
// POP3-specific options // POP3-specific options
property("options.apop", serviceInfos::property::TYPE_BOOL, "true"), property("options.apop", serviceInfos::property::TYPE_BOOLEAN, "true"),
property("options.apop.fallback", serviceInfos::property::TYPE_BOOL, "true"), property("options.apop.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
#if VMIME_HAVE_SASL_SUPPORT #if VMIME_HAVE_SASL_SUPPORT
property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"), property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "true"), property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
#endif // VMIME_HAVE_SASL_SUPPORT #endif // VMIME_HAVE_SASL_SUPPORT
// Common properties // Common properties

4
src/net/serviceInfos.cpp
View File

@ -53,10 +53,10 @@ const serviceInfos::property serviceInfos::property::AUTH_PASSWORD
#if VMIME_HAVE_TLS_SUPPORT #if VMIME_HAVE_TLS_SUPPORT
const serviceInfos::property serviceInfos::property::CONNECTION_TLS const serviceInfos::property serviceInfos::property::CONNECTION_TLS
("connection.tls", serviceInfos::property::TYPE_BOOL, "false"); ("connection.tls", serviceInfos::property::TYPE_BOOLEAN, "false");
const serviceInfos::property serviceInfos::property::CONNECTION_TLS_REQUIRED const serviceInfos::property serviceInfos::property::CONNECTION_TLS_REQUIRED
("connection.tls.required", serviceInfos::property::TYPE_BOOL, "false"); ("connection.tls.required", serviceInfos::property::TYPE_BOOLEAN, "false");
#endif // VMIME_HAVE_TLS_SUPPORT #endif // VMIME_HAVE_TLS_SUPPORT

12
src/net/smtp/SMTPServiceInfos.cpp
View File

@ -55,10 +55,10 @@ const SMTPServiceInfos::props& SMTPServiceInfos::getProperties() const
static props smtpProps = static props smtpProps =
{ {
// SMTP-specific options // SMTP-specific options
property("options.need-authentication", serviceInfos::property::TYPE_BOOL, "false"), property("options.need-authentication", serviceInfos::property::TYPE_BOOLEAN, "false"),
#if VMIME_HAVE_SASL_SUPPORT #if VMIME_HAVE_SASL_SUPPORT
property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"), property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "false"), property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "false"),
#endif // VMIME_HAVE_SASL_SUPPORT #endif // VMIME_HAVE_SASL_SUPPORT
// Common properties // Common properties
@ -77,10 +77,10 @@ const SMTPServiceInfos::props& SMTPServiceInfos::getProperties() const
static props smtpsProps = static props smtpsProps =
{ {
// SMTP-specific options // SMTP-specific options
property("options.need-authentication", serviceInfos::property::TYPE_BOOL, "false"), property("options.need-authentication", serviceInfos::property::TYPE_BOOLEAN, "false"),
#if VMIME_HAVE_SASL_SUPPORT #if VMIME_HAVE_SASL_SUPPORT
property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"), property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "false"), property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "false"),
#endif // VMIME_HAVE_SASL_SUPPORT #endif // VMIME_HAVE_SASL_SUPPORT
// Common properties // Common properties

2
vmime/net/serviceInfos.hpp
View File

@ -114,7 +114,7 @@ public:
{ {
TYPE_INTEGER, /*< Integer number. */ TYPE_INTEGER, /*< Integer number. */
TYPE_STRING, /*< Character string. */ TYPE_STRING, /*< Character string. */
TYPE_BOOL, /*< Boolean (true or false). */ TYPE_BOOLEAN, /*< Boolean (true or false). */
TYPE_DEFAULT = TYPE_STRING TYPE_DEFAULT = TYPE_STRING
}; };