summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-07 14:52:25 (UTC)
committer zautrix <zautrix>2004-08-07 14:52:25 (UTC)
commit31764784e8753157a936e42e21dcdc41bd8e2eb7 (patch) (side-by-side diff)
treeddfe5653aadd0277d1181dc459ff73c50256be13
parent5f86d160a6d4406bdef53c8fe244baed0518142d (diff)
downloadkdepimpi-31764784e8753157a936e42e21dcdc41bd8e2eb7.zip
kdepimpi-31764784e8753157a936e42e21dcdc41bd8e2eb7.tar.gz
kdepimpi-31764784e8753157a936e42e21dcdc41bd8e2eb7.tar.bz2
Sync fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkcal/calendar.h4
-rw-r--r--libkcal/calendarlocal.cpp4
-rw-r--r--libkcal/calendarlocal.h4
-rw-r--r--libkcal/sharpformat.cpp10
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
@@ -163,5 +163,5 @@ public:
*/
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
@@ -212,5 +212,5 @@ public:
*/
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
@@ -213,5 +213,5 @@ QPtrList<Todo> CalendarLocal::rawTodos()
return mTodoList;
}
-Todo *CalendarLocal::todo( QString syncProf, int id )
+Todo *CalendarLocal::todo( QString syncProf, QString id )
{
Todo *todo;
@@ -236,5 +236,5 @@ QPtrList<Event> CalendarLocal::getExternLastSyncEvents()
}
-Event *CalendarLocal::event( QString syncProf, int id )
+Event *CalendarLocal::event( QString syncProf, QString id )
{
Event *todo;
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index 4728063..5b6c64c 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -176,6 +176,6 @@ 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
@@ -86,5 +86,5 @@ 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();
@@ -99,6 +99,6 @@ class SharpParser : public QObject
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 {
@@ -190,5 +190,5 @@ class SharpParser : public QObject
Todo *todo;
- todo = existingCalendar->todo( "Sharp_DTM", attList[0].toInt() );
+ todo = existingCalendar->todo( "Sharp_DTM", attList[0] );
if (todo )
todo = (Todo*)todo->clone();
@@ -359,5 +359,5 @@ ulong SharpFormat::getCsum( const QStringList & attList)
}
#include <stdlib.h>
-#define DEBUGMODE false
+#define DEBUGMODE true
bool SharpFormat::load( Calendar *calendar, Calendar *existngCal )
{