* 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

1 files changed, 49 insertions, 0 deletions

diff --git a/kmail/stringutil.cpp b/kmail/stringutil.cpp
new file mode 100644
index 00000000..907c5e1f
--- /dev/null
+++ b/kmail/stringutil.cpp
@@ -0,0 +1,49 @@
+/* Copyright 2009 Thomas McGuire <mcguire@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License or (at your option) version 3 or any later version
+   accepted by the membership of KDE e.V. (or its successor approved
+   by the membership of KDE e.V.), which shall act as a proxy
+   defined in Section 14 of version 3 of the license.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "stringutil.h"
+#include "kmmsgbase.h"
+#include <kurl.h>
+
+namespace KMail
+{
+
+namespace StringUtil
+{
+#ifndef KMAIL_UNITTESTS
+TQString encodeMailtoUrl( const TQString& str )
+{
+  TQString result;
+  result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str,
+                                "utf-8" ) );
+  result = KURL::encode_string( result );
+  return result;
+}
+
+TQString decodeMailtoUrl( const TQString& url )
+{
+  TQString result;
+  result = KURL::decode_string( url.latin1() );
+  result = KMMsgBase::decodeRFC2047String( result.latin1() );
+  return result;
+}
+#endif
+
+}
+
+}