src/containers tests/bindingstest.cpp

[Christian Mollekopf]

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

New commits:
commit 88865bd47b695bd20e8a3bfb9c47c0a69e9e14d0
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Apr 15 16:43:25 2013 +0200

    None is a python keyword.
    (cherry picked from commit 0573b721e3cc79e326b93b29d307bf94722ebcc8)
    
    Conflicts:
    	src/containers/kolabcontact.cpp

diff --git a/src/containers/kolabcontact.h b/src/containers/kolabcontact.h
index c790b1e..58ded59 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 ebee799..04a748c 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.setEmailAddresses(emails,1);