4 files changed, 11 insertions, 11 deletions

diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index d59bca6..4a3223c 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -162,7 +162,7 @@ public:
       Retrieves an event on the basis of the unique string ID.
     */
     virtual Event *event( const QString &UniqueStr ) = 0;
-    virtual Event *event( QString, int ) = 0;
+    virtual Event *event( QString, QString ) = 0;
     /**
       Builds and then returns a list of all events that match for the
       date specified. useful for dayView, etc. etc.
@@ -211,7 +211,7 @@ public:
       returns a pointer or null.
     */
     virtual Todo *todo( const QString &uid ) = 0;
-    virtual Todo *todo( QString, int ) = 0;
+    virtual Todo *todo( QString, QString ) = 0;
     /**
       Returns list of todos due on the specified date.
     */
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index e464a77..21b4aaf 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -212,7 +212,7 @@ QPtrList<Todo> CalendarLocal::rawTodos()
 {
   return mTodoList;
 }
-Todo *CalendarLocal::todo( QString syncProf, int id )
+Todo *CalendarLocal::todo( QString syncProf, QString id )
 {
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
@@ -235,7 +235,7 @@ QPtrList<Event> CalendarLocal::getExternLastSyncEvents()
     return el;
 
 }
-Event *CalendarLocal::event( QString syncProf, int id )
+Event *CalendarLocal::event( QString syncProf,  QString id )
 {
   Event *todo;
   for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index 4728063..5b6c64c 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -175,8 +175,8 @@ class CalendarLocal : public Calendar
     */
     QPtrList<Event> rawEvents( const QDate &start, const QDate &end,
                                bool inclusive = false );
-    Todo *todo( QString, int uid );
-    Event *event( QString,int uid );
+    Todo *todo( QString, QString );
+    Event *event( QString, QString );
  
 
 
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index e8934bf..ebfe164 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -85,7 +85,7 @@ class SharpParser : public QObject
         
         if ( qName == "Event" ) {
             Event *event;
-            event = existingCalendar->event( "Sharp_DTM",attList[0].toInt() );
+            event = existingCalendar->event( "Sharp_DTM",attList[0] );
             if ( event )
                 event = (Event*)event->clone();
             else
@@ -98,8 +98,8 @@ class SharpParser : public QObject
             event->setLocation( attList[3] );
             event->setDescription( attList[4]  );
             if ( attList[7] == "1" ) {
-                event->setDtStart( QDateTime(fromString( attList[17]+"000000", false ).date(),QTime(0,0,0 ) ));
-                event->setDtEnd( QDateTime(fromString( attList[18]+"000000", false ).date(),QTime(0,0,0 )));
+                event->setDtStart( QDateTime(fromString( attList[17]+"T000000", false ).date(),QTime(0,0,0 ) ));
+                event->setDtEnd( QDateTime(fromString( attList[18]+"T000000", false ).date(),QTime(0,0,0 )));
                 event->setFloats( true );
             } else {
                 event->setFloats( false );
@@ -189,7 +189,7 @@ class SharpParser : public QObject
         } else if ( qName == "Todo" ) {
             Todo *todo;
 
-            todo = existingCalendar->todo( "Sharp_DTM", attList[0].toInt() );
+            todo = existingCalendar->todo( "Sharp_DTM", attList[0] );
             if (todo )
                 todo = (Todo*)todo->clone();
             else
@@ -358,7 +358,7 @@ ulong SharpFormat::getCsum( const QStringList &  attList)
 
 }
 #include <stdlib.h>
-#define DEBUGMODE false
+#define DEBUGMODE true
 bool SharpFormat::load( Calendar *calendar, Calendar *existngCal )
 {