Hello community,
here is the log from the commit of package kdepimlibs4
checked in at Wed Dec 5 23:18:24 CET 2007.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2007-11-28 11:25:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2007-12-04 16:38:14.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Dec 4 16:38:14 CET 2007 - dmueller@suse.de
+
+- update to 3.96.3
+
+-------------------------------------------------------------------
Old:
----
kdepimlibs-3.96.2.tar.bz2
New:
----
kdepimlibs-3.96.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.A12467/_old 2007-12-05 23:18:09.000000000 +0100
+++ /var/tmp/diff_new_pack.A12467/_new 2007-12-05 23:18:09.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 3.96.2)
+# spec file for package kdepimlibs4 (Version 3.96.3)
#
# 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.96.2
+Version: 3.96.3
Release: 1
-%define rversion 3.96.2
+%define rversion 3.96.3
Source0: kdepimlibs-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -152,6 +152,8 @@
%_kde_share_dir/config.kcfg/mailtransport.kcfg
%changelog
+* Tue Dec 04 2007 - dmueller@suse.de
+- update to 3.96.3
* Wed Nov 28 2007 - dmueller@suse.de
- update to 3.96.2
* Wed Nov 21 2007 - dmueller@suse.de
++++++ kdepimlibs-3.96.2.tar.bz2 -> kdepimlibs-3.96.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kabc/addressbook.h new/kdepimlibs-3.96.3/kabc/addressbook.h
--- old/kdepimlibs-3.96.2/kabc/addressbook.h 2007-10-08 09:43:53.000000000 +0200
+++ new/kdepimlibs-3.96.3/kabc/addressbook.h 2007-12-04 13:13:37.000000000 +0100
@@ -264,6 +264,16 @@
};
/**
+ Typedef for STL style iterator
+ */
+ typedef Iterator iterator;
+
+ /**
+ Typedef for STL style iterator
+ */
+ typedef ConstIterator const_iterator;
+
+ /**
Constructs an address book object.
You have to add the resources manually before calling load().
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kabc/addresseelist.h new/kdepimlibs-3.96.3/kabc/addresseelist.h
--- old/kdepimlibs-3.96.2/kabc/addresseelist.h 2007-08-29 11:51:24.000000000 +0200
+++ new/kdepimlibs-3.96.3/kabc/addresseelist.h 2007-12-04 13:13:37.000000000 +0100
@@ -276,7 +276,7 @@
* such operations you have to call {@link #sort} or {@link #sortBy} to
* create a defined order again.
*
- * Iterator usage is inherited by QValueList and extensively documented
+ * Iterator usage is inherited from QList and extensively documented
* there. Please remember that the state of an iterator is undefined
* after any sorting operation.
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kabc/formats/binary.desktop new/kdepimlibs-3.96.3/kabc/formats/binary.desktop
--- old/kdepimlibs-3.96.2/kabc/formats/binary.desktop 2007-11-27 18:19:53.000000000 +0100
+++ new/kdepimlibs-3.96.3/kabc/formats/binary.desktop 2007-12-04 13:13:37.000000000 +0100
@@ -13,6 +13,8 @@
Name[hu]=Bináris
Name[ja]=バイナリ
Name[lt]=Dvejetainis
+Name[lv]=Binārs
+Name[nb]=Binært
Name[nds]=Bineer
Name[nl]=Binair
Name[oc]=Binari
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kabc/kabc_manager.desktop new/kdepimlibs-3.96.3/kabc/kabc_manager.desktop
--- old/kdepimlibs-3.96.2/kabc/kabc_manager.desktop 2007-11-27 18:19:53.000000000 +0100
+++ new/kdepimlibs-3.96.3/kabc/kabc_manager.desktop 2007-12-04 13:13:37.000000000 +0100
@@ -13,6 +13,8 @@
Name[hu]=Partnerek
Name[ja]=コンタクト
Name[lt]=Kontaktai
+Name[lv]=Kontakti
+Name[nb]=Kontakter
Name[nds]=Kontakten
Name[nl]=Contactpersonen
Name[oc]=Contactes
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kabc/plugins/dir/dir.desktop new/kdepimlibs-3.96.3/kabc/plugins/dir/dir.desktop
--- old/kdepimlibs-3.96.2/kabc/plugins/dir/dir.desktop 2007-11-27 18:19:52.000000000 +0100
+++ new/kdepimlibs-3.96.3/kabc/plugins/dir/dir.desktop 2007-12-04 13:13:37.000000000 +0100
@@ -13,6 +13,8 @@
Name[hu]=Könyvtár
Name[ja]=ディレクトリ
Name[lt]=Aplankas
+Name[lv]=Direktorija
+Name[nb]=Mappe
Name[nds]=Orner
Name[nl]=Map
Name[oc]=Repertòri
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kabc/plugins/file/file.desktop new/kdepimlibs-3.96.3/kabc/plugins/file/file.desktop
--- old/kdepimlibs-3.96.2/kabc/plugins/file/file.desktop 2007-11-27 18:19:52.000000000 +0100
+++ new/kdepimlibs-3.96.3/kabc/plugins/file/file.desktop 2007-12-04 13:13:37.000000000 +0100
@@ -13,6 +13,8 @@
Name[hu]=Fájl
Name[ja]=ファイル
Name[lt]=Failas
+Name[lv]=Fails
+Name[nb]=Fil
Name[nds]=Datei
Name[nl]=Bestand
Name[oc]=Fichièr
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kabc/plugins/net/net.desktop new/kdepimlibs-3.96.3/kabc/plugins/net/net.desktop
--- old/kdepimlibs-3.96.2/kabc/plugins/net/net.desktop 2007-11-27 18:19:52.000000000 +0100
+++ new/kdepimlibs-3.96.3/kabc/plugins/net/net.desktop 2007-12-04 13:13:37.000000000 +0100
@@ -13,6 +13,8 @@
Name[hu]=Hálózat
Name[ja]=ネットワーク
Name[lt]=Tinklas
+Name[lv]=Tīkls
+Name[nb]=Nettverk
Name[nds]=Nettwark
Name[nl]=Netwerk
Name[oc]=Ret
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kabc/resource.h new/kdepimlibs-3.96.3/kabc/resource.h
--- old/kdepimlibs-3.96.2/kabc/resource.h 2007-10-08 09:43:53.000000000 +0200
+++ new/kdepimlibs-3.96.3/kabc/resource.h 2007-12-04 13:13:37.000000000 +0100
@@ -71,8 +71,6 @@
@short Resource Iterator
This class provides an iterator for resource entries.
- By default it points to a QValueList<Addressee>::Iterator,
- but you can reimplement this class to fit your own needs.
*/
class ConstIterator;
class KABC_EXPORT Iterator
@@ -249,6 +247,16 @@
};
/**
+ * Typedef for STL style iterator
+ */
+ typedef Iterator iterator;
+
+ /**
+ * Typedef for STL style iterator
+ */
+ typedef ConstIterator const_iterator;
+
+ /**
Default constructor.
*/
Resource();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kblog/gdata.cpp new/kdepimlibs-3.96.3/kblog/gdata.cpp
--- old/kdepimlibs-3.96.2/kblog/gdata.cpp 2007-10-24 14:17:26.000000000 +0200
+++ new/kdepimlibs-3.96.3/kblog/gdata.cpp 2007-12-04 13:13:37.000000000 +0100
@@ -26,7 +26,6 @@
#include
#include
-#include
#include
#include
@@ -213,19 +212,19 @@
atomMarkup += ".post-"+post->postId()+"</id>";
atomMarkup += "<published>"+post->creationDateTime().toString() +"</published>";
atomMarkup += "<updated>"+post->modificationDateTime().toString()+"</updated>";
- atomMarkup += "<title type='text'>"+post->title().toUtf8() +"</title>";
- if( !post->isPrivate() )
+ atomMarkup += "<title type='text'>"+post->title() +"</title>";
+ if( post->isPrivate() )
{
- atomMarkup += "http://purl.org/atom/app#'>";
+ atomMarkup += "";
atomMarkup += "app:draftyes";
}
atomMarkup += "<content type='xhtml'>";
atomMarkup += "<div xmlns='http://www.w3.org/1999/xhtml'>";
- atomMarkup += post->content().toUtf8();
+ atomMarkup += post->content();
atomMarkup += "</div></content>";
atomMarkup += "<author>";
- atomMarkup += "<name>" + fullName().toUtf8() + "</name>";
- atomMarkup += "<email>" + username().toUtf8() + "</email>";
+ atomMarkup += "<name>" + fullName() + "</name>";
+ atomMarkup += "<email>" + username() + "</email>";
atomMarkup += "</author>";
atomMarkup += "</entry>";
QByteArray postData;
@@ -271,19 +270,19 @@
}
QString atomMarkup = "<entry xmlns='http://www.w3.org/2005/Atom'>";
- atomMarkup += "<title type='text'>"+post->title().toUtf8() +"</title>";
+ atomMarkup += "<title type='text'>"+post->title() +"</title>";
if( post->isPrivate() )
{
- atomMarkup += "http://purl.org/atom/app#'>";
+ atomMarkup += "";
atomMarkup += "app:draftyes";
}
atomMarkup += "<content type='xhtml'>";
atomMarkup += "<div xmlns='http://www.w3.org/1999/xhtml'>";
- atomMarkup += post->content().toUtf8(); // FIXME check for Utf
+ atomMarkup += post->content(); // FIXME check for Utf
atomMarkup += "</div></content>";
atomMarkup += "<author>";
- atomMarkup += "<name>" + fullName().toUtf8() + "</name>";
- atomMarkup += "<email>" + username().toUtf8() + "</email>";
+ atomMarkup += "<name>" + fullName() + "</name>";
+ atomMarkup += "<email>" + username() + "</email>";
atomMarkup += "</author>";
atomMarkup += "</entry>";
@@ -376,14 +375,15 @@
return;
}
QString atomMarkup = "<entry xmlns='http://www.w3.org/2005/Atom'>";
- atomMarkup += ""+comment->title().toUtf8()+"</title>";
- atomMarkup += ""+comment->content().toUtf8()+"</content>";
+ atomMarkup += ""+comment->title()+"</title>";
+ atomMarkup += ""+comment->content()+"</content>";
atomMarkup += "<author>";
atomMarkup += "<name>"+comment->name()+"</name>";
atomMarkup += "<email>"+comment->email()+"</email>";
atomMarkup += "</author></entry>";
QByteArray postData;
+ kDebug()<< postData;
QDataStream stream( &postData, QIODevice::WriteOnly );
stream.writeRawData( atomMarkup.toUtf8(), atomMarkup.toUtf8().length() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kblog/tests/testgdata.cpp new/kdepimlibs-3.96.3/kblog/tests/testgdata.cpp
--- old/kdepimlibs-3.96.2/kblog/tests/testgdata.cpp 2007-10-03 13:30:06.000000000 +0200
+++ new/kdepimlibs-3.96.3/kblog/tests/testgdata.cpp 2007-12-04 13:13:37.000000000 +0100
@@ -44,7 +44,7 @@
public Q_SLOTS:
// use this functions as a chain to go through network traffic.
void fetchProfileId( const QString & );
- void listBlogs( const QMap >& );
+ void listBlogs( const QList >& );
void listRecentPosts( const QListKBlog::BlogPost& posts );
void createPost( KBlog::BlogPost* post );
void createComment( const KBlog::BlogPost* post, const KBlog::BlogComment *comment );
@@ -161,21 +161,20 @@
qDebug() << "# profileId: " << pid;
qDebug() << "##############################\n";
- connect( b, SIGNAL( listedBlogs( const QMap >& ) ),
- this, SLOT( listBlogs( const QMap >& ) ) );
+ connect( b, SIGNAL( listedBlogs( const QList >& ) ),
+ this, SLOT( listBlogs( const QList >& ) ) );
b->listBlogs();
listBlogsTimer->start( TIMEOUT );
}
-void TestGData::listBlogs( const QMap >& listedBlogs )
+void TestGData::listBlogs( const QList >& listedBlogs )
{
listBlogsTimer->stop();
- QList<QString> keys = listedBlogs.keys();
qDebug() << "########### listBlogs ###########";
- QList<QString>::ConstIterator it = keys.begin();
- QList<QString>::ConstIterator end = keys.end();
+ QList >::ConstIterator it = listedBlogs.begin();
+ QList >::ConstIterator end = listedBlogs.end();
for ( ; it != end; ++it ) {
- qDebug() << "# " << ( *it );
+ qDebug() << "# " << ( *it ).values().first();
}
qDebug() << "###########################\n";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/calendar.h new/kdepimlibs-3.96.3/kcal/calendar.h
--- old/kdepimlibs-3.96.2/kcal/calendar.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.3/kcal/calendar.h 2007-12-04 13:13:36.000000000 +0100
@@ -969,6 +969,8 @@
*/
void unregisterObserver( CalendarObserver *observer );
+ using QObject::event; // prevent warning about hidden virtual method
+
Q_SIGNALS:
/**
Signals that the calendar has been modified.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/calendarlocal.h new/kdepimlibs-3.96.3/kcal/calendarlocal.h
--- old/kdepimlibs-3.96.2/kcal/calendarlocal.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.3/kcal/calendarlocal.h 2007-12-04 13:13:36.000000000 +0100
@@ -273,6 +273,8 @@
*/
void incidenceUpdated( IncidenceBase *incidenceBase );
+ using QObject::event; // prevent warning about hidden virtual method
+
private:
//@cond PRIVATE
class Private;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/calendarnull.h new/kdepimlibs-3.96.3/kcal/calendarnull.h
--- old/kdepimlibs-3.96.2/kcal/calendarnull.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.3/kcal/calendarnull.h 2007-12-04 13:13:36.000000000 +0100
@@ -249,6 +249,8 @@
*/
void incidenceUpdated( IncidenceBase *incidenceBase );
+ using QObject::event; // prevent warning about hidden virtual method
+
private:
//@cond PRIVATE
class Private;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/calendarresources.h new/kdepimlibs-3.96.3/kcal/calendarresources.h
--- old/kdepimlibs-3.96.2/kcal/calendarresources.h 2007-08-29 11:51:22.000000000 +0200
+++ new/kdepimlibs-3.96.3/kcal/calendarresources.h 2007-12-04 13:13:36.000000000 +0100
@@ -594,6 +594,8 @@
*/
Alarm::List alarmsTo( const KDateTime &to );
+ using QObject::event; // prevent warning about hidden virtual method
+
Q_SIGNALS:
/**
Signals that the Resource has been modified.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/icaltimezones.cpp new/kdepimlibs-3.96.3/kcal/icaltimezones.cpp
--- old/kdepimlibs-3.96.2/kcal/icaltimezones.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.3/kcal/icaltimezones.cpp 2007-12-04 13:13:36.000000000 +0100
@@ -1,7 +1,7 @@
/*
This file is part of the kcal library.
- Copyright (c) 2005-2007 David Jarvie
+ Copyright (c) 2005-2007 David Jarvie
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -414,6 +414,17 @@
// Found a phase combination which hasn't yet been processed
int preOffset = (i > 0) ? transits[i-1].phase().utcOffset() : rhs.previousUtcOffset();
KTimeZone::Phase phase = transits[i].phase();
+ if (phase.utcOffset() == preOffset) {
+ transitionsDone[i] = true;
+ while ( ++i < trcount ) {
+ if (transitionsDone[i]
+ || transits[i].phase() != phase
+ || transits[i-1].phase().utcOffset() != preOffset)
+ continue;
+ transitionsDone[i] = true;
+ }
+ continue;
+ }
icalcomponent *phaseComp = icalcomponent_new( phase.isDst() ?
ICAL_XDAYLIGHT_COMPONENT : ICAL_XSTANDARD_COMPONENT );
QList<QByteArray> abbrevs = phase.abbreviations();
@@ -467,9 +478,11 @@
|| transits[i].phase() != phase
|| transits[i-1].phase().utcOffset() != preOffset)
continue;
- newRule = rule;
transitionsDone[i] = true;
qdt = transits[i].time();
+ if (!qdt.isValid())
+ continue;
+ newRule = rule;
times += qdt;
date = qdt.date();
if (qdt.time() != time
@@ -497,26 +510,26 @@
// Write all the times up to but not including the current one.
// First check whether any of the last RDATE values fit this rule.
int yr = times[0].date().year();
- while (!rdates.isEmpty()) {
+ while (!rdates.isEmpty()) {
qdt = rdates.last();
- date = qdt.date();
- if (qdt.time() != time
+ date = qdt.date();
+ if (qdt.time() != time
|| date.month() != month
- || date.year() != --yr)
+ || date.year() != --yr)
break;
- int day = date.day();
+ int day = date.day();
if (rule & DAY_OF_MONTH) {
if (day != dayOfMonth)
break;
- } else {
+ } else {
if (date.dayOfWeek() != dayOfWeek
|| (rule & WEEKDAY_OF_MONTH) && (day - 1)/7 + 1 != nthFromStart
|| (rule & LAST_WEEKDAY_OF_MONTH) && (daysInMonth - day)/7 + 1 != nthFromEnd)
- break;
- }
- times.prepend(qdt);
- rdates.pop_back();
- }
+ break;
+ }
+ times.prepend(qdt);
+ rdates.pop_back();
+ }
if (times.count() > (useNewRRULE ? minPhaseCount : minRuleCount)) {
// There are enough dates to combine into an RRULE
icalrecurrencetype r;
@@ -644,7 +657,9 @@
QByteArray ICalTimeZoneSourcePrivate::icalTzidPrefix;
//@endcond
-ICalTimeZoneSource::ICalTimeZoneSource() : d( 0 )
+ICalTimeZoneSource::ICalTimeZoneSource()
+ : KTimeZoneSource( false ),
+ d( 0 )
{
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/icaltimezones.h new/kdepimlibs-3.96.3/kcal/icaltimezones.h
--- old/kdepimlibs-3.96.2/kcal/icaltimezones.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.3/kcal/icaltimezones.h 2007-12-04 13:13:36.000000000 +0100
@@ -1,7 +1,7 @@
/*
This file is part of the kcal library.
- Copyright (c) 2005-2007 David Jarvie
+ Copyright (c) 2005-2007 David Jarvie
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -411,6 +411,8 @@
*/
static QByteArray icalTzidPrefix();
+ using KTimeZoneSource::parse; // prevent warning about hidden virtual method
+
private:
ICalTimeZoneSourcePrivate *const d;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/incidence.h new/kdepimlibs-3.96.3/kcal/incidence.h
--- old/kdepimlibs-3.96.2/kcal/incidence.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.3/kcal/incidence.h 2007-12-04 13:13:36.000000000 +0100
@@ -89,6 +89,8 @@
}
private:
+ bool visit( FreeBusy * ) { return false; } // prevent warning about hidden virtual method
+
T *mResource;
};
//@endcond
@@ -122,6 +124,8 @@
}
private:
+ bool visit( FreeBusy * ) { return false; } // prevent warning about hidden virtual method
+
T *mResource;
};
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/kcal_manager.desktop new/kdepimlibs-3.96.3/kcal/kcal_manager.desktop
--- old/kdepimlibs-3.96.2/kcal/kcal_manager.desktop 2007-11-27 18:19:52.000000000 +0100
+++ new/kdepimlibs-3.96.3/kcal/kcal_manager.desktop 2007-12-04 13:13:36.000000000 +0100
@@ -13,6 +13,8 @@
Name[hu]=Naptár
Name[ja]=カレンダー
Name[lt]=Kalendorius
+Name[lv]=Kalendārs
+Name[nb]=Kalender
Name[nds]=Kalenner
Name[nl]=Agenda
Name[oc]=Calendièr
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/local.desktop new/kdepimlibs-3.96.3/kcal/local.desktop
--- old/kdepimlibs-3.96.2/kcal/local.desktop 2007-11-27 18:19:52.000000000 +0100
+++ new/kdepimlibs-3.96.3/kcal/local.desktop 2007-12-04 13:13:36.000000000 +0100
@@ -12,6 +12,8 @@
Name[hu]=Helyi naptárfájl
Name[ja]=ローカルファイルのカレンダー
Name[lt]=Kalendorius vietiniame faile
+Name[lv]=Kalendārs lokālā failā
+Name[nb]=Kalender i lokal fil
Name[nds]=Kalenner in en lokale Datei
Name[nl]=Agenda in lokaal bestand
Name[pa]=ਲੋਕਲ ਫਾਇਲ 'ਚ ਕੈਲੰਡਰ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/localdir.desktop new/kdepimlibs-3.96.3/kcal/localdir.desktop
--- old/kdepimlibs-3.96.2/kcal/localdir.desktop 2007-11-27 18:19:52.000000000 +0100
+++ new/kdepimlibs-3.96.3/kcal/localdir.desktop 2007-12-04 13:13:36.000000000 +0100
@@ -12,6 +12,8 @@
Name[hu]=Naptár helyi könyvtárban
Name[ja]=ローカルディレクトリのカレンダー
Name[lt]=Kalendorius vietiniame aplanke
+Name[lv]=Kalendārs lokālā direktorijā
+Name[nb]=Kalender i lokal mappe
Name[nds]=Kalenner in'n lokalen Orner
Name[nl]=Agenda in lokale map
Name[pa]=ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ 'ਚ ਕੈਲੰਡਰ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/resourcecached.h new/kdepimlibs-3.96.3/kcal/resourcecached.h
--- old/kdepimlibs-3.96.2/kcal/resourcecached.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.3/kcal/resourcecached.h 2007-12-04 13:13:36.000000000 +0100
@@ -1,7 +1,7 @@
/*
This file is part of the kcal library.
- Copyright (c) 2006 David Jarvie
+ Copyright (c) 2006 David Jarvie
Copyright (c) 2003,2004 Cornelius Schumacher
This library is free software; you can redistribute it and/or
@@ -416,6 +416,8 @@
*/
KRES::IdMapper &idMapper();
+ using QObject::event; // prevent warning about hidden virtual method
+
protected:
CalendarLocal *calendar() const;
@@ -507,6 +509,7 @@
// Inherited virtual methods which should not be used by derived classes.
virtual bool doLoad();
virtual bool doSave();
+ virtual bool doSave( Incidence * ) { return 0; }
//@cond PRIVATE
class Private;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/resourcecalendar.h new/kdepimlibs-3.96.3/kcal/resourcecalendar.h
--- old/kdepimlibs-3.96.2/kcal/resourcecalendar.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.3/kcal/resourcecalendar.h 2007-12-04 13:13:36.000000000 +0100
@@ -526,6 +526,8 @@
*/
bool noReadOnlyOnLoad() const;
+ using QObject::event; // prevent warning about hidden virtual method
+
private:
//@cond PRIVATE
class Private;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/resourcelocal.cpp new/kdepimlibs-3.96.3/kcal/resourcelocal.cpp
--- old/kdepimlibs-3.96.2/kcal/resourcelocal.cpp 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.3/kcal/resourcelocal.cpp 2007-12-04 13:13:36.000000000 +0100
@@ -171,6 +171,11 @@
return success;
}
+bool ResourceLocal::doSave( bool syncCache, Incidence * incidence )
+{
+ return ResourceCached::doSave( syncCache, incidence );
+}
+
KABC::Lock *ResourceLocal::lock()
{
return d->mLock;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/resourcelocaldir.h new/kdepimlibs-3.96.3/kcal/resourcelocaldir.h
--- old/kdepimlibs-3.96.2/kcal/resourcelocaldir.h 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.3/kcal/resourcelocaldir.h 2007-12-04 13:13:36.000000000 +0100
@@ -84,6 +84,10 @@
virtual bool doFileLoad( CalendarLocal &cal, const QString &fileName );
private:
+ // Inherited virtual methods which should not be used by derived classes.
+ using ResourceCalendar::doLoad;
+ using ResourceCalendar::doSave;
+
//@cond PRIVATE
class Private;
Private *const d;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/resourcelocal.h new/kdepimlibs-3.96.3/kcal/resourcelocal.h
--- old/kdepimlibs-3.96.2/kcal/resourcelocal.h 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.96.3/kcal/resourcelocal.h 2007-12-04 13:13:36.000000000 +0100
@@ -134,6 +134,11 @@
Actually saves the data to the local file.
**/
virtual bool doSave( bool syncCache );
+ /**
+ @copydoc
+ ResourceCached::doSave(bool, Incidence*)
+ */
+ virtual bool doSave( bool syncCache, Incidence * );
/**
Called by reload() to reload the resource, if it is already open.
@@ -165,6 +170,10 @@
ResourceLocal &operator=( const ResourceLocal &other );
private:
+ // Inherited virtual methods which should not be used by derived classes.
+ using ResourceCalendar::doLoad;
+ using ResourceCalendar::doSave;
+
void init();
//@cond PRIVATE
class Private;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/todo.cpp new/kdepimlibs-3.96.3/kcal/todo.cpp
--- old/kdepimlibs-3.96.2/kcal/todo.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.96.3/kcal/todo.cpp 2007-12-04 13:13:36.000000000 +0100
@@ -285,6 +285,11 @@
}
}
+QString Todo::dtStartTimeStr( bool shortfmt, const KDateTime::Spec &spec ) const
+{
+ return Incidence::dtStartTimeStr( shortfmt, spec );
+}
+
QString Todo::dtStartDateStr( bool shortfmt, bool first, const KDateTime::Spec &spec ) const
{
if ( spec.isValid() ) {
@@ -305,6 +310,11 @@
}
}
+QString Todo::dtStartDateStr( bool shortfmt, const KDateTime::Spec &spec ) const
+{
+ return Incidence::dtStartDateStr( shortfmt, spec );
+}
+
QString Todo::dtStartStr( bool shortfmt, bool first, const KDateTime::Spec &spec ) const
{
if ( spec.isValid() ) {
@@ -325,6 +335,11 @@
}
}
+QString Todo::dtStartStr( bool shortfmt, const KDateTime::Spec &spec ) const
+{
+ return Incidence::dtStartStr( shortfmt, spec );
+}
+
bool Todo::isCompleted() const
{
if ( d->mPercentComplete == 100 ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kcal/todo.h new/kdepimlibs-3.96.3/kcal/todo.h
--- old/kdepimlibs-3.96.2/kcal/todo.h 2007-08-29 11:51:22.000000000 +0200
+++ new/kdepimlibs-3.96.3/kcal/todo.h 2007-12-04 13:13:36.000000000 +0100
@@ -153,13 +153,18 @@
void setHasStartDate( bool hasStartDate );
/**
+ @copydoc
+ IncidenceBase::dtStart()
+ */
+ virtual KDateTime dtStart() const { return dtStart( false ); }
+ /**
Returns the start date of the todo.
@param first If true, the start date of the todo will be returned. If the
todo recurs, the start date of the first occurrence will be returned.
If false and the todo recurs, the relative start date will be returned,
based on the date returned by dtRecurrence().
*/
- KDateTime dtStart( bool first = false ) const;
+ KDateTime dtStart( bool first ) const;
/**
Sets the start date of the todo.
@@ -180,10 +185,17 @@
@param spec If set, returns the time in the given spec, else use the
todo's current spec.
*/
- QString dtStartTimeStr( bool shortfmt = true, bool first = false,
+ QString dtStartTimeStr( bool shortfmt, bool first,
const KDateTime::Spec &spec = KDateTime::Spec() ) const;
/**
+ @copydoc
+ IncidenceBase::dtStartTimeStr()
+ */
+ virtual QString dtStartTimeStr( bool shortfmt = true,
+ const KDateTime::Spec &spec = KDateTime::Spec() ) const;
+
+ /**
Returns a todo's starting date as a string formatted according to the
user's locale settings.
@@ -195,10 +207,17 @@
@param spec If set, returns the date in the given spec, else use the
todo's current spec.
*/
- QString dtStartDateStr( bool shortfmt = true, bool first = false,
+ QString dtStartDateStr( bool shortfmt, bool first,
const KDateTime::Spec &spec = KDateTime::Spec() ) const;
/**
+ @copydoc
+ IncidenceBase::dtStartDateStr()
+ */
+ virtual QString dtStartDateStr( bool shortfmt = true,
+ const KDateTime::Spec &spec = KDateTime::Spec() ) const;
+
+ /**
Returns a todo's starting date and time as a string formatted according
to the user's locale settings.
@@ -210,10 +229,17 @@
@param spec If set, returns the date and time in the given spec, else
use the todo's current spec.
*/
- QString dtStartStr( bool shortfmt = true, bool first = false,
+ QString dtStartStr( bool shortfmt, bool first,
const KDateTime::Spec &spec = KDateTime::Spec() ) const;
/**
+ @copydoc
+ IncidenceBase::dtStartStr()
+ */
+ virtual QString dtStartStr( bool shortfmt = true,
+ const KDateTime::Spec &spec = KDateTime::Spec() ) const;
+
+ /**
Returns true if the todo is 100% completed, otherwise return false.
@see setCompleted(), percentComplete()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kioslave/sieve/sieve.protocol new/kdepimlibs-3.96.3/kioslave/sieve/sieve.protocol
--- old/kdepimlibs-3.96.2/kioslave/sieve/sieve.protocol 2007-11-27 18:19:52.000000000 +0100
+++ new/kdepimlibs-3.96.3/kioslave/sieve/sieve.protocol 2007-12-04 13:13:36.000000000 +0100
@@ -21,7 +21,9 @@
Description[ga]=ioslave le haghaidh prótacail scagtha ríomhphoist Sieve
Description[hu]=KDE-protokoll a Sieve levélszűrő protokollhoz
Description[ja]=Sieve メールフィルタリングプロトコルのための ioslave
+Description[nb]=En ioslave for Sieve e-postfiltrering
Description[nds]=In-/Utgaavmoduul för't Nettpostfilter-Protokoll Sieve
+Description[nl]=Een KIO-slave voor het Sieve-mail filterprotocol
Description[pl]=Moduł ioslave dla protokołu filtrowania poczty Sieve
Description[pt]=Um 'ioslave' para o protocolo de filtragem de correio Sieve
Description[sv]=En I/O-slav för brevfiltreringsprotokollet Sieve
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kpimidentities/identitymanager.h new/kdepimlibs-3.96.3/kpimidentities/identitymanager.h
--- old/kdepimlibs-3.96.2/kpimidentities/identitymanager.h 2007-10-08 09:43:51.000000000 +0200
+++ new/kdepimlibs-3.96.3/kpimidentities/identitymanager.h 2007-12-04 13:13:35.000000000 +0100
@@ -56,6 +56,16 @@
typedef QList<Identity>::Iterator Iterator;
typedef QList<Identity>::ConstIterator ConstIterator;
+ /**
+ * Typedef for STL style iterator
+ */
+ typedef Iterator iterator;
+
+ /**
+ * Typedef for STL style iterator
+ */
+ typedef ConstIterator const_iterator;
+
/** Commit changes to disk and emit changed() if necessary. */
void commit();
/** Re-read the config from disk and forget changes. */
@@ -126,8 +136,8 @@
**/
Identity &modifyIdentityForUoid( uint uoid );
- /** Removes the identity with name @p identityName
- Will return false if the identity is not found,
+ /** Removes the identity with name @p identityName
+ Will return false if the identity is not found,
or when one tries to remove the last identity.
**/
bool removeIdentity( const QString &identityName );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kresources/kresources.desktop new/kdepimlibs-3.96.3/kresources/kresources.desktop
--- old/kdepimlibs-3.96.2/kresources/kresources.desktop 2007-11-27 18:19:52.000000000 +0100
+++ new/kdepimlibs-3.96.3/kresources/kresources.desktop 2007-12-04 13:13:36.000000000 +0100
@@ -21,6 +21,8 @@
Name[hu]=KDE-erőforrások
Name[ja]=KDE リソース
Name[lt]=KDE resursai
+Name[lv]=KDE resursi
+Name[nb]=KDE-ressurser
Name[nds]=KDE Ressourcen
Name[nl]=KDE-hulpbronnen
Name[pa]=KDE ਸਰੋਤ
@@ -46,6 +48,8 @@
Comment[hu]=A KDE-erőforrások beállítása
Comment[ja]=KDE リソースの設定
Comment[lt]=Konfigūruoti KDE resursus
+Comment[lv]=Konfigurē KDE resursus
+Comment[nb]=Sett opp KDE-ressurser
Comment[nds]=KDE Ressourcen instellen
Comment[nl]=KDE-hulpbronnen instellen
Comment[pl]=Konfiguruj zasoby KDE
@@ -67,6 +71,7 @@
Keywords[ga]=acmhainní,acmhainn konnector,acmhainn teagmhála,acmhainn fhéilire,acmhainn nótaí,acmhainn aláraim,imap
Keywords[hu]=erőforrások,Konnector-erőforrás,névjegy,naptár,feljegyzés,emlékeztető,imap
Keywords[ja]=リソース,konnector resource, コネクターリソース,コンタクトリソース,カレンダーリソース, メモリソース,アラームリソースimap
+Keywords[nb]=ressurser,konnector ressurs,kontaktressurs,kalenderressurs,notes-ressurs,varslingsressurs,imap
Keywords[nds]=Ressourcen,konnector-Ressource,Kontakt-Ressource,Kalenner-Ressource,Notiz-Ressource,Alarm-Ressource,IMAP
Keywords[nl]=hulpbronnen,konnector-hulpbron,contactpersoonhulpbron,agendahulpbron,notitiehulpbron,herinneringhulpbron,imap
Keywords[pl]=zasoby,zasoby konnectora,zasoby kontaktów,zasoby kalendarza,zasoby notatek,zasoby alarmu,imap
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kresources/kresources_manager.desktop new/kdepimlibs-3.96.3/kresources/kresources_manager.desktop
--- old/kdepimlibs-3.96.2/kresources/kresources_manager.desktop 2007-11-27 18:19:52.000000000 +0100
+++ new/kdepimlibs-3.96.3/kresources/kresources_manager.desktop 2007-12-04 13:13:36.000000000 +0100
@@ -13,6 +13,8 @@
Comment[hu]=Erőforráskezelő
Comment[ja]=K リソースマネージャ
Comment[lt]=KResouse tvarkyklė
+Comment[lv]=KResource pārvaldnieks
+Comment[nb]=KResource-styring
Comment[nds]=KResource-Pleger
Comment[nl]=KResource-beheerder
Comment[pa]=ਕੇ-ਰੀਸੋਰਸ ਮੈਨੇਜਰ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kresources/kresources_plugin.desktop new/kdepimlibs-3.96.3/kresources/kresources_plugin.desktop
--- old/kdepimlibs-3.96.2/kresources/kresources_plugin.desktop 2007-11-27 18:19:52.000000000 +0100
+++ new/kdepimlibs-3.96.3/kresources/kresources_plugin.desktop 2007-12-04 13:13:36.000000000 +0100
@@ -13,6 +13,7 @@
Comment[hu]=Modul a KResource keretrendszerhez
Comment[ja]=K リソース・フレームワーク・プラグイン
Comment[lt]=KResource struktūros priedas
+Comment[nb]=Programtillegg for KResource-rammeverket
Comment[nds]=Rahmenwark-Moduul för KResource
Comment[nl]=KResource-raamwerkplugin
Comment[pl]=Wtyczka KResource
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/kresources/manager.h new/kdepimlibs-3.96.3/kresources/manager.h
--- old/kdepimlibs-3.96.2/kresources/manager.h 2007-08-29 11:51:20.000000000 +0200
+++ new/kdepimlibs-3.96.3/kresources/manager.h 2007-12-04 13:13:36.000000000 +0100
@@ -127,6 +127,11 @@
};
/**
+ Typedef for STL style iterator
+ */
+ typedef Iterator iterator;
+
+ /**
Return Iterator on first resource. If there is no resource returns end().
*/
Iterator begin()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.2/mailtransport/kcm_mailtransport.desktop new/kdepimlibs-3.96.3/mailtransport/kcm_mailtransport.desktop
--- old/kdepimlibs-3.96.2/mailtransport/kcm_mailtransport.desktop 2007-11-27 18:19:52.000000000 +0100
+++ new/kdepimlibs-3.96.3/mailtransport/kcm_mailtransport.desktop 2007-12-04 13:13:37.000000000 +0100
@@ -24,6 +24,8 @@
Name[ga]=Iompar Ríomhphoist
Name[hu]=Levéltovábbítás
Name[ja]=メール送信方法
+Name[lv]=Pasta transports
+Name[nb]=E-post-transport
Name[nds]=Överdreegmetood
Name[nl]=E-mailtransport
Name[pl]=Przekazywanie poczty
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org