Hello community,
here is the log from the commit of package kdepimlibs4
checked in at Wed Nov 21 18:27:27 CET 2007.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2007-11-01 11:41:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2007-11-14 17:37:15.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Nov 14 17:37:15 CET 2007 - dmueller@suse.de
+
+- update to 3.96.0
+
+-------------------------------------------------------------------
+Tue Nov 6 11:20:50 CET 2007 - dmueller@suse.de
+
+- update to 3.95.2
+
+-------------------------------------------------------------------
Old:
----
kdepimlibs-3.95.1.tar.bz2
New:
----
kdepimlibs-3.96.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.B26595/_old 2007-11-21 18:27:18.000000000 +0100
+++ /var/tmp/diff_new_pack.B26595/_new 2007-11-21 18:27:18.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 3.95.1)
+# spec file for package kdepimlibs4 (Version 3.96.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,9 +15,9 @@
Group: System/GUI/KDE
Summary: KDE PIM Libraries
Url: http://www.kde.org
-Version: 3.95.1
+Version: 3.96.0
Release: 1
-%define rversion 3.95.1
+%define rversion 3.96.0
Source0: kdepimlibs-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -152,6 +152,10 @@
%_kde_share_dir/config.kcfg/pimemoticons.kcfg
%_kde_share_dir/config.kcfg/mailtransport.kcfg
%changelog
+* Wed Nov 14 2007 - dmueller@suse.de
+- update to 3.96.0
+* Tue Nov 06 2007 - dmueller@suse.de
+- update to 3.95.2
* Thu Nov 01 2007 - dmueller@suse.de
- update to 3.95.1
* Tue Oct 30 2007 - dmueller@suse.de
++++++ kdepimlibs-3.95.1.tar.bz2 -> kdepimlibs-3.96.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kabc/formats/binary.desktop new/kdepimlibs-3.96.0/kabc/formats/binary.desktop
--- old/kdepimlibs-3.95.1/kabc/formats/binary.desktop 2007-10-24 14:17:26.000000000 +0200
+++ new/kdepimlibs-3.96.0/kabc/formats/binary.desktop 2007-11-14 01:24:49.000000000 +0100
@@ -16,6 +16,7 @@
Name[oc]=Binari
Name[pa]=ਬਾਈਨਰੀ
Name[pt]=Binário
+Name[sl]=Dvojiško
Name[sv]=Binär
Name[uk]=Двійковий
Name[x-test]=xxBinaryxx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kabc/kabc_manager.desktop new/kdepimlibs-3.96.0/kabc/kabc_manager.desktop
--- old/kdepimlibs-3.95.1/kabc/kabc_manager.desktop 2007-10-24 14:17:26.000000000 +0200
+++ new/kdepimlibs-3.96.0/kabc/kabc_manager.desktop 2007-11-14 01:24:49.000000000 +0100
@@ -17,6 +17,7 @@
Name[oc]=Contactes
Name[pa]=ਸੰਪਰਕ
Name[pt]=Contactos
+Name[sl]=Stiki
Name[sv]=Kontakter
Name[uk]=Контакти
Name[x-test]=xxContactsxx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kabc/plugins/dir/dir.desktop new/kdepimlibs-3.96.0/kabc/plugins/dir/dir.desktop
--- old/kdepimlibs-3.95.1/kabc/plugins/dir/dir.desktop 2007-10-24 14:17:26.000000000 +0200
+++ new/kdepimlibs-3.96.0/kabc/plugins/dir/dir.desktop 2007-11-14 01:24:49.000000000 +0100
@@ -16,6 +16,7 @@
Name[oc]=Repertòri
Name[pa]=ਡਾਇਰੈਕਟਰੀ
Name[pt]=Pasta
+Name[sl]=Imenik
Name[sv]=Katalog
Name[uk]=Каталог
Name[x-test]=xxDirectoryxx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kabc/plugins/file/file.desktop new/kdepimlibs-3.96.0/kabc/plugins/file/file.desktop
--- old/kdepimlibs-3.95.1/kabc/plugins/file/file.desktop 2007-10-24 14:17:26.000000000 +0200
+++ new/kdepimlibs-3.96.0/kabc/plugins/file/file.desktop 2007-11-14 01:24:49.000000000 +0100
@@ -16,6 +16,7 @@
Name[oc]=Fichièr
Name[pa]=ਫਾਇਲ
Name[pt]=Ficheiro
+Name[sl]=Datoteka
Name[sv]=Fil
Name[uk]=Файл
Name[x-test]=xxFilexx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kabc/plugins/net/net.desktop new/kdepimlibs-3.96.0/kabc/plugins/net/net.desktop
--- old/kdepimlibs-3.95.1/kabc/plugins/net/net.desktop 2007-10-24 14:17:26.000000000 +0200
+++ new/kdepimlibs-3.96.0/kabc/plugins/net/net.desktop 2007-11-14 01:24:49.000000000 +0100
@@ -16,6 +16,7 @@
Name[oc]=Ret
Name[pa]=ਨੈੱਟਵਰ
Name[pt]=Rede
+Name[sl]=Omrežje
Name[sv]=Nätverk
Name[uk]=Мережа
Name[x-test]=xxNetworkxx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/calendarlocal.cpp new/kdepimlibs-3.96.0/kcal/calendarlocal.cpp
--- old/kdepimlibs-3.95.1/kcal/calendarlocal.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/calendarlocal.cpp 2007-11-14 01:24:48.000000000 +0100
@@ -39,7 +39,9 @@
#include "todo.h"
#include "journal.h"
#include "filestorage.h"
+#include
#include
+#include
#include
#include
@@ -61,13 +63,16 @@
{
mDeletedIncidences.setAutoDelete( true );
}
- QString mFileName; // filename where the calendar is stored
- CalFormat *mFormat; // calendar format
+ QString mFileName; // filename where calendar is stored
+ CalFormat *mFormat; // calendar format
- QHash mEvents; // hash on uids of all calendar events
- QHash mTodos; // hash on uids of all calendar to-dos
- QHash mJournals;// hash on uids of all calendar journals
- Incidence::List mDeletedIncidences; // list of all deleted incidences
+ QHash mEvents; // hash on uids of all Events
+ QMultiHash mEventsForDate; // on start dates of all non-recurring Events
+ QHash mTodos; // hash on uids of all To-dos
+ QMultiHashmTodosForDate;// on due dates for all Todos
+ QHash mJournals; // hash on uids of all Journals
+ QMultiHashmJournalsForDate; // on dates of all Journals
+ Incidence::List mDeletedIncidences; // list of all deleted Incidences
void insertEvent( Event *event );
void insertTodo( Todo *todo );
@@ -166,10 +171,14 @@
bool CalendarLocal::deleteEvent( Event *event )
{
- if ( d->mEvents.remove( event->uid() ) ) {
+ QString uid = event->uid();
+ if ( d->mEvents.remove( uid ) ) {
setModified( true );
notifyIncidenceDeleted( event );
d->mDeletedIncidences.append( event );
+ if ( !event->recurs() ) {
+ d->mEventsForDate.remove( event->dtStart().date().toString(), event );
+ }
return true;
} else {
kWarning() << "CalendarLocal::deleteEvent(): Event not found.";
@@ -179,11 +188,14 @@
void CalendarLocal::deleteAllEvents()
{
- foreach ( Event *e, d->mEvents ) {
- notifyIncidenceDeleted( e );
+ QHashIteratori( d->mEvents );
+ while ( i.hasNext() ) {
+ i.next();
+ notifyIncidenceDeleted( i.value() );
}
qDeleteAll( d->mEvents );
d->mEvents.clear();
+ d->mEventsForDate.clear();
}
Event *CalendarLocal::event( const QString &uid )
@@ -213,6 +225,10 @@
QString uid = todo->uid();
if ( mTodos.value( uid ) == 0 ) {
mTodos.insert( uid, todo );
+ if ( todo->hasDueDate() ) {
+ mTodosForDate.insert( todo->dtDue().date().toString(), todo );
+ }
+
} else {
#ifndef NDEBUG
// if we already have an to-do with this UID, it must be the same to-do,
@@ -232,6 +248,9 @@
setModified( true );
notifyIncidenceDeleted( todo );
d->mDeletedIncidences.append( todo );
+ if ( todo->hasDueDate() ) {
+ d->mTodosForDate.remove( todo->dtDue().date().toString(), todo );
+ }
return true;
} else {
kWarning() << "CalendarLocal::deleteTodo(): Todo not found.";
@@ -241,11 +260,14 @@
void CalendarLocal::deleteAllTodos()
{
- foreach ( Todo *t, d->mTodos ) {
- notifyIncidenceDeleted( t );
+ QHashIteratori( d->mTodos );
+ while ( i.hasNext() ) {
+ i.next();
+ notifyIncidenceDeleted( i.value() );
}
qDeleteAll( d->mTodos );
d->mTodos.clear();
+ d->mTodosForDate.clear();
}
Todo *CalendarLocal::todo( const QString &uid )
@@ -257,8 +279,10 @@
SortDirection sortDirection )
{
Todo::List todoList;
- foreach ( Todo *t, d->mTodos ) {
- todoList.append( t );
+ QHashIteratori( d->mTodos );
+ while ( i.hasNext() ) {
+ i.next();
+ todoList.append( i.value() );
}
return sortTodos( &todoList, sortField, sortDirection );
}
@@ -266,10 +290,14 @@
Todo::List CalendarLocal::rawTodosForDate( const QDate &date )
{
Todo::List todoList;
- foreach ( Todo *t, d->mTodos ) {
- if ( t->hasDueDate() && t->dtDue().date() == date ) {
- todoList.append( t );
- }
+ Todo *t;
+
+ QString dateStr = date.toString();
+ QMultiHash::iterator it = d->mTodosForDate.find( dateStr );
+ while ( it != d->mTodosForDate.end() && it.key() == dateStr ) {
+ t = it.value();
+ todoList.append( t );
+ ++it;
}
return todoList;
}
@@ -281,22 +309,30 @@
Alarm::List CalendarLocal::alarms( const KDateTime &from, const KDateTime &to )
{
- Alarm::List alarms;
- foreach ( Event *e, d->mEvents ) {
+ Alarm::List alarmList;
+ QHashIteratorie( d->mEvents );
+ Event *e;
+ while ( ie.hasNext() ) {
+ ie.next();
+ e = ie.value();
if ( e->recurs() ) {
- appendRecurringAlarms( alarms, e, from, to );
+ appendRecurringAlarms( alarmList, e, from, to );
} else {
- appendAlarms( alarms, e, from, to );
+ appendAlarms( alarmList, e, from, to );
}
}
- foreach ( Todo *t, d->mTodos ) {
+ QHashIteratorit( d->mTodos );
+ Todo *t;
+ while ( it.hasNext() ) {
+ it.next();
+ t = it.value();
if (! t->isCompleted() ) {
- appendAlarms( alarms, t, from, to );
+ appendAlarms( alarmList, t, from, to );
}
}
- return alarms;
+ return alarmList;
}
//@cond PRIVATE
@@ -305,6 +341,9 @@
QString uid = event->uid();
if ( mEvents.value( uid ) == 0 ) {
mEvents.insert( uid, event );
+ if ( !event->recurs() ) {
+ mEventsForDate.insert( event->dtStart().date().toString(), event );
+ }
} else {
#ifdef NDEBUG
// if we already have an event with this UID, it must be the same event,
@@ -329,42 +368,52 @@
setModified( true );
}
-Event::List CalendarLocal::rawEventsForDate( const QDate &qd,
+Event::List CalendarLocal::rawEventsForDate( const QDate &date,
const KDateTime::Spec ×pec,
EventSortField sortField,
SortDirection sortDirection )
{
Event::List eventList;
- KDateTime::Spec ts = timespec.isValid() ? timespec : timeSpec();
+ Event *ev;
- foreach ( Event *event, d->mEvents ) {
+ // Find the hash for the specified date
+ QString dateStr = date.toString();
+ QMultiHash::iterator it = d->mEventsForDate.find( dateStr );
+ // Iterate over all non-recurring events that start on this date
+ KDateTime::Spec ts = timespec.isValid() ? timespec : timeSpec();
+ KDateTime kdt( date, ts );
+ while ( it != d->mEventsForDate.end() && it.key() == dateStr ) {
+ ev = it.value();
+ KDateTime end( ev->dtEnd().toTimeSpec( ev->dtStart() ) );
+ if ( ev->allDay() ) {
+ end.setDateOnly( true );
+ } else {
+ end = end.addSecs(-1);
+ }
+ if ( end >= kdt ) {
+ eventList.append( ev );
+ }
+ ++it;
+ }
- if ( event->recurs() ) {
- if ( event->isMultiDay() ) {
- int extraDays = event->dtStart().date().daysTo( event->dtEnd().date() );
+ // Iterate over all events. Look for recurring events that occur on this date
+ QHashIteratori( d->mEvents );
+ while ( i.hasNext() ) {
+ i.next();
+ ev = i.value();
+ if ( ev->recurs() ) {
+ if ( ev->isMultiDay() ) {
+ int extraDays = ev->dtStart().date().daysTo( ev->dtEnd().date() );
int i;
for ( i = 0; i <= extraDays; i++ ) {
- if ( event->recursOn( qd.addDays( -i ), ts ) ) {
- eventList.append( event );
+ if ( ev->recursOn( date.addDays( -i ), ts ) ) {
+ eventList.append( ev );
break;
}
}
} else {
- if ( event->recursOn( qd, ts ) ) {
- eventList.append( event );
- }
- }
- } else {
- KDateTime kdt( qd, ts );
- if ( event->dtStart() <= kdt ) {
- KDateTime end( event->dtEnd().toTimeSpec( event->dtStart() ) );
- if ( event->allDay() ) {
- end.setDateOnly( true );
- } else {
- end = end.addSecs(-1);
- }
- if ( end >= kdt ) {
- eventList.append( event );
+ if ( ev->recursOn( date, ts ) ) {
+ eventList.append( ev );
}
}
}
@@ -383,7 +432,11 @@
KDateTime yesterStart = st.addDays( -1 );
// Get non-recurring events
- foreach ( Event *event, d->mEvents ) {
+ QHashIteratori( d->mEvents );
+ Event *event;
+ while ( i.hasNext() ) {
+ i.next();
+ event = i.value();
KDateTime rStart = event->dtStart();
if ( nd < rStart ) {
continue;
@@ -438,8 +491,10 @@
SortDirection sortDirection )
{
Event::List eventList;
- foreach ( Event *e, d->mEvents ) {
- eventList.append( e );
+ QHashIteratori( d->mEvents );
+ while ( i.hasNext() ) {
+ i.next();
+ eventList.append( i.value() );
}
return sortEvents( &eventList, sortField, sortDirection );
}
@@ -463,6 +518,7 @@
QString uid = journal->uid();
if ( mJournals.value( uid ) == 0 ) {
mJournals.insert( uid, journal );
+ mJournalsForDate.insert( journal->dtStart().date().toString(), journal );
} else {
#ifndef NDEBUG
// if we already have an journal with this UID, it must be the same journal,
@@ -479,6 +535,7 @@
setModified( true );
notifyIncidenceDeleted( journal );
d->mDeletedIncidences.append( journal );
+ d->mJournalsForDate.remove( journal->dtStart().date().toString(), journal );
return true;
} else {
kWarning() << "CalendarLocal::deleteJournal(): Journal not found.";
@@ -488,11 +545,14 @@
void CalendarLocal::deleteAllJournals()
{
- foreach ( Journal *j, d->mJournals ) {
- notifyIncidenceDeleted( j );
+ QHashIteratori( d->mJournals );
+ while ( i.hasNext() ) {
+ i.next();
+ notifyIncidenceDeleted( i.value() );
}
qDeleteAll( d->mJournals );
d->mJournals.clear();
+ d->mJournalsForDate.clear();
}
Journal *CalendarLocal::journal( const QString &uid )
@@ -504,8 +564,10 @@
SortDirection sortDirection )
{
Journal::List journalList;
- foreach ( Journal *j, d->mJournals ) {
- journalList.append( j );
+ QHashIteratori( d->mJournals );
+ while ( i.hasNext() ) {
+ i.next();
+ journalList.append( i.value() );
}
return sortJournals( &journalList, sortField, sortDirection );
}
@@ -513,10 +575,15 @@
Journal::List CalendarLocal::rawJournalsForDate( const QDate &date )
{
Journal::List journalList;
- foreach ( Journal *j, d->mJournals ) {
- if ( j->dtStart().date() == date ) {
- journalList.append( j );
- }
+ Journal *j;
+
+ QString dateStr = date.toString();
+ QMultiHash::iterator it = d->mJournalsForDate.find( dateStr );
+
+ while ( it != d->mJournalsForDate.end() && it.key() == dateStr ) {
+ j = it.value();
+ journalList.append( j );
+ ++it;
}
return journalList;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/incidencebase.cpp new/kdepimlibs-3.96.0/kcal/incidencebase.cpp
--- old/kdepimlibs-3.95.1/kcal/incidencebase.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/incidencebase.cpp 2007-11-14 01:24:49.000000000 +0100
@@ -52,7 +52,11 @@
class KCal::IncidenceBase::Private
{
public:
- Private() : mAllDay( true ), mHasDuration( false )
+ Private()
+ : mUpdateGroupLevel( 0 ),
+ mUpdatedPending( false ),
+ mAllDay( true ),
+ mHasDuration( false )
{ mAttendees.setAutoDelete( true ); }
Private( const Private &other )
@@ -61,6 +65,8 @@
mOrganizer( other.mOrganizer ),
mUid( other.mUid ),
mDuration( other.mDuration ),
+ mUpdateGroupLevel( 0 ),
+ mUpdatedPending( false ),
mAllDay( other.mAllDay ),
mHasDuration( other.mHasDuration )
//????? mComments
@@ -73,6 +79,8 @@
Person mOrganizer; // incidence person (owner)
QString mUid; // incidence unique id
Duration mDuration; // incidence duration
+ int mUpdateGroupLevel; // if non-zero, suppresses update() calls
+ bool mUpdatedPending; // true if an update has occurred since startUpdates()
bool mAllDay; // true if the incidence is all-day
bool mHasDuration; // true if the incidence has a duration
@@ -434,8 +442,27 @@
void IncidenceBase::updated()
{
- foreach ( IncidenceObserver *o, d->mObservers ) {
- o->incidenceUpdated( this );
+ if ( d->mUpdateGroupLevel ) {
+ d->mUpdatedPending = true;
+ } else {
+ foreach ( IncidenceObserver *o, d->mObservers ) {
+ o->incidenceUpdated( this );
+ }
+ }
+}
+
+void IncidenceBase::startUpdates()
+{
+ ++d->mUpdateGroupLevel;
+}
+
+void IncidenceBase::endUpdates()
+{
+ if ( d->mUpdateGroupLevel > 0 ) {
+ if ( --d->mUpdateGroupLevel == 0 && d->mUpdatedPending ) {
+ d->mUpdatedPending = false;
+ updated();
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/incidencebase.h new/kdepimlibs-3.96.0/kcal/incidencebase.h
--- old/kdepimlibs-3.95.1/kcal/incidencebase.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/incidencebase.h 2007-11-14 01:24:48.000000000 +0100
@@ -520,6 +520,20 @@
*/
void updated();
+ /**
+ Call this when a group of updates is going to be made. This suppresses
+ change notifications until endUpdates() is called, at which point
+ updated() will automatically be called.
+ */
+ void startUpdates();
+
+ /**
+ Call this when a group of updates is complete, to notify observers that
+ the instance has changed. This should be called in conjunction with
+ startUpdates().
+ */
+ void endUpdates();
+
protected:
/**
@copydoc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/incidence.cpp new/kdepimlibs-3.96.0/kcal/incidence.cpp
--- old/kdepimlibs-3.95.1/kcal/incidence.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/incidence.cpp 2007-11-14 01:24:49.000000000 +0100
@@ -59,6 +59,29 @@
mRelatedTo( 0 )
{}
+ Private(const Private &p)
+ : mCreated( p.mCreated ),
+ mRevision( p.mRevision ),
+ mDescription( p.mDescription ),
+ mDescriptionIsRich( p.mDescriptionIsRich ),
+ mSummary( p.mSummary ),
+ mSummaryIsRich( p.mSummaryIsRich ),
+ mLocation( p.mLocation ),
+ mLocationIsRich( p.mLocationIsRich ),
+ mCategories( p.mCategories ),
+ mResources( p.mResources ),
+ mStatus( p.mStatus ),
+ mStatusString( p.mStatusString ),
+ mSecrecy( p.mSecrecy ),
+ mPriority( p.mPriority ),
+ mSchedulingID( p.mSchedulingID ),
+ mRelatedTo( 0 ),
+ mRelatedToUid( p.mRelatedToUid )
+// TODO: reenable attributes currently commented out.
+// Incidence *mRelatedTo; Incidence *mRelatedTo;
+// Incidence::List mRelations; Incidence::List mRelations;
+ {}
+
KDateTime mCreated; // creation datetime
int mRevision; // revision number
@@ -96,25 +119,8 @@
Incidence::Incidence( const Incidence &i )
: IncidenceBase( i ), Recurrence::RecurrenceObserver(),
- d( new KCal::Incidence::Private )
+ d( new KCal::Incidence::Private( *i.d ) )
{
-// TODO: reenable attributes currently commented out.
- d->mRevision = i.d->mRevision;
- d->mCreated = i.d->mCreated;
- d->mDescription = i.d->mDescription;
- d->mSummary = i.d->mSummary;
- d->mCategories = i.d->mCategories;
-// Incidence *mRelatedTo; Incidence *mRelatedTo;
- d->mRelatedTo = 0;
- d->mRelatedToUid = i.d->mRelatedToUid;
-// Incidence::List mRelations; Incidence::List mRelations;
- d->mResources = i.d->mResources;
- d->mStatusString = i.d->mStatusString;
- d->mStatus = i.d->mStatus;
- d->mSecrecy = i.d->mSecrecy;
- d->mPriority = i.d->mPriority;
- d->mLocation = i.d->mLocation;
-
// Alarms and Attachments are stored in ListBase<...>, which is a QValueList<...*>.
// We need to really duplicate the objects stored therein, otherwise deleting
// i will also delete all attachments from this object (setAutoDelete...)
@@ -139,8 +145,6 @@
} else {
d->mRecurrence = 0;
}
-
- d->mSchedulingID = i.d->mSchedulingID;
}
Incidence::~Incidence()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/kcal_manager.desktop new/kdepimlibs-3.96.0/kcal/kcal_manager.desktop
--- old/kdepimlibs-3.95.1/kcal/kcal_manager.desktop 2007-10-24 14:17:25.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/kcal_manager.desktop 2007-11-14 01:24:48.000000000 +0100
@@ -17,6 +17,7 @@
Name[oc]=Calendièr
Name[pa]=ਕੈਲੰਡਰ
Name[pt]=Calendário
+Name[sl]=Koledar
Name[sv]=Kalender
Name[uk]=Календар
Name[x-test]=xxCalendarxx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/test-vzic.c new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/test-vzic.c
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/test-vzic.c 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/test-vzic.c 2007-11-14 01:24:48.000000000 +0100
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic.c new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic.c
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic.c 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic.c 2007-11-14 01:24:48.000000000 +0100
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-dump.c new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-dump.c
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-dump.c 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-dump.c 2007-11-14 01:24:48.000000000 +0100
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-dump.h new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-dump.h
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-dump.h 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-dump.h 2007-11-14 01:24:48.000000000 +0100
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-dump.pl new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-dump.pl
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-dump.pl 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-dump.pl 2007-11-14 01:24:48.000000000 +0100
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic.h new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic.h
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic.h 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic.h 2007-11-14 01:24:48.000000000 +0100
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef _VZIC_H_
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-merge.pl new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-merge.pl
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-merge.pl 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-merge.pl 2007-11-14 01:24:48.000000000 +0100
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-output.c new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-output.c
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-output.c 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-output.c 2007-11-14 01:24:48.000000000 +0100
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/* ALGORITHM:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-output.h new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-output.h
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-output.h 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-output.h 2007-11-14 01:24:48.000000000 +0100
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef _VZIC_OUTPUT_H_
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-parse.c new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-parse.c
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-parse.c 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-parse.c 2007-11-14 01:24:48.000000000 +0100
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-parse.h new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-parse.h
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-parse.h 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-parse.h 2007-11-14 01:24:48.000000000 +0100
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef _VZIC_PARSE_H_
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-test.pl new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-test.pl
--- old/kdepimlibs-3.95.1/kcal/libical/vzic-1.3/vzic-test.pl 2007-05-03 10:36:28.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/libical/vzic-1.3/vzic-test.pl 2007-11-14 01:24:48.000000000 +0100
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/local.desktop new/kdepimlibs-3.96.0/kcal/local.desktop
--- old/kdepimlibs-3.95.1/kcal/local.desktop 2007-10-23 10:37:01.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/local.desktop 2007-11-14 01:24:48.000000000 +0100
@@ -15,6 +15,7 @@
Name[nl]=Agenda in lokaal bestand
Name[pa]=ਲੋਕਲ ਫਾਇਲ 'ਚ ਕੈਲੰਡਰ
Name[pt]=Calendário num Ficheiro Local
+Name[sl]=Koledar v krajevni datoteki
Name[sv]=Kalender i lokal fil
Name[uk]=Календар в локальному файлі
Name[x-test]=xxCalendar in Local Filexx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/localdir.desktop new/kdepimlibs-3.96.0/kcal/localdir.desktop
--- old/kdepimlibs-3.95.1/kcal/localdir.desktop 2007-10-16 16:49:25.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/localdir.desktop 2007-11-14 01:24:48.000000000 +0100
@@ -15,6 +15,7 @@
Name[nl]=Agenda in lokale map
Name[pa]=ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ 'ਚ ਕੈਲੰਡਰ
Name[pt]=Calendário numa Pasta Local
+Name[sl]=Koledar v krajevnem imeniku
Name[sv]=Kalender i lokal katalog
Name[uk]=Календар в локальній теці
Name[x-test]=xxCalendar in Local Directoryxx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/recurrence.cpp new/kdepimlibs-3.96.0/kcal/recurrence.cpp
--- old/kdepimlibs-3.95.1/kcal/recurrence.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/recurrence.cpp 2007-11-14 01:24:48.000000000 +0100
@@ -576,18 +576,14 @@
return;
}
d->mStartDateTime = start;
- if ( start.isDateOnly() ) {
- setAllDay( true );
- } else {
- setAllDay( false ); // set all RRULEs and EXRULEs
+ setAllDay( start.isDateOnly() ); // set all RRULEs and EXRULEs
- int i, end;
- for ( i = 0, end = d->mRRules.count(); i < end; ++i ) {
- d->mRRules[i]->setStartDt( start );
- }
- for ( i = 0, end = d->mExRules.count(); i < end; ++i ) {
- d->mExRules[i]->setStartDt( start );
- }
+ int i, end;
+ for ( i = 0, end = d->mRRules.count(); i < end; ++i ) {
+ d->mRRules[i]->setStartDt( start );
+ }
+ for ( i = 0, end = d->mExRules.count(); i < end; ++i ) {
+ d->mExRules[i]->setStartDt( start );
}
updated();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/recurrence.h new/kdepimlibs-3.96.0/kcal/recurrence.h
--- old/kdepimlibs-3.95.1/kcal/recurrence.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/recurrence.h 2007-11-14 01:24:48.000000000 +0100
@@ -273,10 +273,14 @@
* first and last. */
void setDuration( int duration );
- /** Returns the number of recurrences up to and including the date/time specified. */
+ /** Returns the number of recurrences up to and including the date/time specified.
+ * @warning This function can be very time consuming - use it sparingly!
+ */
int durationTo( const KDateTime &dt ) const;
- /** Returns the number of recurrences up to and including the date specified. */
+ /** Returns the number of recurrences up to and including the date specified.
+ * @warning This function can be very time consuming - use it sparingly!
+ */
int durationTo( const QDate &date ) const;
/** Returns the date/time of the last recurrence.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/resourcecachedconfig.cpp new/kdepimlibs-3.96.0/kcal/resourcecachedconfig.cpp
--- old/kdepimlibs-3.95.1/kcal/resourcecachedconfig.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/resourcecachedconfig.cpp 2007-11-14 01:24:48.000000000 +0100
@@ -101,6 +101,11 @@
groupBox->setLayout(vbox);
}
+ResourceCachedReloadConfig::~ResourceCachedReloadConfig()
+{
+ delete d;
+}
+
void ResourceCachedReloadConfig::loadSettings( ResourceCached *resource )
{
d->mGroup->button( resource->reloadPolicy() )->setChecked( true );
@@ -178,6 +183,11 @@
}
+ResourceCachedSaveConfig::~ResourceCachedSaveConfig()
+{
+ delete d;
+}
+
void ResourceCachedSaveConfig::loadSettings( ResourceCached *resource )
{
d->mGroup->button( resource->savePolicy() )->setChecked( true );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/resourcecachedconfig.h new/kdepimlibs-3.96.0/kcal/resourcecachedconfig.h
--- old/kdepimlibs-3.95.1/kcal/resourcecachedconfig.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/resourcecachedconfig.h 2007-11-14 01:24:48.000000000 +0100
@@ -39,7 +39,7 @@
Q_OBJECT
public:
explicit ResourceCachedReloadConfig( QWidget *parent = 0 );
-
+ ~ResourceCachedReloadConfig();
public Q_SLOTS:
void loadSettings( ResourceCached *resource );
void saveSettings( ResourceCached *resource );
@@ -64,6 +64,7 @@
Q_OBJECT
public:
explicit ResourceCachedSaveConfig( QWidget *parent = 0 );
+ ~ResourceCachedSaveConfig();
public Q_SLOTS:
void loadSettings( ResourceCached *resource );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/resourcelocalconfig.cpp new/kdepimlibs-3.96.0/kcal/resourcelocalconfig.cpp
--- old/kdepimlibs-3.95.1/kcal/resourcelocalconfig.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/resourcelocalconfig.cpp 2007-11-14 01:24:49.000000000 +0100
@@ -22,6 +22,7 @@
#include "resourcelocalconfig.h"
#include "resourcelocal.h"
+#include "resourcelocal_p.h"
#include "vcalformat.h"
#include "icalformat.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/resourcelocal.cpp new/kdepimlibs-3.96.0/kcal/resourcelocal.cpp
--- old/kdepimlibs-3.95.1/kcal/resourcelocal.cpp 2007-10-25 11:32:00.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/resourcelocal.cpp 2007-11-14 01:24:48.000000000 +0100
@@ -29,10 +29,12 @@
*/
#include "resourcelocal.moc"
+#include "resourcelocal_p.h"
#include "resourcelocalconfig.h"
#include "vcalformat.h"
#include "icalformat.h"
+#include "calendarlocal.h"
#include "exceptions.h"
#include "incidence.h"
#include "event.h"
@@ -49,6 +51,7 @@
#include
#include
#include
+#include
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/resourcelocaldirconfig.cpp new/kdepimlibs-3.96.0/kcal/resourcelocaldirconfig.cpp
--- old/kdepimlibs-3.95.1/kcal/resourcelocaldirconfig.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/resourcelocaldirconfig.cpp 2007-11-14 01:24:48.000000000 +0100
@@ -21,6 +21,7 @@
#include "resourcelocaldirconfig.h"
#include "resourcelocaldir.h"
+#include "resourcelocaldir_p.h"
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/resourcelocaldir.cpp new/kdepimlibs-3.96.0/kcal/resourcelocaldir.cpp
--- old/kdepimlibs-3.95.1/kcal/resourcelocaldir.cpp 2007-10-25 11:32:00.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/resourcelocaldir.cpp 2007-11-14 01:24:48.000000000 +0100
@@ -20,6 +20,7 @@
*/
#include "resourcelocaldir.h"
+#include "resourcelocaldir_p.h"
#include "calendarlocal.h"
#include "incidence.h"
#include "event.h"
@@ -30,7 +31,6 @@
#include
#include
-#include
#include
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/resourcelocaldir.h new/kdepimlibs-3.96.0/kcal/resourcelocaldir.h
--- old/kdepimlibs-3.95.1/kcal/resourcelocaldir.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/resourcelocaldir.h 2007-11-14 01:24:48.000000000 +0100
@@ -24,17 +24,8 @@
#include "kcal_export.h"
#include "resourcecached.h"
-#include
-#include
-
-class QString;
-class KConfig;
-
namespace KCal {
-class CalendarLocal;
-class Incidence;
-
/**
@brief
This class provides a calendar stored as a file per incidence in a directory.
@@ -99,32 +90,6 @@
//@endcond
};
-/**
- Private class that helps to provide binary compatibility between releases.
- @internal
-*/
-//@cond PRIVATE
-class KCal::ResourceLocalDir::Private
-{
- public:
- Private()
- : mLock( 0 )
- {
- }
-
- Private ( const QString &dirName )
- {
- mURL = KUrl( dirName );
- }
-
- void init( ResourceLocalDir *rdir );
- bool deleteIncidenceFile( Incidence *incidence );
- KABC::Lock *mLock;
- KUrl mURL;
- KDirWatch mDirWatch;
-};
-//@endcond
-
}
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/resourcelocaldir_p.h new/kdepimlibs-3.96.0/kcal/resourcelocaldir_p.h
--- old/kdepimlibs-3.95.1/kcal/resourcelocaldir_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/kdepimlibs-3.96.0/kcal/resourcelocaldir_p.h 2007-11-14 01:24:48.000000000 +0100
@@ -0,0 +1,64 @@
+/*
+ This file is part of the kcal library.
+
+ Copyright (c) 2003 Cornelius Schumacher
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+#ifndef KCAL_RESOURCELOCALDIRDIR_P_H
+#define KCAL_RESOURCELOCALDIRDIR_P_H
+
+#include
+#include
+
+class QString;
+namespace KABC { class Lock; }
+
+namespace KCal {
+
+class ResourceLocalDir;
+class Incidence;
+
+/**
+ Private class that helps to provide binary compatibility between releases.
+ @internal
+*/
+//@cond PRIVATE
+class ResourceLocalDir::Private
+{
+ public:
+ Private()
+ : mLock( 0 )
+ {
+ }
+
+ Private ( const QString &dirName )
+ : mLock( 0 ),
+ mURL( KUrl::fromPath( dirName ) )
+ {
+ }
+
+ void init( ResourceLocalDir *rdir );
+ bool deleteIncidenceFile( Incidence *incidence );
+ KABC::Lock *mLock;
+ KUrl mURL;
+ KDirWatch mDirWatch;
+};
+//@endcond
+
+}
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/resourcelocal.h new/kdepimlibs-3.96.0/kcal/resourcelocal.h
--- old/kdepimlibs-3.95.1/kcal/resourcelocal.h 2007-08-29 11:51:22.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/resourcelocal.h 2007-11-14 01:24:48.000000000 +0100
@@ -34,17 +34,12 @@
#include
#include
-#include
-#include
-#include "calendarlocal.h"
#include "kcal_export.h"
#include "resourcecached.h"
namespace KCal {
-class CalFormat;
-
/**
@brief Provides a calendar resource stored as a local file.
*/
@@ -179,14 +174,4 @@
}
-class KCal::ResourceLocal::Private
-{
- public:
- KUrl mURL;
- CalFormat *mFormat;
- KDirWatch mDirWatch;
- KABC::Lock *mLock;
- KDateTime mLastModified;
-};
-
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/resourcelocal_p.h new/kdepimlibs-3.96.0/kcal/resourcelocal_p.h
--- old/kdepimlibs-3.95.1/kcal/resourcelocal_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/kdepimlibs-3.96.0/kcal/resourcelocal_p.h 2007-11-14 01:24:48.000000000 +0100
@@ -0,0 +1,54 @@
+/*
+ This file is part of the kcal library.
+
+ Copyright (c) 1998 Preston Brown
+ Copyright (c) 2001,2003 Cornelius Schumacher
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef KCAL_RESOURCELOCAL_P_H
+#define KCAL_RESOURCELOCAL_P_H
+
+#include
+#include
+#include
+
+namespace KABC { class Lock; }
+
+namespace KCal {
+
+class CalFormat;
+
+/**
+ Private class that helps to provide binary compatibility between releases.
+ @internal
+*/
+//@cond PRIVATE
+class ResourceLocal::Private
+{
+ public:
+ KUrl mURL;
+ CalFormat *mFormat;
+ KDirWatch mDirWatch;
+ KABC::Lock *mLock;
+ KDateTime mLastModified;
+};
+//@endcond
+
+}
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kcal/scheduler.h new/kdepimlibs-3.96.0/kcal/scheduler.h
--- old/kdepimlibs-3.95.1/kcal/scheduler.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.0/kcal/scheduler.h 2007-11-06 09:01:10.000000000 +0100
@@ -212,7 +212,7 @@
ICalFormat *mFormat;
private:
- class Private;
+ struct Private;
Private *const d;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kioslave/imap4/imap4.cpp new/kdepimlibs-3.96.0/kioslave/imap4/imap4.cpp
--- old/kdepimlibs-3.95.1/kioslave/imap4/imap4.cpp 2007-10-31 21:36:03.000000000 +0100
+++ new/kdepimlibs-3.96.0/kioslave/imap4/imap4.cpp 2007-11-06 09:01:10.000000000 +0100
@@ -2243,10 +2243,10 @@
entry.clear ();
const QString uid = QString::number(cache->getUid());
- QString tmp;
+ QString tmp = uid;
if (stretch > 0)
{
- tmp = "0000000000000000" + tmp;
+ tmp = "0000000000000000" + uid;
tmp = tmp.right (stretch);
}
if (withSubject)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kldap/ldapsearch.cpp new/kdepimlibs-3.96.0/kldap/ldapsearch.cpp
--- old/kdepimlibs-3.95.1/kldap/ldapsearch.cpp 2007-10-03 13:30:06.000000000 +0200
+++ new/kdepimlibs-3.96.0/kldap/ldapsearch.cpp 2007-11-06 09:01:10.000000000 +0100
@@ -45,7 +45,7 @@
void closeConnection();
bool startSearch( const LdapDN &base, LdapUrl::Scope scope,
const QString &filter, const QStringList &attributes,
- int pagesize );
+ int pagesize, int count );
LdapSearch *mParent;
LdapConnection *mConn;
@@ -59,6 +59,8 @@
QString mErrorString;
int mError;
+ int mCount,mMaxCount;
+ bool mFinished;
};
void LdapSearch::Private::result()
@@ -81,6 +83,7 @@
return;
}
+ //binding
if ( res == LdapOperation::RES_BIND ) {
QByteArray servercc;
@@ -102,16 +105,22 @@
kDebug(5322) << "bind next step";
mId = mOp.bind( servercc );
}
- if ( mId == -1 ) {
- mError = mConn->ldapErrorCode();
- mErrorString = mConn->ldapErrorString();
- emit mParent->result( mParent );
- return;
+ if ( mId < 0 ) {
+ if ( mId == KLDAP_SASL_ERROR ) {
+ mError = mId;
+ mErrorString = mConn->saslErrorString();
+ } else {
+ mError = mConn->ldapErrorCode();
+ mErrorString = mConn->ldapErrorString();
+ }
+ emit mParent->result( mParent );
+ return;
}
QTimer::singleShot( 0, mParent, SLOT(result()) );
return;
}
+ //End of entries
if ( res == LdapOperation::RES_SEARCH_RESULT ) {
if ( mPageSize ) {
QByteArray cookie;
@@ -137,18 +146,31 @@
emit mParent->result( mParent );
return;
}
+ //continue with the next page
QTimer::singleShot( 0, mParent, SLOT(result()) );
return;
}
}
+ mFinished = true;
emit mParent->result( mParent );
return;
}
+
+ //Found an entry
if ( res == LdapOperation::RES_SEARCH_ENTRY ) {
emit mParent->data( mParent, mOp.object() );
+ mCount++;
}
- QTimer::singleShot( 0, mParent, SLOT(result()) );
+ //If not reached the requested entries, continue
+ if ( mMaxCount <= 0 || mCount < mMaxCount ) {
+ QTimer::singleShot( 0, mParent, SLOT(result()) );
+ }
+ //If reached the requested entries, indicate it
+ if ( mMaxCount > 0 && mCount == mMaxCount ) {
+ kDebug(5322) << mCount << " entries reached";
+ emit mParent->result( mParent );
+ }
}
bool LdapSearch::Private::connect()
@@ -171,9 +193,10 @@
}
}
+//This starts the real job
bool LdapSearch::Private::startSearch( const LdapDN &base, LdapUrl::Scope scope,
const QString &filter,
- const QStringList &attributes, int pagesize )
+ const QStringList &attributes, int pagesize, int count )
{
kDebug(5322) << "search: base=" << base.toString() << "scope=" << scope << "filter=" << filter
<< "attributes=" << attributes << "pagesize=" << pagesize;
@@ -186,6 +209,10 @@
mScope = scope;
mFilter = filter;
mAttributes = attributes;
+ mMaxCount = count;
+ mCount = 0;
+ mFinished = false;
+
LdapControls savedctrls = mOp.serverControls();
if ( pagesize ) {
LdapControls ctrls = savedctrls;
@@ -211,6 +238,8 @@
return true;
}
+///////////////////////////////////////////////
+
LdapSearch::LdapSearch()
: d( new Private( this ) )
{
@@ -249,7 +278,7 @@
}
bool LdapSearch::search( const LdapServer &server,
- const QStringList &attributes )
+ const QStringList &attributes, int count )
{
if ( d->mOwnConnection ) {
d->closeConnection();
@@ -259,10 +288,10 @@
}
}
return d->startSearch( server.baseDn(), server.scope(), server.filter(),
- attributes, server.pageSize() );
+ attributes, server.pageSize(), count );
}
-bool LdapSearch::search( const LdapUrl &url )
+bool LdapSearch::search( const LdapUrl &url, int count )
{
if ( d->mOwnConnection ) {
d->closeConnection();
@@ -274,15 +303,27 @@
bool critical;
int pagesize = url.extension( QLatin1String("x-pagesize"), critical ).toInt();
return d->startSearch( url.dn(), url.scope(), url.filter(),
- url.attributes(), pagesize );
+ url.attributes(), pagesize, count );
}
bool LdapSearch::search( const LdapDN &base, LdapUrl::Scope scope,
const QString &filter, const QStringList &attributes,
- int pagesize )
+ int pagesize, int count )
{
Q_ASSERT( !d->mOwnConnection );
- return d->startSearch( base, scope, filter, attributes, pagesize );
+ return d->startSearch( base, scope, filter, attributes, pagesize, count );
+}
+
+void LdapSearch::continueSearch()
+{
+ Q_ASSERT( !d->mFinished );
+ d->mCount = 0;
+ QTimer::singleShot( 0, this, SLOT(result()) );
+}
+
+bool LdapSearch::isFinished()
+{
+ return d->mFinished;
}
void LdapSearch::abandon()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kldap/ldapsearch.h new/kdepimlibs-3.96.0/kldap/ldapsearch.h
--- old/kdepimlibs-3.95.1/kldap/ldapsearch.h 2007-06-27 12:40:39.000000000 +0200
+++ new/kdepimlibs-3.96.0/kldap/ldapsearch.h 2007-11-06 09:01:10.000000000 +0100
@@ -81,14 +81,16 @@
/**
* Starts a search operation on the LDAP server @param server,
* returning the attributes specified with @param attributes.
+ * @param count means how many entries to list. If it's >0, then result() will
+ * emitted when the number of entries reached, but with isFinished() set to false.
*/
bool search( const LdapServer &server,
- const QStringList &attributes = QStringList() );
+ const QStringList &attributes = QStringList(), int count = 0 );
/**
* Starts a search operation on the given LDAP URL.
*/
- bool search( const LdapUrl &url );
+ bool search( const LdapUrl &url, int count = 0 );
/**
* Starts a search operation if the LdapConnection object already set
@@ -98,8 +100,17 @@
LdapUrl::Scope scope = LdapUrl::Sub,
const QString &filter = QString(),
const QStringList &attributes = QStringList(),
- int pagesize = 0 );
+ int pagesize = 0, int count = 0 );
+
+ /**
+ * Continues the search (if you set count to non-zero in search(), and isFinished() is false)
+ */
+ void continueSearch();
+ /**
+ * Returns true if the search is finished else returns false.
+ */
+ bool isFinished();
/**
* Tries to abandon the search.
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kresources/factory.cpp new/kdepimlibs-3.96.0/kresources/factory.cpp
--- old/kdepimlibs-3.95.1/kresources/factory.cpp 2007-10-03 13:29:59.000000000 +0200
+++ new/kdepimlibs-3.96.0/kresources/factory.cpp 2007-11-14 01:24:48.000000000 +0100
@@ -110,10 +110,11 @@
}
KService::Ptr ptr = d->mTypeMap[ type ];
- KPluginFactory *factory = KPluginLoader( ptr->library().toLatin1() ).factory();
+ KPluginLoader loader( ptr->library() );
+ KPluginFactory *factory = loader.factory();
if ( !factory ) {
kDebug(5650) << "KRES::Factory::configWidget(): Factory creation failed"
- << KLibLoader::self()->lastErrorMessage();
+ << loader.errorString();
return 0;
}
@@ -163,10 +164,11 @@
}
KService::Ptr ptr = mTypeMap[ type ];
- KPluginFactory *factory = KPluginLoader( ptr->library().toLatin1() ).factory();
+ KPluginLoader loader( ptr->library() );
+ KPluginFactory *factory = loader.factory();
if ( !factory ) {
kDebug(5650) << "KRES::Factory::resource(): Factory creation failed"
- << KLibLoader::self()->lastErrorMessage();
+ << loader.errorString();
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kresources/kresources.desktop new/kdepimlibs-3.96.0/kresources/kresources.desktop
--- old/kdepimlibs-3.95.1/kresources/kresources.desktop 2007-10-16 16:49:24.000000000 +0200
+++ new/kdepimlibs-3.96.0/kresources/kresources.desktop 2007-11-14 01:24:48.000000000 +0100
@@ -23,6 +23,7 @@
Name[nl]=KDE-hulpbronnen
Name[pa]=KDE ਸਰੋਤ
Name[pt]=Recursos do KDE
+Name[sl]=Viri KDE
Name[sv]=KDE-resurser
Name[uk]=Ресурси KDE
Name[x-test]=xxKDE Resourcesxx
@@ -43,6 +44,7 @@
Comment[nds]=KDE Ressourcen instellen
Comment[nl]=KDE-hulpbronnen instellen
Comment[pt]=Configurar os Recursos do KDE
+Comment[sl]=Nastavi vire KDE
Comment[sv]=Anpassa KDE-resurser
Comment[uk]=Налаштувати ресурси KDE
Comment[x-test]=xxConfigure KDE Resourcesxx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/kresources/kresources_manager.desktop new/kdepimlibs-3.96.0/kresources/kresources_manager.desktop
--- old/kdepimlibs-3.95.1/kresources/kresources_manager.desktop 2007-10-16 16:49:24.000000000 +0200
+++ new/kdepimlibs-3.96.0/kresources/kresources_manager.desktop 2007-11-14 01:24:48.000000000 +0100
@@ -15,6 +15,7 @@
Comment[nl]=KResource-beheerder
Comment[pa]=ਕੇ-ਰੀਸੋਰਸ ਮੈਨੇਜਰ
Comment[pt]=Gestor do KResource
+Comment[sl]=Upravnik KResource
Comment[sv]=Resurshantering
Comment[uk]=Менеджер KResource
Comment[x-test]=xxKResource Managerxx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/mailtransport/kcm_mailtransport.desktop new/kdepimlibs-3.96.0/mailtransport/kcm_mailtransport.desktop
--- old/kdepimlibs-3.95.1/mailtransport/kcm_mailtransport.desktop 2007-10-16 16:49:25.000000000 +0200
+++ new/kdepimlibs-3.96.0/mailtransport/kcm_mailtransport.desktop 2007-11-14 01:24:49.000000000 +0100
@@ -24,6 +24,7 @@
Name[ja]=メール送信方法
Name[nl]=E-mailtransport
Name[pt]=Transporte de Correio
+Name[sl]=Prenos pošte
Name[sv]=E-postöverföring
Name[uk]=Транспортування пошти
Name[x-test]=xxMail Transportxx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/POLICIES new/kdepimlibs-3.96.0/POLICIES
--- old/kdepimlibs-3.95.1/POLICIES 2007-07-26 12:35:17.000000000 +0200
+++ new/kdepimlibs-3.96.0/POLICIES 2007-11-14 01:24:49.000000000 +0100
@@ -43,13 +43,6 @@
clause'.
3. X11 license as listed below
- In exceptional cases, a library may be included that is licensed
- according to the the GNU GENERAL PUBLIC LICENSE, version 2 (as shown
- in the COPYING file in this directory). The associated library binary
- will be installed with the "-gpl" extension to indicate that it has an
- exceptional license, and that those wishing to link to this library
- should pay special attention.
-
D. Dependencies
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/syndication/documentsource.cpp new/kdepimlibs-3.96.0/syndication/documentsource.cpp
--- old/kdepimlibs-3.95.1/syndication/documentsource.cpp 2007-07-26 12:35:10.000000000 +0200
+++ new/kdepimlibs-3.96.0/syndication/documentsource.cpp 2007-11-06 09:01:10.000000000 +0100
@@ -86,7 +86,9 @@
QXmlSimpleReader reader;
reader.setFeature("http://xml.org/sax/features/namespaces", true);
- d->domDoc.setContent(&source, &reader);
+ if (!d->domDoc.setContent(&source, &reader))
+ d->domDoc.clear();
+
d->parsed = true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.95.1/syndication/documentsource.h new/kdepimlibs-3.96.0/syndication/documentsource.h
--- old/kdepimlibs-3.95.1/syndication/documentsource.h 2007-07-26 12:35:10.000000000 +0200
+++ new/kdepimlibs-3.96.0/syndication/documentsource.h 2007-11-06 09:01:10.000000000 +0100
@@ -117,6 +117,10 @@
* The document is parsed only on the first call of this method
* and then cached.
*
+ * If the feed source cannot be parsed successfully then the
+ * returned DOM node will be null (eg. asDomDocument().isNull()
+ * will return true)
+ *
* @return XML representation parsed from the raw source
*/
QDomDocument asDomDocument() const;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org