From da324c30ae57558b268563a601957c6e6d12c4af Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Thu, 8 Dec 2005 14:10:46 +0000
Subject: [PATCH] Don't use a global object in a library, the order of
 initialization is undefined so it can crash if e.g. QString::null hasn't been
 initialized yet. Using a pointer instead, with delayed initialization.

svn path=/trunk/KDE/kdepim/; revision=486706
---
 callback.cpp    | 4 ++--
 kmfiltermgr.cpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/callback.cpp b/callback.cpp
index da23c1f5d..89849b3ae 100644
--- a/callback.cpp
+++ b/callback.cpp
@@ -79,7 +79,7 @@ bool Callback::mailICal( const QString& to, const QString iCal,
     // Try and match the receiver with an identity
     const KPIM::Identity& identity =
       kmkernel->identityManager()->identityForAddress( receiver() );
-    if( identity != KPIM::Identity::null )
+    if( identity != KPIM::Identity::null() )
       // Identity found. Use this
       msg->setFrom( identity.fullEmailAddr() );
       msg->setHeaderField("X-KMail-Identity", QString::number( identity.uoid() ));
@@ -119,7 +119,7 @@ QString Callback::receiver() const
     int found = 0;
     for( QStringList::Iterator it = addrs.begin(); it != addrs.end(); ++it ) {
       if( kmkernel->identityManager()->identityForAddress( *it ) !=
-          KPIM::Identity::null ) {
+          KPIM::Identity::null() ) {
 	// Ok, this could be us
         ++found;
         mReceiver = *it;
diff --git a/kmfiltermgr.cpp b/kmfiltermgr.cpp
index b47dc881f..7c4607dcf 100644
--- a/kmfiltermgr.cpp
+++ b/kmfiltermgr.cpp
@@ -311,8 +311,9 @@ bool KMFilterMgr::atLeastOneOnlineImapFolderTarget()
   QList<KMFilter*>::const_iterator it = mFilters.begin();
   for ( ; it != mFilters.end() ; ++it ) {
     KMFilter *filter = *it;
-    QList<KMFilterAction*>::const_iterator jt( filter->actions()->begin() );
-    for ( ; jt != filter->actions()->end() ; ++jt ) {
+    QList<KMFilterAction*>::const_iterator jt = filter->actions()->begin();
+    const QList<KMFilterAction*>::const_iterator jtend = filter->actions()->end();
+    for ( ; jt != jtend ; ++jt ) {
       KMFilterActionWithFolder *f = dynamic_cast<KMFilterActionWithFolder*>(*jt);
       if (!f)
         continue;