Hello community,
here is the log from the commit of package kdepimlibs4
checked in at Thu Dec 20 16:35:31 CET 2007.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2007-12-05 18:11:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2007-12-20 13:06:32.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Dec 16 15:22:16 CET 2007 - dmueller@suse.de
+
+- update to 3.97.1
+
+-------------------------------------------------------------------
Old:
----
kdepimlibs-3.97.0.tar.bz2
New:
----
kdepimlibs-3.97.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.wC4125/_old 2007-12-20 16:35:20.000000000 +0100
+++ /var/tmp/diff_new_pack.wC4125/_new 2007-12-20 16:35:20.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 3.97.0)
+# spec file for package kdepimlibs4 (Version 3.97.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,12 +15,13 @@
Group: System/GUI/KDE
Summary: KDE PIM Libraries
Url: http://www.kde.org
-Version: 3.97.0
+Version: 3.97.1
Release: 1
-%define rversion 3.97.0
+%define rversion 3.97.1
Source0: kdepimlibs-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: libkdepimlibs4 >= %version
%description
This package contains the basic packages for KDE PIM applications.
@@ -53,7 +54,7 @@
%package -n libkdepimlibs4
Group: System/GUI/KDE
Summary: KDE PIM Libraries
-Requires: kdelibs4
+Requires: kdelibs4 >= %( echo `rpm -q --queryformat '%{VERSION}' libkde4-devel`)
%description -n libkdepimlibs4
This package contains the basic libraries for KDE PIM applications.
@@ -152,6 +153,8 @@
%_kde_share_dir/config.kcfg/mailtransport.kcfg
%changelog
+* Sun Dec 16 2007 - dmueller@suse.de
+- update to 3.97.1
* Wed Dec 05 2007 - dmueller@suse.de
- update to 3.97.0
* Tue Dec 04 2007 - dmueller@suse.de
++++++ kdepimlibs-3.97.0.tar.bz2 -> kdepimlibs-3.97.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kabc/formatfactory.cpp new/kdepimlibs-3.97.1/kabc/formatfactory.cpp
--- old/kdepimlibs-3.97.0/kabc/formatfactory.cpp 2007-11-20 23:00:45.000000000 +0100
+++ new/kdepimlibs-3.97.1/kabc/formatfactory.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -55,23 +55,13 @@
KLibrary *FormatFactory::Private::openLibrary( const QString &libName )
{
- KLibrary *library = 0;
-
- QString path = KLibLoader::findLibrary( libName );
-
- if ( path.isEmpty() ) {
- kDebug(5700) << "No format plugin library was found!";
- return 0;
- }
-
- library = KLibLoader::self()->library( path );
-
- if ( !library ) {
- kDebug(5700) << "Could not load library '" << libName << "'";
- return 0;
- }
-
- return library;
+ KLibrary *library = new KLibrary( libName );
+ if (library->load()) {
+ return library;
+ }
+ kDebug(5700) << library->errorString();
+ delete library;
+ return 0;
}
FormatFactory *FormatFactory::self()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kabc/scripts/addressee.src.cpp new/kdepimlibs-3.97.1/kabc/scripts/addressee.src.cpp
--- old/kdepimlibs-3.97.0/kabc/scripts/addressee.src.cpp 2007-08-29 11:51:23.000000000 +0200
+++ new/kdepimlibs-3.97.1/kabc/scripts/addressee.src.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -375,9 +375,11 @@
text = e;
else {
QRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" );
- if ( realName().indexOf( needQuotes ) != -1 )
- text = "\"" + realName() + "\" <" + e + '>';
- else
+ if ( realName().indexOf( needQuotes ) != -1 ) {
+ QString name = realName();
+ name.replace( "\"", "\\\"" );
+ text = "\"" + name + "\" <" + e + '>';
+ } else
text = realName() + " <" + e + '>';
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kabc/tests/addresseetest.cpp new/kdepimlibs-3.97.1/kabc/tests/addresseetest.cpp
--- old/kdepimlibs-3.97.0/kabc/tests/addresseetest.cpp 2007-06-27 12:40:46.000000000 +0200
+++ new/kdepimlibs-3.97.1/kabc/tests/addresseetest.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -332,4 +332,14 @@
QVERIFY( addressee1 == addressee2 );
}
+void AddresseeTest::fullEmailTest()
+{
+ KABC::Addressee a;
+ QStringList emails;
+ emails << "foo@bar.com";
+ a.setEmails( emails );
+ a.setFormattedName( "firstname \"nickname\" lastname" );
+ QCOMPARE( a.fullEmail(), QString( "\"firstname \\\"nickname\\\" lastname\" " ) );
+}
+
#include "addresseetest.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kabc/tests/addresseetest.h new/kdepimlibs-3.97.1/kabc/tests/addresseetest.h
--- old/kdepimlibs-3.97.0/kabc/tests/addresseetest.h 2007-05-03 10:36:20.000000000 +0200
+++ new/kdepimlibs-3.97.1/kabc/tests/addresseetest.h 2007-12-14 21:46:12.000000000 +0100
@@ -34,6 +34,7 @@
void differsTest();
void assignmentTest();
void serializeTest();
+ void fullEmailTest();
};
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kblog/wordpressbuggy.h new/kdepimlibs-3.97.1/kblog/wordpressbuggy.h
--- old/kdepimlibs-3.97.0/kblog/wordpressbuggy.h 2007-12-05 15:26:44.000000000 +0100
+++ new/kdepimlibs-3.97.1/kblog/wordpressbuggy.h 2007-12-14 21:46:12.000000000 +0100
@@ -39,14 +39,18 @@
class WordpressBuggyPrivate;
/**
@brief
- A class that can be used for access to Wordpress blogs. This is needed because
- of an ugly DateTime bug in Wordpress. Hopefully the bug will be fixed in the
- near feature. This class reimplements createPost and modifyPost from scratch
- to send the DateTime in a format like yyyyMMddThh:mm:ss which is not ISO
- conformant. The date is not extended, where the time is extended.
-
- The rest of the code is used from MovableType, as Wordpress implements
- MovableType. You should not use thiscode on non-Wordpress blogs.
+ A class that can be used for access to blogs (Wordpress < 2.4, Drupal <= 5.5
+ and most likely many more) which simply use the yyyyMMddThh:mm:ss
+ dateTime.iso8601 format stated on http://www.xmlrpc.com. This is only an example for
+ an ISO-8601 compatible format, but many blogs seem to assume exactly this format.
+ This class is needed because KXmlRpc::Client only has support for the extended
+ format yyyy-MM-ddThh:mm:ss which is also standard conform and makes more sense than
+ the mixture above. This class reimplements createPost and modifyPost from scratch
+ to send the dateTime in a compatible format (yyyyMMddThh:mm:ss).
+
+ The rest of the code is inherited from MovableType, as it does not use the dateTime
+ format.
+ The name is because this problem was first discovered with Wordpress.
@code
Blog* myblog = new WordpressBuggy("http://example.com/xmlrpc/gateway.php");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/calendarlocal.h new/kdepimlibs-3.97.1/kcal/calendarlocal.h
--- old/kdepimlibs-3.97.0/kcal/calendarlocal.h 2007-12-04 13:13:36.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/calendarlocal.h 2007-12-14 21:46:12.000000000 +0100
@@ -277,6 +277,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( CalendarLocal )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/calendarnull.h new/kdepimlibs-3.97.1/kcal/calendarnull.h
--- old/kdepimlibs-3.97.0/kcal/calendarnull.h 2007-12-04 13:13:36.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/calendarnull.h 2007-12-14 21:46:12.000000000 +0100
@@ -253,6 +253,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( CalendarNull )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/calendarresources.h new/kdepimlibs-3.97.1/kcal/calendarresources.h
--- old/kdepimlibs-3.97.0/kcal/calendarresources.h 2007-12-04 13:13:36.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/calendarresources.h 2007-12-14 21:46:12.000000000 +0100
@@ -101,6 +101,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( DestinationPolicy )
class Private;
Private *d;
//@endcond
@@ -132,6 +133,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( StandardDestinationPolicy )
class Private;
Private *d;
//@endcond
@@ -163,6 +165,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( AskDestinationPolicy )
class Private;
Private *d;
//@endcond
@@ -194,6 +197,7 @@
Ticket( ResourceCalendar *resource );
//@cond PRIVATE
+ Q_DISABLE_COPY( Ticket )
class Private;
Private *d;
//@endcond
@@ -696,6 +700,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( CalendarResources )
class Private;
Private *d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/calfilter.h new/kdepimlibs-3.97.1/kcal/calfilter.h
--- old/kdepimlibs-3.97.0/kcal/calfilter.h 2007-07-26 12:35:17.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/calfilter.h 2007-12-14 21:46:12.000000000 +0100
@@ -217,6 +217,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( CalFilter )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/calformat.h new/kdepimlibs-3.97.1/kcal/calformat.h
--- old/kdepimlibs-3.97.0/kcal/calformat.h 2007-07-26 12:35:17.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/calformat.h 2007-12-14 21:46:12.000000000 +0100
@@ -171,6 +171,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( CalFormat )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/calstorage.h new/kdepimlibs-3.97.1/kcal/calstorage.h
--- old/kdepimlibs-3.97.0/kcal/calstorage.h 2007-08-29 11:51:22.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/calstorage.h 2007-12-14 21:46:12.000000000 +0100
@@ -87,6 +87,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( CalStorage )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/CHECKLIST new/kdepimlibs-3.97.1/kcal/CHECKLIST
--- old/kdepimlibs-3.97.0/kcal/CHECKLIST 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/CHECKLIST 2007-12-14 21:46:12.000000000 +0100
@@ -57,7 +57,6 @@
todo | D | D | D | D | D | Allen
== DONE ==
-TODO: Q_DISABLE_COPY() where needed (dpointer, no copy-ctor in base class)
TODO: KUIT
Qt4Port -> no deprecated warnings; thiago says do NO replace const iterator
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/compat.h new/kdepimlibs-3.97.1/kcal/compat.h
--- old/kdepimlibs-3.97.0/kcal/compat.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/compat.h 2007-12-14 21:46:12.000000000 +0100
@@ -116,6 +116,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( Compat )
class Private;
Private *d;
//@endcond
@@ -183,6 +184,7 @@
private:
//@cond PRIVATE
+
class Private;
Private *d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/confirmsavedialog.h new/kdepimlibs-3.97.1/kcal/confirmsavedialog.h
--- old/kdepimlibs-3.97.0/kcal/confirmsavedialog.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/confirmsavedialog.h 2007-12-14 21:46:12.000000000 +0100
@@ -36,6 +36,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( ConfirmSaveDialog )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/dndfactory.h new/kdepimlibs-3.97.1/kcal/dndfactory.h
--- old/kdepimlibs-3.97.0/kcal/dndfactory.h 2007-08-29 11:51:22.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/dndfactory.h 2007-12-14 21:46:12.000000000 +0100
@@ -100,6 +100,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( DndFactory )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/dummyscheduler.h new/kdepimlibs-3.97.1/kcal/dummyscheduler.h
--- old/kdepimlibs-3.97.0/kcal/dummyscheduler.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/dummyscheduler.h 2007-12-14 21:46:12.000000000 +0100
@@ -51,8 +51,11 @@
bool saveMessage( const QString &message );
private:
+ //@cond PRIVATE
+ Q_DISABLE_COPY( DummyScheduler )
class Private;
Private *d;
+ //@endcond
};
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/exceptions.h new/kdepimlibs-3.97.1/kcal/exceptions.h
--- old/kdepimlibs-3.97.0/kcal/exceptions.h 2007-07-26 12:35:17.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/exceptions.h 2007-12-14 21:46:12.000000000 +0100
@@ -70,6 +70,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( Exception )
class Private;
Private *d;
//@endcond
@@ -122,6 +123,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( ErrorFormat )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/filestorage.h new/kdepimlibs-3.97.1/kcal/filestorage.h
--- old/kdepimlibs-3.97.0/kcal/filestorage.h 2007-08-29 11:51:22.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/filestorage.h 2007-12-14 21:46:12.000000000 +0100
@@ -118,6 +118,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( FileStorage )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/freebusy.h new/kdepimlibs-3.97.1/kcal/freebusy.h
--- old/kdepimlibs-3.97.0/kcal/freebusy.h 2007-08-29 11:51:22.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/freebusy.h 2007-12-14 21:46:12.000000000 +0100
@@ -171,6 +171,7 @@
bool accept( Visitor &v ) { return v.visit( this ); }
//@cond PRIVATE
+ Q_DISABLE_COPY( FreeBusy )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/freebusyurlstore.h new/kdepimlibs-3.97.1/kcal/freebusyurlstore.h
--- old/kdepimlibs-3.97.0/kcal/freebusyurlstore.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/freebusyurlstore.h 2007-12-14 21:46:12.000000000 +0100
@@ -49,8 +49,11 @@
private:
FreeBusyUrlStore();
+ //@cond PRIVATE
+ Q_DISABLE_COPY( FreeBusyUrlStore )
class Private;
Private *const d;
+ //@endcond
};
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/htmlexport.h new/kdepimlibs-3.97.1/kcal/htmlexport.h
--- old/kdepimlibs-3.97.0/kcal/htmlexport.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/htmlexport.h 2007-12-14 21:46:12.000000000 +0100
@@ -89,6 +89,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( HtmlExport )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/icalformat.cpp new/kdepimlibs-3.97.1/kcal/icalformat.cpp
--- old/kdepimlibs-3.97.0/kcal/icalformat.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/icalformat.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -522,8 +522,8 @@
if ( !icalrestriction_check( message ) ) {
kWarning(5800) << endl
<< "kcal library reported a problem while parsing:";
- kWarning(5800) << Scheduler::translatedMethodName( method ) << ":" <<
- d->mImpl->extractErrorProperty( c );
+ kWarning(5800) << Scheduler::translatedMethodName( method ) << ":"
+ << d->mImpl->extractErrorProperty( c );
}
Incidence *existingIncidence = cal->incidenceFromSchedulingID( incidence->uid() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/icalformat.h new/kdepimlibs-3.97.1/kcal/icalformat.h
--- old/kdepimlibs-3.97.0/kcal/icalformat.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/icalformat.h 2007-12-14 21:46:12.000000000 +0100
@@ -192,6 +192,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( ICalFormat )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/imipscheduler.h new/kdepimlibs-3.97.1/kcal/imipscheduler.h
--- old/kdepimlibs-3.97.0/kcal/imipscheduler.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/imipscheduler.h 2007-12-14 21:46:12.000000000 +0100
@@ -44,8 +44,13 @@
QList retrieveTransactions();
private:
+ using Scheduler::performTransaction;
+
+ //@cond PRIVATE
+ Q_DISABLE_COPY( IMIPScheduler )
class Private;
Private *const d;
+ //@endcond
};
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/incidence.cpp new/kdepimlibs-3.97.1/kcal/incidence.cpp
--- old/kdepimlibs-3.97.0/kcal/incidence.cpp 2007-11-14 01:24:49.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/incidence.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -59,7 +59,7 @@
mRelatedTo( 0 )
{}
- Private(const Private &p)
+ Private( const Private &p )
: mCreated( p.mCreated ),
mRevision( p.mRevision ),
mDescription( p.mDescription ),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/incidenceformatter.cpp new/kdepimlibs-3.97.1/kcal/incidenceformatter.cpp
--- old/kdepimlibs-3.97.0/kcal/incidenceformatter.cpp 2007-10-23 10:37:01.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/incidenceformatter.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -159,7 +159,7 @@
Attendee::List attendees = event->attendees();
if ( attendees.count() ) {
KIconLoader *iconLoader = KIconLoader::global();
- const QString iconPath = iconLoader->iconPath( "mail", KIconLoader::Small );
+ const QString iconPath = iconLoader->iconPath( "mail-message-new", KIconLoader::Small );
// Add organizer link
tmpStr += eventViewerAddTag( "h4", i18n( "Organizer" ) );
@@ -221,7 +221,7 @@
QString email_1= event->customProperty( "KABC", "EMAIL-1" );
KIconLoader *iconLoader = KIconLoader::global();
- const QString iconPath = iconLoader->iconPath( "mail", KIconLoader::Small );
+ const QString iconPath = iconLoader->iconPath( "mail-message-new", KIconLoader::Small );
//TODO: add a tart icon
QString tmpString = "<ul>";
tmpString += linkPerson( email_1, name_1, uid_1, iconPath );
@@ -242,6 +242,8 @@
QString tmpStr = "<table><tr>";
// show icons
+ /* all of those icons currently don't exist, makes no sense currently
+ to load a set of "unknown" icons. re-enable when those are available.
{
KIconLoader *iconLoader = KIconLoader::global();
tmpStr += "<td>";
@@ -261,6 +263,7 @@
tmpStr += "</td>";
}
+ */
tmpStr += "<td>" + eventViewerAddTag( "h2", incidence->summary() ) + "</td>";
tmpStr += "</tr></table><br>";
@@ -342,7 +345,8 @@
if ( event->categories().count() > 0 ) {
tmpStr += "<tr>";
tmpStr += "<b>";
- tmpStr += i18np( "1 category", "%1 categories", event->categories().count() )+ "</b></td>";
+ tmpStr += i18np( "1 category", "%1 categories", event->categories().count() ) +
+ "</b></td>";
tmpStr += "<td>" + event->categoriesStr() + "</td>";
tmpStr += "</tr>";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/incidenceformatter.h new/kdepimlibs-3.97.1/kcal/incidenceformatter.h
--- old/kdepimlibs-3.97.0/kcal/incidenceformatter.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/incidenceformatter.h 2007-12-14 21:46:12.000000000 +0100
@@ -39,8 +39,11 @@
virtual QString makeLink( const QString &id, const QString &text );
private:
+ //@cond PRIVATE
+ Q_DISABLE_COPY( InvitationFormatterHelper )
class Private;
Private *const d;
+ //@endcond
};
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/incidence.h new/kdepimlibs-3.97.1/kcal/incidence.h
--- old/kdepimlibs-3.97.0/kcal/incidence.h 2007-12-04 13:13:36.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/incidence.h 2007-12-14 21:46:12.000000000 +0100
@@ -89,8 +89,7 @@
}
private:
- bool visit( FreeBusy * ) { return false; } // prevent warning about hidden virtual method
-
+ bool visit( FreeBusy * ) { return false; } // prevent warning about hidden virtual method
T *mResource;
};
//@endcond
@@ -124,7 +123,7 @@
}
private:
- bool visit( FreeBusy * ) { return false; } // prevent warning about hidden virtual method
+ bool visit( FreeBusy * ) { return false; } // prevent warning about hidden virtual method
T *mResource;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/kresult.h new/kdepimlibs-3.97.1/kcal/kresult.h
--- old/kdepimlibs-3.97.0/kcal/kresult.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/kresult.h 2007-12-14 21:46:12.000000000 +0100
@@ -325,6 +325,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( KResultError )
class Private;
Private *const d;
//@endcond PRIVATE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/qtopiaformat.h new/kdepimlibs-3.97.1/kcal/qtopiaformat.h
--- old/kdepimlibs-3.97.0/kcal/qtopiaformat.h 2007-08-29 11:51:22.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/qtopiaformat.h 2007-12-14 21:46:12.000000000 +0100
@@ -47,6 +47,7 @@
QString toString( Calendar *calendar );
private:
+ Q_DISABLE_COPY( QtopiaFormat )
class Private;
Private *const d;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/recurrencerule.h new/kdepimlibs-3.97.1/kcal/recurrencerule.h
--- old/kdepimlibs-3.97.0/kcal/recurrencerule.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/recurrencerule.h 2007-12-14 21:46:12.000000000 +0100
@@ -313,8 +313,10 @@
void dump() const;
private:
+ //@cond PRIVATE
class Private;
Private *d;
+ //@endcond
};
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/resourcecachedconfig.cpp new/kdepimlibs-3.97.1/kcal/resourcecachedconfig.cpp
--- old/kdepimlibs-3.97.0/kcal/resourcecachedconfig.cpp 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/resourcecachedconfig.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -168,8 +168,8 @@
new QRadioButton(
i18nc( "@option:radio save the cache after every modification",
"On every change" ), groupBox );
- d->mGroup->addButton(delay,3);
- d->mGroup->addButton(every,4);
+ d->mGroup->addButton( delay, 3 );
+ d->mGroup->addButton( every, 4 );
QVBoxLayout *vbox = new QVBoxLayout;
vbox->addWidget(never);
@@ -184,7 +184,7 @@
}
ResourceCachedSaveConfig::~ResourceCachedSaveConfig()
-{
+{
delete d;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/resourcecachedconfig.h new/kdepimlibs-3.97.1/kcal/resourcecachedconfig.h
--- old/kdepimlibs-3.97.0/kcal/resourcecachedconfig.h 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/resourcecachedconfig.h 2007-12-14 21:46:12.000000000 +0100
@@ -24,7 +24,6 @@
#include
#include "kcal_export.h"
-
namespace KCal {
class ResourceCached;
@@ -49,6 +48,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( ResourceCachedReloadConfig )
class Private;
Private *const d;
//@endcond
@@ -75,6 +75,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( ResourceCachedSaveConfig )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/resourcecached.h new/kdepimlibs-3.97.1/kcal/resourcecached.h
--- old/kdepimlibs-3.97.0/kcal/resourcecached.h 2007-12-04 13:13:36.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/resourcecached.h 2007-12-14 21:46:12.000000000 +0100
@@ -512,6 +512,7 @@
virtual bool doSave( Incidence * ) { return 0; }
//@cond PRIVATE
+ Q_DISABLE_COPY( ResourceCached )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/resourcecalendar.h new/kdepimlibs-3.97.1/kcal/resourcecalendar.h
--- old/kdepimlibs-3.97.0/kcal/resourcecalendar.h 2007-12-04 13:13:36.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/resourcecalendar.h 2007-12-14 21:46:12.000000000 +0100
@@ -530,6 +530,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( ResourceCalendar )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/resourcelocalconfig.h new/kdepimlibs-3.97.1/kcal/resourcelocalconfig.h
--- old/kdepimlibs-3.97.0/kcal/resourcelocalconfig.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/resourcelocalconfig.h 2007-12-14 21:46:12.000000000 +0100
@@ -31,7 +31,6 @@
#include
-
namespace KCal {
/**
@@ -52,6 +51,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( ResourceLocalConfig )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/resourcelocal.cpp new/kdepimlibs-3.97.1/kcal/resourcelocal.cpp
--- old/kdepimlibs-3.97.0/kcal/resourcelocal.cpp 2007-12-04 13:13:36.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/resourcelocal.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -28,9 +28,8 @@
@author Cornelius Schumacher
*/
-#include "resourcelocal.moc"
+#include "resourcelocal.h"
#include "resourcelocal_p.h"
-
#include "resourcelocalconfig.h"
#include "vcalformat.h"
#include "icalformat.h"
@@ -41,7 +40,7 @@
#include "todo.h"
#include "journal.h"
-#include "kresources/configwidget.h"
+#include
#include <typeinfo>
#include
@@ -55,6 +54,8 @@
#include
#include
+#include "resourcelocal.moc"
+
using namespace KCal;
ResourceLocal::ResourceLocal()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/resourcelocaldirconfig.h new/kdepimlibs-3.97.1/kcal/resourcelocaldirconfig.h
--- old/kdepimlibs-3.97.0/kcal/resourcelocaldirconfig.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/resourcelocaldirconfig.h 2007-12-14 21:46:12.000000000 +0100
@@ -49,6 +49,7 @@
private:
//@cond PRIVATE
+ Q_DISABLE_COPY( ResourceLocalDirConfig )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/resourcelocaldir.h new/kdepimlibs-3.97.1/kcal/resourcelocaldir.h
--- old/kdepimlibs-3.97.0/kcal/resourcelocaldir.h 2007-12-04 13:13:36.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/resourcelocaldir.h 2007-12-14 21:46:12.000000000 +0100
@@ -89,6 +89,7 @@
using ResourceCalendar::doSave;
//@cond PRIVATE
+ Q_DISABLE_COPY( ResourceLocalDir )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/resourcelocaldir_p.h new/kdepimlibs-3.97.1/kcal/resourcelocaldir_p.h
--- old/kdepimlibs-3.97.0/kcal/resourcelocaldir_p.h 2007-11-14 01:24:48.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/resourcelocaldir_p.h 2007-12-14 21:46:12.000000000 +0100
@@ -18,8 +18,8 @@
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
+#ifndef KCAL_RESOURCELOCALDIR_P_H
+#define KCAL_RESOURCELOCALDIR_P_H
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/scheduler.h new/kdepimlibs-3.97.1/kcal/scheduler.h
--- old/kdepimlibs-3.97.0/kcal/scheduler.h 2007-11-06 09:01:10.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/scheduler.h 2007-12-14 21:46:12.000000000 +0100
@@ -107,6 +107,7 @@
QString error();
private:
+ Q_DISABLE_COPY( ScheduleMessage )
class Private;
Private *const d;
};
@@ -212,6 +213,7 @@
ICalFormat *mFormat;
private:
+ Q_DISABLE_COPY( Scheduler )
struct Private;
Private *const d;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/sortablelist.h new/kdepimlibs-3.97.1/kcal/sortablelist.h
--- old/kdepimlibs-3.97.0/kcal/sortablelist.h 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/sortablelist.h 2007-12-14 21:46:12.000000000 +0100
@@ -24,7 +24,7 @@
defines the Sortable List class.
@author David Jarvie \.
- */
+*/
#ifndef KCAL_SORTABLELIST_H
#define KCAL_SORTABLELIST_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/tests/fbrecurring.cpp new/kdepimlibs-3.97.1/kcal/tests/fbrecurring.cpp
--- old/kdepimlibs-3.97.0/kcal/tests/fbrecurring.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/tests/fbrecurring.cpp 2007-12-14 21:46:11.000000000 +0100
@@ -20,7 +20,7 @@
event1->setDtStart( KDateTime(QDate(2006,1,1), QTime(12,0,0)) );
//event1->setDuration(60*60);
event1->setDtEnd( KDateTime(QDate(2006,1,1), QTime(13,0,0)) );
- event1->setAllDay(FALSE);
+ event1->setAllDay(false);
event1->recurrence()->setDaily( 1 );
//event1->recurrence()->setDuration( 2 );
event1->recurrence()->setEndDateTime( KDateTime(QDate(2006,1,3), QTime(13,0,0)) );
@@ -32,7 +32,7 @@
event2->setDtStart( KDateTime(QDate(2006,1,1), QTime(13,0,0)) );
//event2->setDuration(60*60);
event2->setDtEnd( KDateTime(QDate(2006,1,1), QTime(14,0,0)) );
- event2->setAllDay(FALSE);
+ event2->setAllDay(false);
event2->recurrence()->setDaily( 1 );
//event2->recurrence()->setDuration( 3 );
event2->recurrence()->setEndDateTime( KDateTime(QDate(2006,1,4), QTime(13,0,0)) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/todo.cpp new/kdepimlibs-3.97.1/kcal/todo.cpp
--- old/kdepimlibs-3.97.0/kcal/todo.cpp 2007-12-04 13:13:36.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/todo.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -250,6 +250,11 @@
updated();
}
+KDateTime Todo::dtStart() const
+{
+ return dtStart( false );
+}
+
KDateTime Todo::dtStart( bool first ) const
{
if ( recurs() && !first ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/todo.h new/kdepimlibs-3.97.1/kcal/todo.h
--- old/kdepimlibs-3.97.0/kcal/todo.h 2007-12-04 13:13:36.000000000 +0100
+++ new/kdepimlibs-3.97.1/kcal/todo.h 2007-12-14 21:46:12.000000000 +0100
@@ -156,7 +156,8 @@
@copydoc
IncidenceBase::dtStart()
*/
- virtual KDateTime dtStart() const { return dtStart( false ); }
+ virtual KDateTime dtStart() const;
+
/**
Returns the start date of the todo.
@param first If true, the start date of the todo will be returned. If the
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kcal/vcalformat.h new/kdepimlibs-3.97.1/kcal/vcalformat.h
--- old/kdepimlibs-3.97.0/kcal/vcalformat.h 2007-08-29 11:51:22.000000000 +0200
+++ new/kdepimlibs-3.97.1/kcal/vcalformat.h 2007-12-14 21:46:12.000000000 +0100
@@ -161,6 +161,7 @@
};
//@cond PRIVATE
+ Q_DISABLE_COPY( VCalFormat )
class Private;
Private *const d;
//@endcond
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kioslave/smtp/command.cpp new/kdepimlibs-3.97.1/kioslave/smtp/command.cpp
--- old/kdepimlibs-3.97.0/kioslave/smtp/command.cpp 2007-10-03 13:30:04.000000000 +0200
+++ new/kdepimlibs-3.97.1/kioslave/smtp/command.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -148,9 +148,9 @@
return true;
}
mSMTP->error( KIO::ERR_UNKNOWN,
- i18n("Unexpected server response to %1 command.\n%2",
- QString::fromLatin1(mEHLONotSupported ? "HELO" : "EHLO") ,
- r.errorMessage() ) );
+ i18n( "Unexpected server response to %1 command.\n%2",
+ QString::fromLatin1( mEHLONotSupported ? "HELO" : "EHLO" ),
+ r.errorMessage() ) );
return false;
}
@@ -168,9 +168,9 @@
mNeedResponse = false;
if ( r.code() != 220 ) {
mSMTP->error( r.errorCode(),
- i18n("Your SMTP server does not support TLS. "
- "Disable TLS, if you want to connect "
- "without encryption.") );
+ i18n("Your SMTP server does not support TLS. "
+ "Disable TLS, if you want to connect "
+ "without encryption.") );
return false;
}
@@ -181,13 +181,13 @@
if ( tlsrc != -3 )
//kDebug(7112) << "TLS negotiation failed!";
- mSMTP->messageBox(KIO::SlaveBase::Information,
- i18n("Your SMTP server claims to "
- "support TLS, but negotiation "
- "was unsuccessful.\nYou can "
- "disable TLS in KDE using the "
- "crypto settings module."),
- i18n("Connection Failed"));
+ mSMTP->messageBox( KIO::SlaveBase::Information,
+ i18n("Your SMTP server claims to "
+ "support TLS, but negotiation "
+ "was unsuccessful.\nYou can "
+ "disable TLS in KDE using the "
+ "crypto settings module."),
+ i18n("Connection Failed") );
return false;
}
@@ -200,9 +200,9 @@
// AUTH - rfc 2554
//
AuthCommand::AuthCommand( SMTPProtocol * smtp,
- const char *mechanisms,
- const QString &aFQDN,
- KIO::AuthInfo &ai )
+ const char *mechanisms,
+ const QString &aFQDN,
+ KIO::AuthInfo &ai )
: Command( smtp, CloseConnectionOnError|OnlyLastInPipeline ),
mAi( &ai ),
mFirstTime( true )
@@ -362,19 +362,19 @@
bool AuthCommand::processResponse( const Response & r, TransactionState * ) {
if ( !r.isOk() ) {
if ( mFirstTime )
- if ( haveCapability( "AUTH" ) )
+ if ( haveCapability( "AUTH" ) )
mSMTP->error( KIO::ERR_COULD_NOT_LOGIN,
i18n("Your SMTP server does not support %1.\nChoose a different authentication method.\n%2",
mMechusing , r.errorMessage() ) );
- else
- mSMTP->error( KIO::ERR_COULD_NOT_LOGIN,
- i18n("Your SMTP server does not support authentication.\n"
- " %1", r.errorMessage() ) );
+ else
+ mSMTP->error( KIO::ERR_COULD_NOT_LOGIN,
+ i18n( "Your SMTP server does not support authentication.\n"
+ "%1", r.errorMessage() ) );
else
- mSMTP->error( KIO::ERR_COULD_NOT_LOGIN,
- i18n("Authentication failed.\n"
- "Most likely the password is wrong.\n"
- "%1", r.errorMessage() ) );
+ mSMTP->error( KIO::ERR_COULD_NOT_LOGIN,
+ i18n( "Authentication failed.\n"
+ "Most likely the password is wrong.\n"
+ "%1", r.errorMessage() ) );
return false;
}
mFirstTime = false;
@@ -469,7 +469,7 @@
void TransferCommand::ungetCommandLine( const QByteArray & cmd, TransactionState * ) {
if ( cmd.isEmpty() )
return; // don't change state when we can't detect the unget in
- // the next nextCommandLine !!
+ // the next nextCommandLine !!
mWasComplete = mComplete;
mComplete = false;
mNeedResponse = false;
@@ -493,8 +493,8 @@
const QByteArray ret = mUngetBuffer;
mUngetBuffer = 0;
if ( mWasComplete ) {
- mComplete = true;
- mNeedResponse = true;
+ mComplete = true;
+ mNeedResponse = true;
}
return ret; // don't prepare(), it's slave-generated or already prepare()d
}
@@ -510,7 +510,7 @@
return prepare( ba );
else if ( result < 0 ) {
ts->setFailedFatally( KIO::ERR_INTERNAL,
- i18n("Could not read data from application.") );
+ i18n("Could not read data from application.") );
mComplete = true;
mNeedResponse = true;
return 0;
@@ -527,8 +527,8 @@
if ( !r.isOk() ) {
ts->setFailed();
mSMTP->error( r.errorCode(),
- i18n("The message content was not accepted.\n"
- "%1", r.errorMessage() ) );
+ i18n( "The message content was not accepted.\n"
+ "%1", r.errorMessage() ) );
return false;
}
return true;
@@ -543,9 +543,9 @@
while ( s < send ) {
const char ch = *s++;
if ( ch == '\n' && last != '\r' )
- *d++ = '\r'; // lf2crlf
+ *d++ = '\r'; // lf2crlf
else if ( ch == '.' && last == '\n' )
- *d++ = '.'; // dotstuff
+ *d++ = '.'; // dotstuff
last = *d++ = ch;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/kmime/kmime_header_parsing.cpp new/kdepimlibs-3.97.1/kmime/kmime_header_parsing.cpp
--- old/kdepimlibs-3.97.0/kmime/kmime_header_parsing.cpp 2007-08-29 11:51:21.000000000 +0200
+++ new/kdepimlibs-3.97.1/kmime/kmime_header_parsing.cpp 2007-12-14 21:46:11.000000000 +0100
@@ -1663,7 +1663,7 @@
static const char * stdMonthNames[] = {
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dez"
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
};
static const int stdMonthNamesLen =
sizeof stdMonthNames / sizeof *stdMonthNames;
@@ -1899,7 +1899,7 @@
//
// day-name := "Mon" / "Tue" / "Wed" / "Thu" / "Fri" / "Sat" / "Sun"
// month-name := "Jan" / "Feb" / "Mar" / "Apr" / "May" / "Jun" /
- // "Jul" / "Aug" / "Sep" / "Oct" / "Nov" / "Dez"
+ // "Jul" / "Aug" / "Sep" / "Oct" / "Nov" / "Dec"
result = KDateTime();
QDateTime maybeDateTime;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/mailtransport/configmodule.cpp new/kdepimlibs-3.97.1/mailtransport/configmodule.cpp
--- old/kdepimlibs-3.97.0/mailtransport/configmodule.cpp 2007-10-03 13:30:07.000000000 +0200
+++ new/kdepimlibs-3.97.1/mailtransport/configmodule.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -27,7 +27,7 @@
using namespace MailTransport;
K_PLUGIN_FACTORY( MailTransportConfigFactory, registerPlugin<ConfigModule>(); )
-K_EXPORT_PLUGIN( MailTransportConfigFactory( "mailtrasnport" ) )
+K_EXPORT_PLUGIN( MailTransportConfigFactory( "mailtransport" ) )
ConfigModule::ConfigModule( QWidget * parent, const QVariantList & args ) :
KCModule( MailTransportConfigFactory::componentData(), parent, args )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/mailtransport/servertest.cpp new/kdepimlibs-3.97.1/mailtransport/servertest.cpp
--- old/kdepimlibs-3.97.0/mailtransport/servertest.cpp 2007-08-29 11:51:23.000000000 +0200
+++ new/kdepimlibs-3.97.1/mailtransport/servertest.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -169,9 +169,9 @@
{
static bool first = true;
if ( first ) {
- if ( testProtocol == IMAPS_PROTOCOL )
+ if ( testProtocol == IMAP_PROTOCOL )
secureSocket->write( QLatin1String( "1 CAPABILITY" ) );
- else if ( testProtocol == SMTPS_PROTOCOL )
+ else if ( testProtocol == SMTP_PROTOCOL )
secureSocket->write( QLatin1String( "EHLO localhost" ) );
first = false;
return;
@@ -194,8 +194,6 @@
{
secureSocketTimer->stop();
connectionResults << Transport::EnumEncryption::SSL;
- secureSocketFinished = true;
- finalResult();
}
void ServerTestPrivate::slotSslNotPossible()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/mailtransport/smtpsettings.ui new/kdepimlibs-3.97.1/mailtransport/smtpsettings.ui
--- old/kdepimlibs-3.97.0/mailtransport/smtpsettings.ui 2007-11-20 23:00:44.000000000 +0100
+++ new/kdepimlibs-3.97.1/mailtransport/smtpsettings.ui 2007-12-14 21:46:12.000000000 +0100
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>425</width>
- <height>472</height>
+ <width>436</width>
+ <height>509</height>
</rect>
</property>
<layout class="QGridLayout" >
@@ -36,8 +36,8 @@
<attribute name="title" >
<string>&General</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
+ <layout class="QVBoxLayout" >
+ <item>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="nameLabel" >
@@ -87,8 +87,8 @@
<item row="2" column="1" >
<layout class="QHBoxLayout" >
<item>
- <widget class="KIntNumInput" name="kcfg_port" >
- <property name="value" >
+ <widget class="KIntNumInput" native="1" name="kcfg_port" >
+ <property name="value" stdset="0" >
<number>25</number>
</property>
</widget>
@@ -110,15 +110,15 @@
</item>
</layout>
</item>
- <item row="1" column="0" >
+ <item>
<layout class="QHBoxLayout" >
<item>
<widget class="KButtonGroup" name="kcfg_encryption" >
<property name="title" >
<string>Encryption</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
+ <layout class="QVBoxLayout" >
+ <item>
<layout class="QHBoxLayout" >
<item>
<widget class="QRadioButton" name="none" >
@@ -143,7 +143,7 @@
</item>
</layout>
</item>
- <item row="1" column="0" >
+ <item>
<widget class="KPushButton" name="checkCapabilities" >
<property name="text" >
<string>Check &What the Server Supports</string>
@@ -160,55 +160,68 @@
</property>
<property name="sizeHint" >
<size>
- <width>40</width>
- <height>20</height>
+ <width>166</width>
+ <height>81</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
- <item row="2" column="0" >
+ <item>
+ <widget class="QProgressBar" name="checkCapabilitiesProgress" >
+ <property name="visible" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
- <width>20</width>
- <height>40</height>
+ <width>396</width>
+ <height>101</height>
</size>
</property>
</spacer>
</item>
</layout>
- <widget class="QProgressBar" name="checkCapabilitiesProgress" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>100</width>
- <height>30</height>
- </rect>
- </property>
- <property name="visible" >
- <bool>false</bool>
- </property>
- </widget>
</widget>
<widget class="QWidget" name="advancedTab" >
<attribute name="title" >
<string>&Advanced</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="2" >
+ <layout class="QVBoxLayout" >
+ <item>
+ <widget class="QLabel" name="noAuthPossible" >
+ <property name="visible" >
+ <bool>false</bool>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Raised</enum>
+ </property>
+ <property name="text" >
+ <string>This server does not support authentication</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QCheckBox" name="kcfg_requiresAuthentication" >
<property name="text" >
<string>Server &requires authentication</string>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
+ <item>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="usernameLabel" >
@@ -332,84 +345,64 @@
</item>
</layout>
</item>
- <item row="2" column="0" colspan="2" >
+ <item>
<widget class="KSeparator" name="kseparator_3" />
</item>
- <item row="3" column="0" colspan="2" >
+ <item>
<widget class="QCheckBox" name="kcfg_specifyHostname" >
<property name="text" >
<string>Sen&d custom hostname to server</string>
</property>
</widget>
</item>
- <item row="4" column="0" >
- <widget class="QLabel" name="hostnameLabel" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>Hos&tname:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy" >
- <cstring>kcfg_localHostname</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="KLineEdit" name="kcfg_localHostname" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- </widget>
+ <item>
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QLabel" name="hostnameLabel" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Hos&tname:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy" >
+ <cstring>kcfg_localHostname</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="KLineEdit" name="kcfg_localHostname" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="5" column="0" colspan="2" >
+ <item>
<widget class="KSeparator" name="kseparator_2" />
</item>
- <item row="6" column="0" >
- <widget class="QLabel" name="precommandLabel" >
- <property name="text" >
- <string>Precommand:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="6" column="1" >
- <widget class="KLineEdit" name="kcfg_precommand" />
+ <item>
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QLabel" name="precommandLabel" >
+ <property name="text" >
+ <string>Precommand:</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="KLineEdit" name="kcfg_precommand" />
+ </item>
+ </layout>
</item>
</layout>
- <widget class="QLabel" name="noAuthPossible" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>100</width>
- <height>30</height>
- </rect>
- </property>
- <property name="visible" >
- <bool>false</bool>
- </property>
- <property name="frameShape" >
- <enum>QFrame::Box</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Raised</enum>
- </property>
- <property name="text" >
- <string>This server does not support authentication</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
</widget>
</widget>
</item>
@@ -442,6 +435,7 @@
<class>KSeparator</class>
<extends>QFrame</extends>
<header>kseparator.h</header>
+ <container>1</container>
</customwidget>
</customwidgets>
<tabstops>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/mailtransport/socket.cpp new/kdepimlibs-3.97.1/mailtransport/socket.cpp
--- old/kdepimlibs-3.97.0/mailtransport/socket.cpp 2007-10-31 21:36:03.000000000 +0100
+++ new/kdepimlibs-3.97.1/mailtransport/socket.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -77,7 +77,7 @@
void SocketPrivate::slotStateChanged( QAbstractSocket::SocketState state )
{
#ifdef comm_debug
- kDebug( 5324 ) << objectName() << "State is now:" << ( int ) state;
+ kDebug( 5324 ) << q->objectName() << "State is now:" << ( int ) state;
#endif
if ( state == QAbstractSocket::UnconnectedState )
emit q->failed();
@@ -86,13 +86,13 @@
void SocketPrivate::slotModeChanged( QSslSocket::SslMode state )
{
#ifdef comm_debug
- kDebug( 5324 ) << objectName() << "Mode is now:" << state;
+ kDebug( 5324 ) << q->objectName() << "Mode is now:" << state;
#endif
}
void SocketPrivate::slotSocketRead()
{
- // kDebug(5324) << objectName() ;
+ kDebug(5324) << q->objectName();
if ( !socket )
return;
@@ -104,7 +104,7 @@
return;
#ifdef comm_debug
- kDebug( 5324 ) << socket->isEncrypted() << msg.trimmed();
+ kDebug( 5324 ) << q->objectName() << socket->isEncrypted() << msg.trimmed();
#endif
emit q->data( msg );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/mailtransport/transportconfigdialog.cpp new/kdepimlibs-3.97.1/mailtransport/transportconfigdialog.cpp
--- old/kdepimlibs-3.97.0/mailtransport/transportconfigdialog.cpp 2007-08-29 11:51:23.000000000 +0200
+++ new/kdepimlibs-3.97.1/mailtransport/transportconfigdialog.cpp 2007-12-14 21:46:12.000000000 +0100
@@ -179,8 +179,6 @@
{
Q_ASSERT( d->transport->type() == Transport::EnumType::SMTP );
- delete d->serverTest;
-
d->serverTest = new ServerTest( this );
d->serverTest->setProtocol( SMTP_PROTOCOL );
d->serverTest->setServer( d->smtp.kcfg_host->text() );
@@ -276,8 +274,7 @@
d->updateAuthCapbilities();
checkHighestEnabledButton( d->authGroup );
- delete d->serverTest;
- d->serverTest = 0;
+ d->serverTest->deleteLater();
}
void TransportConfigDialog::hostNameChanged( const QString &text )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/syndication/elementwrapper.h new/kdepimlibs-3.97.1/syndication/elementwrapper.h
--- old/kdepimlibs-3.97.0/syndication/elementwrapper.h 2007-07-26 12:35:10.000000000 +0200
+++ new/kdepimlibs-3.97.1/syndication/elementwrapper.h 2007-12-14 21:46:11.000000000 +0100
@@ -74,7 +74,7 @@
* @param other the element wrapper to assign
* @return reference to this instance
*/
- virtual ElementWrapper& operator=(const ElementWrapper& other);
+ ElementWrapper& operator=(const ElementWrapper& other);
/**
* compares two wrappers. Two wrappers are equal if and only if
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.97.0/syndication/rdf/resource.h new/kdepimlibs-3.97.1/syndication/rdf/resource.h
--- old/kdepimlibs-3.97.0/syndication/rdf/resource.h 2007-07-26 12:35:10.000000000 +0200
+++ new/kdepimlibs-3.97.1/syndication/rdf/resource.h 2007-12-14 21:46:11.000000000 +0100
@@ -84,7 +84,7 @@
*
* @param other the resource to assign
*/
- virtual Resource& operator=(const Resource& other);
+ Resource& operator=(const Resource& other);
/**
* checks two resources for equality. Currently both URI (or anonID)
@@ -92,7 +92,7 @@
*
* @param other the node to compare this node to
*/
- virtual bool operator==(const Node& other) const;
+ bool operator==(const Node& other) const;
/**
* Used by visitors for double dispatch. See NodeVisitor
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
|