Branch 'libkolabxml-0.8' - src/containers tests/bindingstest.cpp

[Christian Mollekopf]

 src/containers/kolabcontact.cpp |    2 +-
 src/containers/kolabcontact.h   |    6 +++---
 tests/bindingstest.cpp          |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0573b721e3cc79e326b93b29d307bf94722ebcc8
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Apr 15 16:41:11 2013 +0200

    None is a python keyword.

diff --git a/src/containers/kolabcontact.cpp b/src/containers/kolabcontact.cpp
index 01acace..dc26a41 100644
--- a/src/containers/kolabcontact.cpp
+++ b/src/containers/kolabcontact.cpp
@@ -422,7 +422,7 @@ void Contact::setEmailAddresses(const std::vector< std::string >& email, int pre
 {
     d->emailAddresses.clear();
     BOOST_FOREACH(const std::string adr, email) {
-        d->emailAddresses.push_back(Email(adr, Email::None));
+        d->emailAddresses.push_back(Email(adr, Email::NoType));
     }
     d->emailAddressPreferredIndex = preferredIndex;
 }
diff --git a/src/containers/kolabcontact.h b/src/containers/kolabcontact.h
index 7430919..1ec8ce3 100644
--- a/src/containers/kolabcontact.h
+++ b/src/containers/kolabcontact.h
@@ -198,12 +198,12 @@ private:
 
 struct Email {
     enum Type {
-        None = 0,
+        NoType = 0,
         Work = 0x01,
         Home = 0x02
     };
-    Email(): mType(None){};
-    Email(const std::string &a, int t = None): mAddress(a), mType(t) {};
+    Email(): mType(NoType){};
+    Email(const std::string &a, int t = NoType): mAddress(a), mType(t) {};
     bool operator==(const Email &other) const { return mAddress == other.mAddress &&
                                                     mType == other.mType; };
     void setTypes(int t) { mType = t; };
diff --git a/tests/bindingstest.cpp b/tests/bindingstest.cpp
index c48929c..f975603 100644
--- a/tests/bindingstest.cpp
+++ b/tests/bindingstest.cpp
@@ -567,7 +567,7 @@ void BindingsTest::contactCompletness()
     c.setLanguages(stringlist);
     c.setIMaddresses(stringlist,1);
     std::vector <Kolab::Email> emails;
-    emails.push_back(Kolab::Email("email1 at example.org", Kolab::Email::None));
+    emails.push_back(Kolab::Email("email1 at example.org", Kolab::Email::NoType));
     emails.push_back(Kolab::Email("email2 at example.org", Kolab::Email::Work));
     emails.push_back(Kolab::Email("email3 at example.org", Kolab::Email::Work|Kolab::Email::Home));
     c.setEmailAddressesWithType(emails,1);