src/kolabcontact.h

Christian Mollekopf mollekopf at kolabsys.com
Wed May 23 16:35:23 CEST 2012


 src/kolabcontact.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 669363ff40f02de493b549ba52032e6606ed1495
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Wed May 23 16:35:19 2012 +0200

    Avoid Python keyword None.

diff --git a/src/kolabcontact.h b/src/kolabcontact.h
index 6f8eba9..86306ba 100644
--- a/src/kolabcontact.h
+++ b/src/kolabcontact.h
@@ -240,11 +240,11 @@ struct Geo {
 
 struct Url {
     enum UrlTypes {
-        None = 0,
+        NoType = 0,
         Blog
     };
-    Url(): mType(None) {};
-    Url(const std::string &u, int t = None): mUrl(u), mType(t) {};
+    Url(): mType(NoType) {};
+    Url(const std::string &u, int t = NoType): mUrl(u), mType(t) {};
     
     bool operator==(const Url &other) const{ return (mType == other.mType && mUrl == other.mUrl);};
     





More information about the commits mailing list