Compile fixes for windows

8 files changed, 39 insertions, 6 deletions

diff --git a/bin/kdepim/kaddressbook/icons22/ka24.png b/bin/kdepim/kaddressbook/icons22/ka24.png
new file mode 100644
index 0000000..738e939
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/ka24.png
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
index 3db201f..0023029 100644
--- a/kabc/plugins/dir/dir.pro
+++ b/kabc/plugins/dir/dir.pro
@@ -23,7 +23,12 @@ 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
 }
\ No newline at end of file
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 6ea2f4b..3cb5179 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -62,14 +62,20 @@ $Id$
 using namespace KABC;
 
 extern "C"
+#ifdef _WIN32_
+__declspec(dllexport) 
+#else
 {
+#endif
+
 //US  void *init_kabc_dir()
   void *init_microkabc_dir()
   {
     return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
   }
+#ifndef _WIN32_
 }
-
+#endif
 
 ResourceDir::ResourceDir( const KConfig *config )
     : Resource( config )
@@ -122,7 +128,8 @@ ResourceDir::~ResourceDir()
 }
 
 void ResourceDir::writeConfig( KConfig *config )
-{
+{ 
+    config->setGroup( "Resource_" + identifier() ); 
   Resource::writeConfig( config );
 
   config->writeEntry( "FilePath", mPath );
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
index a5ade93..7cf7c58 100644
--- a/kabc/plugins/file/file.pro
+++ b/kabc/plugins/file/file.pro
@@ -24,7 +24,12 @@ 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
 }
\ No newline at end of file
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 4b4c935..2d20706 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -58,14 +58,20 @@ $Id$
 using namespace KABC;
 
 extern "C"
+#ifdef _WIN32_
+__declspec(dllexport) 
+#else
 {
+#endif
+
 //US  void *init_kabc_file()
   void *init_microkabc_file()
   {
     return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
   }
+#ifndef _WIN32_
 }
-
+#endif
 
 ResourceFile::ResourceFile( const KConfig *config )
   : Resource( config ) , mFormat( 0 )
@@ -137,6 +143,8 @@ ResourceFile::~ResourceFile()
 
 void ResourceFile::writeConfig( KConfig *config )
 {
+
+    config->setGroup( "Resource_" + identifier() ); 
   Resource::writeConfig( config );
 
   config->writeEntry( "FileName", mFileName );
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index cf1fd3e..7f368eb 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -59,6 +59,7 @@ int main( int argc, char **argv )
        a.showMainWidget( &m );
 #else
       a.setMainWidget( &m );
+      m.resize (640, 480 );
       m.show();
 #endif
       a.exec();
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 98b2fb2..9804e28 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -238,9 +238,9 @@ ContactListView::ContactListView(KAddressBookTableView *view,
   setSelectionModeExt( KListView::Extended   );
   setDropVisualizer(false);
   // setFrameStyle(QFrame::NoFrame);
-  setLineWidth ( 0 );
-  setMidLineWidth ( 0 );
-  setMargin ( 0 );
+  //setLineWidth ( 0 );
+  //setMidLineWidth ( 0 );
+  //setMargin ( 0 );
 #ifndef KAB_EMBEDDED  
   connect(this, SIGNAL(dropped(QDropEvent*)),
           this, SLOT(itemDropped(QDropEvent*)));
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp
index 9eee912..1394154 100644
--- a/microkde/kdecore/klibloader.cpp
+++ b/microkde/kdecore/klibloader.cpp
@@ -378,8 +378,13 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta
     }
 */    
 //US in the microedition we work only with shared libraries.
+
     if (libname.find('.', pos) < 0) {
+#ifdef _WIN32_
+      libname += ".dll";
+#else
       libname += ".so";
+#endif
     }
 
     // only look up the file if it is not an absolute filename
@@ -392,7 +397,9 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta
 //US at this point the libname must exist as real filesname. No expansions will be made later
 // in findResources. Because of that we prepend the lib prefix here to the name 
 //US I add also the "lib" prefix. I do not how could this could have worked before without it?
+#ifndef _WIN32_
     libname.insert(pos, "lib");
+#endif
     
     
 //US      libfile = instance->dirs()->findResource( "module", libname );