SOURCES: kdelibs-branch.diff, kdebase-branch.diff, kdenetwork-bran...
arekm
arekm at pld-linux.org
Thu Oct 12 22:18:35 CEST 2006
Author: arekm Date: Thu Oct 12 20:18:35 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.37 -> 1.38) , kdebase-branch.diff (1.40 -> 1.41) , kdenetwork-branch.diff (1.13 -> 1.14)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.37 SOURCES/kdelibs-branch.diff:1.38
--- SOURCES/kdelibs-branch.diff:1.37 Wed Oct 11 11:53:11 2006
+++ SOURCES/kdelibs-branch.diff Thu Oct 12 22:18:30 2006
@@ -1,7 +1,7 @@
Index: interfaces/kspeech/kspeech.h
===================================================================
---- interfaces/kspeech/kspeech.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ interfaces/kspeech/kspeech.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- interfaces/kspeech/kspeech.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ interfaces/kspeech/kspeech.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -371,10 +371,11 @@
*
* A Talker Code consists of a series of XML tags and attributes.
@@ -17,8 +17,8 @@
* Markup Language (SSML) and Java Speech Markup Language (JSML).
Index: interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
===================================================================
---- interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -21,8 +21,10 @@
{
protected:
@@ -33,8 +33,8 @@
};
Index: kmdi/kmdi/mainwindow.h
===================================================================
---- kmdi/kmdi/mainwindow.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kmdi/kmdi/mainwindow.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kmdi/kmdi/mainwindow.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kmdi/kmdi/mainwindow.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -107,6 +107,10 @@
* as toplevel and stay-on-top on the application's main widget.
* @param pWnd widget for the toolview
@@ -48,8 +48,8 @@
KMDI::ToolViewAccessor *addToolWindow( QWidget* pWnd, KDockWidget::DockPosition pos = KDockWidget::DockNone, QWidget* pTargetWnd = 0L, int percent = 50, const QString& tabToolTip = 0, const QString& tabCaption = 0);
Index: kmdi/kmdi/dockcontainer.h
===================================================================
---- kmdi/kmdi/dockcontainer.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kmdi/kmdi/dockcontainer.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kmdi/kmdi/dockcontainer.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kmdi/kmdi/dockcontainer.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -50,7 +50,7 @@
/**
* Add a widget to this container.
@@ -70,8 +70,8 @@
virtual void setToolTip (KDockWidget *, QString &);
Index: kate/part/katecodecompletion.cpp
===================================================================
---- kate/part/katecodecompletion.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kate/part/katecodecompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kate/part/katecodecompletion.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kate/part/katecodecompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -56,7 +56,6 @@
public:
/**
@@ -82,8 +82,8 @@
{
Index: kate/part/katefactory.h
===================================================================
---- kate/part/katefactory.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kate/part/katefactory.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kate/part/katefactory.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kate/part/katefactory.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -75,6 +75,7 @@
* @param widgetName widget name
* @param parent QObject parent
@@ -94,8 +94,8 @@
*/
Index: kate/part/katejscript.cpp
===================================================================
---- kate/part/katejscript.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kate/part/katejscript.cpp (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kate/part/katejscript.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kate/part/katejscript.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -360,7 +360,7 @@
const KJS::ClassInfo KateJSDocument::info = { "KateJSDocument", 0, 0, 0 };
@@ -125,8 +125,8 @@
Index: kate/part/kateview.h
===================================================================
---- kate/part/kateview.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kate/part/kateview.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kate/part/kateview.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kate/part/kateview.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -286,8 +286,8 @@
{ return getDoc()->textLine( cursorLine() ); }
QString currentWord()
@@ -148,8 +148,8 @@
void findPrev() { findAgain( true ); }
Index: kate/part/katedocument.h
===================================================================
---- kate/part/katedocument.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kate/part/katedocument.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -264,6 +264,7 @@
* @p removeLine is true, @p length is ignored (eg not needed).
* @param line line number
@@ -169,8 +169,8 @@
Index: kate/part/kateautoindent.h
===================================================================
---- kate/part/kateautoindent.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kate/part/kateautoindent.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -349,7 +349,7 @@
KateCSmartIndent (KateDocument *doc);
~KateCSmartIndent ();
@@ -209,8 +209,8 @@
virtual void processLine (KateDocCursor &line);
Index: kate/part/kateviewhelpers.cpp
===================================================================
---- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -277,7 +277,7 @@
public:
KateCmdLineFlagCompletion() {;}
@@ -222,8 +222,8 @@
}
Index: kate/part/katefactory.cpp
===================================================================
---- kate/part/katefactory.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kate/part/katefactory.cpp (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kate/part/katefactory.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kate/part/katefactory.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -52,6 +52,7 @@
* @param widgetName widget name
* @param parent QObject parent
@@ -234,8 +234,8 @@
*/
Index: kate/part/katesearch.h
===================================================================
---- kate/part/katesearch.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kate/part/katesearch.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kate/part/katesearch.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kate/part/katesearch.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -223,7 +223,7 @@
bool help(class Kate::View *, const QString &, QString &);
QStringList cmds();
@@ -247,8 +247,8 @@
/**
Index: kate/part/kateautoindent.cpp
===================================================================
---- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -714,6 +714,7 @@
int parenCount = 0; // Possibly in a multiline for stmt. Used to skip ';' ...
bool found = false;
@@ -286,8 +286,8 @@
if (!found)
Index: kab/qconfigDB.h
===================================================================
---- kab/qconfigDB.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kab/qconfigDB.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kab/qconfigDB.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kab/qconfigDB.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -199,7 +199,7 @@
bool save(QTextStream& file, int count);
/**
@@ -407,8 +407,8 @@
*/
Index: kab/addressbook.h
===================================================================
---- kab/addressbook.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kab/addressbook.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kab/addressbook.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kab/addressbook.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -178,7 +178,7 @@
* your mainwindow (or whereever). (The toolbar is not implemented by now). <BR>
* Some parts of the AddressBook widget are \e interactive, that means they are
@@ -511,8 +511,8 @@
**/
Index: kab/kabapi.h
===================================================================
---- kab/kabapi.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kab/kabapi.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kab/kabapi.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kab/kabapi.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -77,6 +77,7 @@
* without failures. Thus you have to call init before you can
* use the database.
@@ -532,8 +532,8 @@
* @return NoError if an entry is found or NoEntry.
Index: arts/kde/kplayobject.h
===================================================================
---- arts/kde/kplayobject.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ arts/kde/kplayobject.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- arts/kde/kplayobject.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ arts/kde/kplayobject.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -37,7 +37,7 @@
/**
@@ -545,8 +545,8 @@
Index: mimetypes/application/x-mplayer2.desktop
===================================================================
---- mimetypes/application/x-mplayer2.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ mimetypes/application/x-mplayer2.desktop (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- mimetypes/application/x-mplayer2.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ mimetypes/application/x-mplayer2.desktop (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -15,6 +15,7 @@
Comment[es]=Formator de medios de Microsoft
Comment[et]=Microsoft Media
@@ -557,8 +557,8 @@
Comment[hu]=Microsoft Media-fĂĄjl
Index: kioslave/file/file.h
===================================================================
---- kioslave/file/file.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kioslave/file/file.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kioslave/file/file.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kioslave/file/file.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -48,10 +48,10 @@
virtual ~FileProtocol() { }
@@ -575,8 +575,8 @@
virtual void symlink( const QString &target, const KURL &dest,
Index: kioslave/http/http.h
===================================================================
---- kioslave/http/http.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kioslave/http/http.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kioslave/http/http.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kioslave/http/http.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -190,16 +190,16 @@
virtual void slave_status();
@@ -601,8 +601,8 @@
bool davHostOk();
Index: kioslave/ftp/ftp.h
===================================================================
---- kioslave/ftp/ftp.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kioslave/ftp/ftp.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kioslave/ftp/ftp.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kioslave/ftp/ftp.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -260,7 +260,7 @@
virtual void listDir( const KURL & url );
@@ -614,8 +614,8 @@
Index: kioslave/gzip/kgzipfilter.cpp
===================================================================
---- kioslave/gzip/kgzipfilter.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kioslave/gzip/kgzipfilter.cpp (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kioslave/gzip/kgzipfilter.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kioslave/gzip/kgzipfilter.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -38,8 +38,12 @@
public:
KGzipFilterFactory() : KLibFactory() {}
@@ -632,8 +632,8 @@
};
Index: kio/kio/slavebase.cpp
===================================================================
---- kio/kio/slavebase.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kio/kio/slavebase.cpp (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kio/kio/slavebase.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kio/kio/slavebase.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -85,21 +85,22 @@
QStringList groupList() const { return QStringList(); }
@@ -665,8 +665,8 @@
return entry;
Index: kio/kio/defaultprogress.h
===================================================================
---- kio/kio/defaultprogress.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kio/kio/defaultprogress.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kio/kio/defaultprogress.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kio/kio/defaultprogress.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -48,7 +48,7 @@
/**
* Creates a new default progress dialog.
@@ -751,8 +751,8 @@
* Called when the job is cleaned.
Index: kio/kio/slavebase.h
===================================================================
---- kio/kio/slavebase.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kio/kio/slavebase.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kio/kio/slavebase.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kio/kio/slavebase.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -395,7 +395,7 @@
*
* @see canResume()
@@ -762,10 +762,46 @@
/**
* Finds all details for one file or directory.
+Index: kio/kio/job.cpp
+===================================================================
+--- kio/kio/job.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kio/kio/job.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
+@@ -410,15 +410,6 @@
+ : Job(showProgressInfo), m_slave(0), m_packedArgs(packedArgs),
+ m_url(url), m_command(command), m_totalSize(0)
+ {
+- if (!m_url.isValid())
+- {
+- m_error = ERR_MALFORMED_URL;
+- m_errorText = m_url.url();
+- QTimer::singleShot(0, this, SLOT(slotFinished()) );
+- return;
+- }
+-
+-
+ if (m_url.hasSubURL())
+ {
+ KURL::List list = KURL::split(m_url);
+@@ -430,6 +421,15 @@
+ }
+
+ Scheduler::doJob(this);
++
++ if (!m_url.isValid())
++ {
++ kdDebug() << "ERR_MALFORMED_URL" << endl;
++ m_error = ERR_MALFORMED_URL;
++ m_errorText = m_url.url();
++ QTimer::singleShot(0, this, SLOT(slotFinished()) );
++ return;
++ }
+ }
+
+ void SimpleJob::kill( bool quietly )
Index: kio/kio/kservice.cpp
===================================================================
---- kio/kio/kservice.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kio/kio/kservice.cpp (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kio/kio/kservice.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kio/kio/kservice.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -447,19 +447,21 @@
QStringList groupList() const { return QStringList(); }
@@ -796,8 +832,8 @@
QCString value;
Index: kio/kio/kscan.h
===================================================================
---- kio/kio/kscan.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kio/kio/kscan.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kio/kio/kscan.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kio/kio/kscan.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -339,7 +339,7 @@
KOCRDialogFactory( QObject *parent=0, const char *name=0 );
@@ -809,8 +845,8 @@
Index: kio/kfile/kfiletreeview.h
===================================================================
---- kio/kfile/kfiletreeview.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kio/kfile/kfiletreeview.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kio/kfile/kfiletreeview.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kio/kfile/kfiletreeview.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -214,9 +214,9 @@
// The drop event allows to differentiate between move and copy
void dropped( QWidget*, QDropEvent*, KURL::List&, KURL& );
@@ -825,8 +861,8 @@
protected:
Index: kio/kfile/kurlrequester.cpp
===================================================================
---- kio/kfile/kurlrequester.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kio/kfile/kurlrequester.cpp (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kio/kfile/kurlrequester.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kio/kfile/kurlrequester.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -306,7 +306,7 @@
emit urlSelected( d->url() );
}
@@ -838,8 +874,8 @@
d->fileDialogMode = mode;
Index: kio/misc/uiserver.h
===================================================================
---- kio/misc/uiserver.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kio/misc/uiserver.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kio/misc/uiserver.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kio/misc/uiserver.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -276,6 +276,7 @@
/**
@@ -850,8 +886,8 @@
* QuestionYesNo = 1, WarningYesNo = 2, WarningContinueCancel = 3,
Index: kio/kssl/ksslcsessioncache.h
===================================================================
---- kio/kssl/ksslcsessioncache.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kio/kssl/ksslcsessioncache.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kio/kssl/ksslcsessioncache.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kio/kssl/ksslcsessioncache.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -31,14 +31,14 @@
/**
@@ -871,8 +907,8 @@
static QString getSessionForURL(const KURL &kurl);
Index: kio/kssl/ksmimecrypto.h
===================================================================
---- kio/kssl/ksmimecrypto.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kio/kssl/ksmimecrypto.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kio/kssl/ksmimecrypto.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kio/kssl/ksmimecrypto.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -85,7 +85,7 @@
* Does not check certificates for validity!
* @param signedText signed message block
@@ -891,10 +927,25 @@
* @return 0 on success
*/
rc encryptMessage(const QCString &clearText,
+Index: kabc/vcard21parser.h
+===================================================================
+--- kabc/vcard21parser.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kabc/vcard21parser.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
+@@ -204,8 +204,8 @@
+ friend class VCardLineX;
+
+ public:
+- VCard21ParserImpl() { };
+- virtual ~VCard21ParserImpl() { };
++ VCard21ParserImpl();
++ virtual ~VCard21ParserImpl();
+ static VCard21ParserImpl *parseVCard(const QString& vc, int *err = NULL);
+ QString getValue(const QString& name, const QString& qualifier);
+ QString getValue(const QString& name);
Index: kabc/plugins/sql/resourcesql.h
===================================================================
---- kabc/plugins/sql/resourcesql.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kabc/plugins/sql/resourcesql.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kabc/plugins/sql/resourcesql.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kabc/plugins/sql/resourcesql.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -43,7 +43,7 @@
Ticket *requestSaveTicket();
@@ -906,8 +957,8 @@
Index: kabc/plugins/ldapkio/resourceldapkio.h
===================================================================
---- kabc/plugins/ldapkio/resourceldapkio.h (.../tags/KDE/3.5.5/kdelibs) (revision 594434)
-+++ kabc/plugins/ldapkio/resourceldapkio.h (.../branches/KDE/3.5/kdelibs) (revision 594434)
+--- kabc/plugins/ldapkio/resourceldapkio.h (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kabc/plugins/ldapkio/resourceldapkio.h (.../branches/KDE/3.5/kdelibs) (revision 594925)
@@ -57,8 +57,8 @@
virtual bool load();
@@ -919,10 +970,197 @@
virtual void removeAddressee( const Addressee& addr );
+Index: kabc/vcard21parser.cpp
+===================================================================
+--- kabc/vcard21parser.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 594925)
++++ kabc/vcard21parser.cpp (.../branches/KDE/3.5/kdelibs) (revision 594925)
+@@ -208,17 +208,17 @@
+ KABC::Addressee VCard21Parser::readFromString( const QString &data)
+ {
+ KABC::Addressee addressee;
+- VCard21ParserImpl *mVCard = VCard21ParserImpl::parseVCard(data);
++ VCard21ParserImpl *vCard = VCard21ParserImpl::parseVCard(data);
+ QString tmpStr;
+
+ // Check if parsing failed
+- if (mVCard == 0)
++ if (vCard == 0)
+ {
+ kdDebug() << "Parsing failed" << endl;
+ return addressee;
+ }
+ //set the addressees name and formated name
+- QStringList tmpList = mVCard->getValues(VCARD_N);
++ QStringList tmpList = vCard->getValues(VCARD_N);
+ QString formattedName = "";
+ if (tmpList.count() > 0)
+ addressee.setFamilyName(tmpList[0]);
+@@ -231,38 +231,38 @@
+ if (tmpList.count() > 4)
+ addressee.setSuffix(tmpList[4]);
+
+- tmpStr = (mVCard->getValue(VCARD_FN));
++ tmpStr = (vCard->getValue(VCARD_FN));
+ if (!tmpStr.isEmpty())
+ addressee.setFormattedName(tmpStr);
+
+ //set the addressee's nick name
+- tmpStr = mVCard->getValue(VCARD_NICKNAME);
++ tmpStr = vCard->getValue(VCARD_NICKNAME);
+ addressee.setNickName(tmpStr);
+ //set the addressee's organization
+- tmpStr = mVCard->getValue(VCARD_ORG);
++ tmpStr = vCard->getValue(VCARD_ORG);
+ addressee.setOrganization(tmpStr);
+ //set the addressee's title
+- tmpStr = mVCard->getValue(VCARD_TITLE);
++ tmpStr = vCard->getValue(VCARD_TITLE);
+ addressee.setTitle(tmpStr);
+ //set the addressee's email - we can only deal with two. The preferenced one and one other.
+- tmpStr = mVCard->getValue(VCARD_EMAIL, VCARD_EMAIL_INTERNET);
++ tmpStr = vCard->getValue(VCARD_EMAIL, VCARD_EMAIL_INTERNET);
+ addressee.insertEmail(tmpStr, false);
+- tmpStr = mVCard->getValue(VCARD_EMAIL,VCARD_EMAIL_PREF);
++ tmpStr = vCard->getValue(VCARD_EMAIL,VCARD_EMAIL_PREF);
+ addressee.insertEmail(tmpStr, true);
+ //set the addressee's url
+- tmpStr = mVCard->getValue(VCARD_URL);
+- if (tmpStr.isEmpty()) tmpStr = mVCard->getValue(VCARD_URL, VCARD_ADR_WORK);
+- if (tmpStr.isEmpty()) tmpStr = mVCard->getValue(VCARD_URL, VCARD_ADR_HOME);
++ tmpStr = vCard->getValue(VCARD_URL);
++ if (tmpStr.isEmpty()) tmpStr = vCard->getValue(VCARD_URL, VCARD_ADR_WORK);
++ if (tmpStr.isEmpty()) tmpStr = vCard->getValue(VCARD_URL, VCARD_ADR_HOME);
+ if (!tmpStr.isEmpty()) {
+ addressee.setUrl(KURL(tmpStr));
+ }
+
+ //set the addressee's birthday
+- tmpStr = mVCard->getValue(VCARD_BDAY);
++ tmpStr = vCard->getValue(VCARD_BDAY);
+ addressee.setBirthday(VCardStringToDate(tmpStr));
+
+ //set the addressee's phone numbers
+- for ( QValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
++ for ( QValueListIterator<VCardLineX> i = vCard->_vcdata->begin();i != vCard->_vcdata->end(); ++i ) {
+ if ( (*i).name == VCARD_TEL ) {
+ int type = 0;
+ if ( (*i).qualified ) {
+@@ -300,7 +300,7 @@
+ }
+
+ //set the addressee's addresses
+- for ( QValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
++ for ( QValueListIterator<VCardLineX> i = vCard->_vcdata->begin();i != vCard->_vcdata->end(); ++i ) {
+ if ( (*i).name == VCARD_ADR ) {
+ int type = 0;
+ if ( (*i).qualified ) {
+@@ -324,7 +324,7 @@
+ }
+
+ //set the addressee's delivery label
+- tmpStr = mVCard->getValue(VCARD_LABEL);
++ tmpStr = vCard->getValue(VCARD_LABEL);
+ if (!tmpStr.isEmpty()) {
+ tmpStr.replace("\r\n","\n");
+ Address tmpAddress;
+@@ -333,17 +333,17 @@
+ }
+
+ //set the addressee's notes
+- tmpStr = mVCard->getValue(VCARD_NOTE);
++ tmpStr = vCard->getValue(VCARD_NOTE);
+ tmpStr.replace("\r\n","\n");
+ addressee.setNote(tmpStr);
+
+ //set the addressee's timezone
+- tmpStr = mVCard->getValue(VCARD_TZ);
++ tmpStr = vCard->getValue(VCARD_TZ);
+ TimeZone tmpZone(tmpStr.toInt());
+ addressee.setTimeZone(tmpZone);
+
+ //set the addressee's geographical position
+- tmpList = mVCard->getValues(VCARD_GEO);
++ tmpList = vCard->getValues(VCARD_GEO);
+ if (tmpList.count()==2)
+ {
+ tmpStr = tmpList[0];
+@@ -355,13 +355,15 @@
+ }
+
+ //set the last revision date
+- tmpStr = mVCard->getValue(VCARD_REV);
++ tmpStr = vCard->getValue(VCARD_REV);
+ addressee.setRevision(VCardStringToDate(tmpStr));
+
+ //set the role of the addressee
+- tmpStr = mVCard->getValue(VCARD_ROLE);
++ tmpStr = vCard->getValue(VCARD_ROLE);
+ addressee.setRole(tmpStr);
+
++ delete vCard;
++
+ return addressee;
+ }
+
+@@ -396,10 +398,10 @@
+ int _err = 0;
+ int _state = VC_STATE_BEGIN;
+
+- QValueList<VCardLineX> *_vcdata;
++ QValueList<VCardLineX> *vcdata;
+ QValueList<QString> lines;
+
+- _vcdata = new QValueList<VCardLineX>;
++ vcdata = new QValueList<VCardLineX>;
+
+ lines = QStringList::split( QRegExp( "[\x0d\x0a]" ), vc );
+
+@@ -505,7 +507,7 @@
+ }
+
+ // add to vector
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.37&r2=1.38&f=u
http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.40&r2=1.41&f=u
http://cvs.pld-linux.org/SOURCES/kdenetwork-branch.diff?r1=1.13&r2=1.14&f=u
More information about the pld-cvs-commit
mailing list