1 files changed, 8 insertions, 9 deletions

diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 405f7ec..95b240d 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -9,48 +9,50 @@
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     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.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qlayout.h>
 #include <qlist.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kabc/addressbook.h>
 #include <kabc/resource.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else //KAB_EMBEDDED
 extern "C"
 {
   void* init_microkaddrbk_csv_xxport();
   void* init_microkaddrbk_kde2_xxport();
   void* init_microkaddrbk_vcard_xxport();
   //  void* init_microkaddrbk_opie_xxport();
   void* init_microkaddrbk_qtopia_xxport();
   void* init_microkaddrbk_sharpdtm_xxport();
 }
 #endif //KAB_EMBEDDED
 
 #include <addresseeview.h>
 
@@ -196,75 +198,72 @@ void XXPortManager::loadPlugins()
 {
   mXXPortObjects.clear();
 
 #ifndef KAB_EMBEDDED
   KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort" );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) )
       continue;
 
     KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
     if ( !factory ) {
       kdDebug(5720) << "XXPortManager::loadExtensions(): Factory creation failed" << endl;
       continue;
     }
 
     XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
 
     if ( !xxportFactory ) {
       kdDebug(5720) << "XXPortManager::loadExtensions(): Cast failed" << endl;
       continue;
     }
 
 #else //KAB_EMBEDDED
-  QList<XXPortFactory> factorylist;
+  QList<XXPortFactory*> factorylist;
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_csv_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_kde2_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_vcard_xxport()));
   //US  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_opie_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_qtopia_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_sharpdtm_xxport()));
 
-  QListIterator<XXPortFactory> it(factorylist);
-  for ( ; it.current(); ++it )
-  {
-    XXPortFactory *xxportFactory = it.current();
+  for(QList<XXPortFactory*>::iterator it=factorylist.begin();it!=factorylist.end();++it) {
+    XXPortFactory *xxportFactory = *it;
 #endif //KAB_EMBEDDED
 
     XXPortObject *obj = xxportFactory->xxportObject( mCore->addressBook(), mCore );
     if ( obj ) {
       mCore->addGUIClient( obj );
       mXXPortObjects.insert( obj->identifier(), obj );
       connect( obj, SIGNAL( exportActivated( const QString&, const QString& ) ),
                this, SLOT( slotExport( const QString&, const QString& ) ) );
       connect( obj, SIGNAL( importActivated( const QString&, const QString& ) ),
                this, SLOT( slotImport( const QString&, const QString& ) ) );
     }
   }
 }
 
 
 PreviewDialog::PreviewDialog( const KABC::Addressee &addr, QWidget *parent,
                               const char *name )
   : KDialogBase( Plain, i18n( "Import this contact?" ), Ok | User1| User2, Ok, parent,
                  name, true, true ,i18n( "Import all!" ),i18n( "No" ) )
 {
   QWidget *page = plainPage();
-  QVBoxLayout *layout = new QVBoxLayout( page, marginHint(), spacingHint() );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( page, marginHint(), spacingHint() );
   connect( this, SIGNAL( user1Clicked() ), this, SLOT ( slotClose() ) );
   connect( this, SIGNAL( user2Clicked() ), this, SLOT ( slotCancel() ) );
 
   KABC::AddresseeView *view = new KABC::AddresseeView( page );
   view->setAddressee( addr );
   layout->addWidget( view );
 #ifdef DESKTOP_VERSION
   resize( 640, 480 );
 #else
   showMaximized();
 #endif
 }
 
-#ifndef KAB_EMBEDDED
-#include "xxportmanager.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_xxportmanager.cpp"
 #endif //KAB_EMBEDDED
-