commit

2 files changed, 4 insertions, 2 deletions

diff --git a/kabc/plugins/olaccess/olaccess.pro b/kabc/plugins/olaccess/olaccess.pro
index 4416d0c..9b95015 100644
--- a/kabc/plugins/olaccess/olaccess.pro
+++ b/kabc/plugins/olaccess/olaccess.pro
@@ -1,34 +1,35 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on
 TARGET = microkabc_olaccess
 
 include( ../../../variables.pri )
 
 INCLUDEPATH += ../../.. ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 
 INTERFACES = \
 
+DESTDIR = ../../../bin
 HEADERS = \
  resourceolaccess.h \
  resourceolaccessconfig.h \
  olaccessconverter.h 
  
 SOURCES = \
  resourceolaccess.cpp \
  resourceolaccessconfig.cpp \
  olaccessconverter.cpp
 
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 LIBS += ../../../bin/microkdepim.lib
 LIBS += ../../../bin/microkcal.lib
 LIBS += ../../../bin/microkde.lib
 LIBS += ../../../bin/microkabc.lib
 }
diff --git a/kabc/plugins/olaccess/resourceolaccess.cpp b/kabc/plugins/olaccess/resourceolaccess.cpp
index 7113e0e..c7c9874 100644
--- a/kabc/plugins/olaccess/resourceolaccess.cpp
+++ b/kabc/plugins/olaccess/resourceolaccess.cpp
@@ -1,126 +1,127 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2004 Ulf Schenk
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library 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
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
 
 #include <libkdepim/ksyncprofile.h>
 
 #include "resourceolaccessconfig.h"
 #include "resourceolaccess.h"
 
 #include "stdaddressbook.h"
 
 #include "olaccessconverter.h"
 //#define ALLOW_LOCKING
 using namespace KABC;
 extern "C"
-{
+__declspec(dllexport)
+
   void *init_microkabc_olaccess()
   {
     return new KRES::PluginFactory<Resourceolaccess,ResourceolaccessConfig>();
   }
-}
+
 
 Resourceolaccess::Resourceolaccess( const KConfig *config  )
   : Resource( config ), mConverter (0)
 {
   // we can not choose the filename. Therefore use the default to display
   //mAccess = 0;
   QString fileName;// = SlZDataBase::addressbookFileName();
     init( fileName );
 }
 
 Resourceolaccess::Resourceolaccess( const QString &fileName  )
   : Resource( 0 )
 {
   //mAccess = 0;
     init( fileName );
 }
 
 void Resourceolaccess::init( const QString &fileName )
 {
     if (mConverter == 0) {
         mConverter = new OlaccessConverter();
         bool res = mConverter->init(); 
         if ( !res )
             {
                 QString msg("Unable to initialize sharp converter. Most likely a problem with the category file");
                 qDebug(msg);
                 return;
             }
     } 
     setFileName( fileName );
 }
 
 Resourceolaccess::~Resourceolaccess()
 {
   if (mConverter != 0)
     delete mConverter;
 
   //if(mAccess != 0)
   //delete mAccess;
 }
 
 void Resourceolaccess::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 }
 
 Ticket *Resourceolaccess::requestSaveTicket()
 {
 
   qDebug("Resourceolaccess::requestSaveTicket: %s", fileName().latin1());
 
   if ( !addressBook() ) return 0;
   return createTicket( this );
 }
 
 
 bool Resourceolaccess::doOpen()
 { 
     if (!mConverter)
         return false;
     return true;
 }
 
 void Resourceolaccess::doClose()