From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 1 Sep 2010 00:37:02 +0000
Subject: * Massive set of changes to bring in all fixes and enhancements from
 the Enterprise PIM branch * Ensured that the Trinity changes were applied on
 top of those enhancements, and any redundancy removed * Added journal read
 support to the CalDAV resource * Fixed CalDAV resource to use events URL for
 tasks and journals when separate URL checkbox unchecked

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 mimelib/dwstring.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mimelib/dwstring.cpp')

diff --git a/mimelib/dwstring.cpp b/mimelib/dwstring.cpp
index cd3c7b1a..749f7c8e 100644
--- a/mimelib/dwstring.cpp
+++ b/mimelib/dwstring.cpp
@@ -399,7 +399,7 @@ DwString::DwString(const char* aCstr)
     mStart = 0;
     mLength = 0;
     if ( aCstr ) {
-        size_t len = (aCstr) ? strlen(aCstr) : 0;
+        size_t len = strlen(aCstr);
         _replace(0, mLength, aCstr, len);
     }
 }
-- 
cgit v1.2.3