* 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, 6 insertions, 6 deletions

diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp
index 3ca61845..c35c8807 100644
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@@ -81,12 +81,12 @@ int FolderTreeBase::dndMode(bool alwaysAsk)
     action = DRAG_MOVE;
   } else {
     if ( GlobalSettings::self()->showPopupAfterDnD() || alwaysAsk ) {
-      KPopupMenu *menu = new KPopupMenu( this );
-      menu->insertItem( i18n("&Move Here"), DRAG_MOVE, 0 );
-      menu->insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), DRAG_COPY, 1 );
-      menu->insertSeparator();
-      menu->insertItem( SmallIcon("cancel"), i18n("C&ancel"), DRAG_CANCEL, 3 );
-      action = menu->exec( TQCursor::pos(), 0 );
+      KPopupMenu menu;
+      menu.insertItem( i18n("&Move Here"), DRAG_MOVE, 0 );
+      menu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), DRAG_COPY, 1 );
+      menu.insertSeparator();
+      menu.insertItem( SmallIcon("cancel"), i18n("C&ancel"), DRAG_CANCEL, 3 );
+      action = menu.exec( TQCursor::pos(), 0 );
     }
     else
       action = DRAG_MOVE;