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

diff --git a/korganizer/kohelper.cpp b/korganizer/kohelper.cpp
index 827279fe4..3b7bd8776 100644
--- a/korganizer/kohelper.cpp
+++ b/korganizer/kohelper.cpp
@@ -62,23 +62,3 @@ TQColor KOHelper::resourceColor( KCal::Calendar*calendar, KCal::Incidence*incide
   }
   return resourceColor;
 }
-
-TQString KOHelper::resourceLabel(KCal::Calendar * calendar, KCal::Incidence * incidence)
-{
-  KCal::CalendarResources *calendarResource = dynamic_cast<KCal::CalendarResources*>( calendar );
-  if ( !calendarResource || ! incidence )
-    return TQString();
-
-  KCal::ResourceCalendar *resourceCalendar = calendarResource->resource( incidence );
-  if( resourceCalendar ) {
-    if ( !resourceCalendar->subresources().isEmpty() ) {
-      TQString subRes = resourceCalendar->subresourceIdentifier( incidence );
-      if ( subRes.isEmpty() )
-        return resourceCalendar->resourceName();
-      return resourceCalendar->labelForSubresource( subRes );
-    }
-    return resourceCalendar->resourceName();
-  }
-
-  return TQString();
-}