Renamed TYPE_BOOL to avoid name collision on MacOS.

6 files changed, 22 insertions, 22 deletions

diff --git a/examples/example7.cpp b/examples/example7.cpp
index adb14df7..2d6e59f2 100644
--- a/examples/example7.cpp
+++ b/examples/example7.cpp
@@ -91,7 +91,7 @@ int main()
 			{
 			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_BOOL: type = "TYPE_BOOL"; break;
+			case vmime::net::serviceInfos::property::TYPE_BOOLEAN: type = "TYPE_BOOLEAN"; break;
 			default: type = "(unknown)"; break;
 			}
 
diff --git a/src/net/imap/IMAPServiceInfos.cpp b/src/net/imap/IMAPServiceInfos.cpp
index 68c3c8aa..46dbc2e1 100644
--- a/src/net/imap/IMAPServiceInfos.cpp
+++ b/src/net/imap/IMAPServiceInfos.cpp
@@ -56,8 +56,8 @@ const IMAPServiceInfos::props& IMAPServiceInfos::getProperties() const
 	{
 		// IMAP-specific options
 #if VMIME_HAVE_SASL_SUPPORT
-		property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"),
-		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "true"),
+		property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
+		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
 #endif // VMIME_HAVE_SASL_SUPPORT
 
 		// Common properties
@@ -77,8 +77,8 @@ const IMAPServiceInfos::props& IMAPServiceInfos::getProperties() const
 	{
 		// IMAP-specific options
 #if VMIME_HAVE_SASL_SUPPORT
-		property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"),
-		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "true"),
+		property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
+		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
 #endif // VMIME_HAVE_SASL_SUPPORT
 
 		// Common properties
diff --git a/src/net/pop3/POP3ServiceInfos.cpp b/src/net/pop3/POP3ServiceInfos.cpp
index 1eb618b5..4760d4f2 100644
--- a/src/net/pop3/POP3ServiceInfos.cpp
+++ b/src/net/pop3/POP3ServiceInfos.cpp
@@ -55,11 +55,11 @@ const POP3ServiceInfos::props& POP3ServiceInfos::getProperties() const
 	static props pop3Props =
 	{
 		// POP3-specific options
-		property("options.apop", serviceInfos::property::TYPE_BOOL, "true"),
-		property("options.apop.fallback", serviceInfos::property::TYPE_BOOL, "true"),
+		property("options.apop", serviceInfos::property::TYPE_BOOLEAN, "true"),
+		property("options.apop.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
 #if VMIME_HAVE_SASL_SUPPORT
-		property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"),
-		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "true"),
+		property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
+		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
 #endif // VMIME_HAVE_SASL_SUPPORT
 
 		// Common properties
@@ -78,11 +78,11 @@ const POP3ServiceInfos::props& POP3ServiceInfos::getProperties() const
 	static props pop3sProps =
 	{
 		// POP3-specific options
-		property("options.apop", serviceInfos::property::TYPE_BOOL, "true"),
-		property("options.apop.fallback", serviceInfos::property::TYPE_BOOL, "true"),
+		property("options.apop", serviceInfos::property::TYPE_BOOLEAN, "true"),
+		property("options.apop.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
 #if VMIME_HAVE_SASL_SUPPORT
-		property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"),
-		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "true"),
+		property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
+		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "true"),
 #endif // VMIME_HAVE_SASL_SUPPORT
 
 		// Common properties
diff --git a/src/net/serviceInfos.cpp b/src/net/serviceInfos.cpp
index 85b55a9d..751bae3f 100644
--- a/src/net/serviceInfos.cpp
+++ b/src/net/serviceInfos.cpp
@@ -53,10 +53,10 @@ const serviceInfos::property serviceInfos::property::AUTH_PASSWORD
 #if VMIME_HAVE_TLS_SUPPORT
 
 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
-	("connection.tls.required", serviceInfos::property::TYPE_BOOL, "false");
+	("connection.tls.required", serviceInfos::property::TYPE_BOOLEAN, "false");
 
 #endif // VMIME_HAVE_TLS_SUPPORT
 
diff --git a/src/net/smtp/SMTPServiceInfos.cpp b/src/net/smtp/SMTPServiceInfos.cpp
index 60022b80..2927495f 100644
--- a/src/net/smtp/SMTPServiceInfos.cpp
+++ b/src/net/smtp/SMTPServiceInfos.cpp
@@ -55,10 +55,10 @@ const SMTPServiceInfos::props& SMTPServiceInfos::getProperties() const
 	static props smtpProps =
 	{
 		// 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
-		property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"),
-		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "false"),
+		property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
+		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "false"),
 #endif // VMIME_HAVE_SASL_SUPPORT
 
 		// Common properties
@@ -77,10 +77,10 @@ const SMTPServiceInfos::props& SMTPServiceInfos::getProperties() const
 	static props smtpsProps =
 	{
 		// 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
-		property("options.sasl", serviceInfos::property::TYPE_BOOL, "true"),
-		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOL, "false"),
+		property("options.sasl", serviceInfos::property::TYPE_BOOLEAN, "true"),
+		property("options.sasl.fallback", serviceInfos::property::TYPE_BOOLEAN, "false"),
 #endif // VMIME_HAVE_SASL_SUPPORT
 
 		// Common properties
diff --git a/vmime/net/serviceInfos.hpp b/vmime/net/serviceInfos.hpp
index aefb8f94..58fb8eab 100644
--- a/vmime/net/serviceInfos.hpp
+++ b/vmime/net/serviceInfos.hpp
@@ -114,7 +114,7 @@ public:
 		{
 			TYPE_INTEGER,   /*< Integer number. */
 			TYPE_STRING,    /*< Character string. */
-			TYPE_BOOL,      /*< Boolean (true or false). */
+			TYPE_BOOLEAN,   /*< Boolean (true or false). */
 
 			TYPE_DEFAULT = TYPE_STRING
 		};