[Kde-pim] branches/work/kdab-post-4.0/kdepimlibs
Till Adam
adam at kde.org
Sat Nov 10 14:07:12 GMT 2007
SVN commit 734924 by tilladam:
Merged revisions 733086-734920 via svnmerge from
svn+ssh://tilladam@svn.kde.org/home/kde/trunk/KDE/kdepimlibs
........
r733090 | winterz | 2007-11-05 14:58:30 +0100 (Mon, 05 Nov 2007) | 3 lines
speedup:
in rawEventsForDate(), create the KDateTime version of the date outside of the outer loop.
........
r733468 | mlaurent | 2007-11-06 13:05:22 +0100 (Tue, 06 Nov 2007) | 2 lines
Fix mem leak
........
r734459 | djarvie | 2007-11-08 23:32:36 +0100 (Thu, 08 Nov 2007) | 3 lines
Fix bug in Incidence copy constructor: the new ...IsRich members weren't copied.
Initialise members instead of assigning.
........
r734468 | mueller | 2007-11-08 23:49:41 +0100 (Thu, 08 Nov 2007) | 2 lines
fix FSF address
........
r734659 | winterz | 2007-11-09 15:09:20 +0100 (Fri, 09 Nov 2007) | 3 lines
We can never allow non-LGPL/BSD/X11 libraries. Period.
CCMAIL: kde-pim at kde.org
........
r734756 | djarvie | 2007-11-09 22:45:45 +0100 (Fri, 09 Nov 2007) | 1 line
Fix bug where the start date/time for date-only recurrences is not set
........
r734801 | djarvie | 2007-11-10 01:53:56 +0100 (Sat, 10 Nov 2007) | 2 lines
Comments
........
r734877 | djarvie | 2007-11-10 11:34:37 +0100 (Sat, 10 Nov 2007) | 2 lines
Move private class declarations out of public headers
........
_M . (directory)
M +0 -7 POLICIES
M +1 -1 kcal/calendarlocal.cpp
M +24 -3 kcal/incidence.cpp
M +1 -1 kcal/libical/vzic-1.3/test-vzic.c
M +1 -1 kcal/libical/vzic-1.3/vzic-dump.c
M +1 -1 kcal/libical/vzic-1.3/vzic-dump.h
M +1 -1 kcal/libical/vzic-1.3/vzic-dump.pl
M +1 -1 kcal/libical/vzic-1.3/vzic-merge.pl
M +1 -1 kcal/libical/vzic-1.3/vzic-output.c
M +1 -1 kcal/libical/vzic-1.3/vzic-output.h
M +1 -1 kcal/libical/vzic-1.3/vzic-parse.c
M +1 -1 kcal/libical/vzic-1.3/vzic-parse.h
M +1 -1 kcal/libical/vzic-1.3/vzic-test.pl
M +1 -1 kcal/libical/vzic-1.3/vzic.c
M +1 -1 kcal/libical/vzic-1.3/vzic.h
M +7 -11 kcal/recurrence.cpp
M +10 -0 kcal/resourcecachedconfig.cpp
M +2 -1 kcal/resourcecachedconfig.h
M +3 -0 kcal/resourcelocal.cpp
M +0 -15 kcal/resourcelocal.h
A kcal/resourcelocal_p.h trunk/KDE/kdepimlibs/kcal/resourcelocal_p.h#734877 [License: LGPL (v2+)]
M +1 -0 kcal/resourcelocalconfig.cpp
M +1 -1 kcal/resourcelocaldir.cpp
M +0 -35 kcal/resourcelocaldir.h
A kcal/resourcelocaldir_p.h trunk/KDE/kdepimlibs/kcal/resourcelocaldir_p.h#734877 [License: LGPL (v2+)]
M +1 -0 kcal/resourcelocaldirconfig.cpp
** branches/work/kdab-post-4.0/kdepimlibs #property svnmerge-integrated
- /trunk/KDE/kdepimlibs:1-733085
+ /trunk/KDE/kdepimlibs:1-734920
--- branches/work/kdab-post-4.0/kdepimlibs/POLICIES #734923:734924
@@ -43,14 +43,7 @@
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
kdepimlibs code will require a dependency on kdelibs, but no other
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/calendarlocal.cpp #734923:734924
@@ -354,6 +354,7 @@
{
Event::List eventList;
KDateTime::Spec ts = timespec.isValid() ? timespec : timeSpec();
+ KDateTime kdt( qd, ts );
QHashIterator<QString, Event *>i( d->mEvents );
Event *event;
@@ -376,7 +377,6 @@
}
}
} else {
- KDateTime kdt( qd, ts );
if ( event->dtStart() <= kdt ) {
KDateTime end( event->dtEnd().toTimeSpec( event->dtStart() ) );
if ( event->allDay() ) {
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/incidence.cpp #734923:734924
@@ -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
@@ -97,7 +120,7 @@
Incidence::Incidence( const Incidence &i )
: IncidenceBase( i ),
Recurrence::RecurrenceObserver(),
- d( new KCal::Incidence::Private )
+ d( new KCal::Incidence::Private( *i.d ) )
{
init( i );
}
@@ -145,8 +168,6 @@
} else {
d->mRecurrence = 0;
}
-
- d->mSchedulingID = i.d->mSchedulingID;
}
Incidence::~Incidence()
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/test-vzic.c #734923:734924
@@ -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.
*/
/*
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/vzic-dump.c #734923:734924
@@ -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.
*/
/*
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/vzic-dump.h #734923:734924
@@ -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.
*/
/*
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/vzic-dump.pl #734923:734924
@@ -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.
#
#
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/vzic-merge.pl #734923:734924
@@ -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.
#
#
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/vzic-output.c #734923:734924
@@ -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:
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/vzic-output.h #734923:734924
@@ -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_
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/vzic-parse.c #734923:734924
@@ -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 <ctype.h>
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/vzic-parse.h #734923:734924
@@ -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_
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/vzic-test.pl #734923:734924
@@ -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.
#
#
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/vzic.c #734923:734924
@@ -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 <stdio.h>
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/libical/vzic-1.3/vzic.h #734923:734924
@@ -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_
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/recurrence.cpp #734923:734924
@@ -576,19 +576,15 @@
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();
}
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/resourcecachedconfig.cpp #734923:734924
@@ -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 );
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/resourcecachedconfig.h #734923:734924
@@ -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 );
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/resourcelocal.cpp #734923:734924
@@ -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 <kdebug.h>
#include <klocale.h>
#include <kurl.h>
+#include <kdirwatch.h>
#include <kstandarddirs.h>
#include <kconfiggroup.h>
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/resourcelocal.h #734923:734924
@@ -34,17 +34,12 @@
#include <QtCore/QString>
#include <kdatetime.h>
-#include <kurl.h>
-#include <kdirwatch.h>
-#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
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/resourcelocalconfig.cpp #734923:734924
@@ -22,6 +22,7 @@
#include "resourcelocalconfig.h"
#include "resourcelocal.h"
+#include "resourcelocal_p.h"
#include "vcalformat.h"
#include "icalformat.h"
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/resourcelocaldir.cpp #734923:734924
@@ -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 <kdebug.h>
#include <klocale.h>
-#include <kurl.h>
#include <kconfig.h>
#include <kstandarddirs.h>
#include <kconfiggroup.h>
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/resourcelocaldir.h #734923:734924
@@ -24,17 +24,8 @@
#include "kcal_export.h"
#include "resourcecached.h"
-#include <kurl.h>
-#include <kdirwatch.h>
-
-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::fromPath( dirName );
- }
-
- void init( ResourceLocalDir *rdir );
- bool deleteIncidenceFile( Incidence *incidence );
- KABC::Lock *mLock;
- KUrl mURL;
- KDirWatch mDirWatch;
-};
-//@endcond
-
}
#endif
--- branches/work/kdab-post-4.0/kdepimlibs/kcal/resourcelocaldirconfig.cpp #734923:734924
@@ -21,6 +21,7 @@
#include "resourcelocaldirconfig.h"
#include "resourcelocaldir.h"
+#include "resourcelocaldir_p.h"
#include <klocale.h>
#include <kdebug.h>
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/
More information about the kde-pim
mailing list