15 files changed, 27 insertions, 38 deletions

diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp
index 0735aba..1fb186e 100644
--- a/kabc/distributionlist.cpp
+++ b/kabc/distributionlist.cpp
@@ -265,23 +265,20 @@ DistributionListWatcher* DistributionListWatcher::mSelf = 0;
 
 DistributionListWatcher::DistributionListWatcher()
  : QObject( 0, "DistributionListWatcher" )
 {
-/*US  
+
   mDirWatch = new KDirWatch;
   mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) );
   
   connect( mDirWatch, SIGNAL( dirty( const QString& ) ), SIGNAL( changed() ) );
   mDirWatch->startScan();
-*/
 }
 
 DistributionListWatcher::~DistributionListWatcher()
 {
-/*US
   delete mDirWatch;
   mDirWatch = 0;
-*/
 }
 
 DistributionListWatcher *DistributionListWatcher::self()
 {
diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h
index 5f091b1..584f287 100644
--- a/kabc/distributionlist.h
+++ b/kabc/distributionlist.h
@@ -209,9 +209,9 @@ class DistributionListWatcher : public QObject
     ~DistributionListWatcher();
 
   private:
     static DistributionListWatcher* mSelf;
-//US    KDirWatch *mDirWatch;
+    KDirWatch *mDirWatch;
 };
 
 }
 #endif
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 4a8d73a..a8cd695 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -6,9 +6,9 @@ DESTDIR=../bin
 TARGET = microkabc
 
 include( ../variables.pri )
 
-INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../qtcompat ../microkde/kdeui
+INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../qtcompat ../microkde/kdeui
 
 #LIBS += -lmicrokde -lldap
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED  DESKTOP_VERSION
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 840afb9..bc1c0ed 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -2,9 +2,9 @@ TEMPLATE	= lib
 CONFIG += qt warn_on 
 TARGET = microkabc
 
 
-INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat $(QPEDIR)/include
+INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
index 0023029..0555484 100644
--- a/kabc/plugins/dir/dir.pro
+++ b/kabc/plugins/dir/dir.pro
@@ -2,9 +2,9 @@ TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabc_dir
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat
 DESTDIR = ../../../bin
 #LIBS += -lmicrokde -lmicrokabc
 #LIBS += -L$(QPEDIR)/lib
 
@@ -30,5 +30,5 @@ 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/dirE.pro b/kabc/plugins/dir/dirE.pro
index aceb28a..729f4ce 100644
--- a/kabc/plugins/dir/dirE.pro
+++ b/kabc/plugins/dir/dirE.pro
@@ -2,9 +2,9 @@ TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabc_dir
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde -lmicrokabc
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 3cb5179..7825c6f 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -111,13 +111,11 @@ ResourceDir::ResourceDir( const KConfig *config )
   else
     qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1());
 */
   
-/*US we have no KDirWatch. SO simulate the signals from inside the apropriate methods
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) );
-*/
 
   setPath( path );
 }
 
@@ -297,21 +295,18 @@ void ResourceDir::unlock( const QString &path )
 }
 
 void ResourceDir::setPath( const QString &path )
 {
-/*US ToDo: no synchronization so far. Has to be changed in the future
   mDirWatch.stopScan();
   mDirWatch.removeDir( mPath );
-*/
+  
   mPath = path;
 
-/*US ToDo: no synchronization so far. Has to be changed in the future
   mDirWatch.addDir( mPath, true );
   mDirWatch.startScan();
-*/  
 
 //US simulate KDirWatch event  
-  pathChanged();
+//US  pathChanged();
 
 }
 
 QString ResourceDir::path() const
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
index 7cf7c58..32555a2 100644
--- a/kabc/plugins/file/file.pro
+++ b/kabc/plugins/file/file.pro
@@ -2,9 +2,9 @@ TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabc_file
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../qtcompat
 
 DESTDIR = ../../../bin
 #LIBS += -lmicrokde -lmicrokabc
 #LIBS += -L$(QPEDIR)/lib
@@ -31,5 +31,5 @@ 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/fileE.pro b/kabc/plugins/file/fileE.pro
index 2d17a8f..d19a26d 100644
--- a/kabc/plugins/file/fileE.pro
+++ b/kabc/plugins/file/fileE.pro
@@ -2,9 +2,9 @@ TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabc_file
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde -lmicrokabc
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 2d20706..9f9b00f 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -48,12 +48,8 @@ $Id$
 #include "resource.h"
 #include "resourcefileconfig.h"
 #include "stdaddressbook.h"
 
-//US #include "../../formats/vcardformatplugin2.h"
-//US #include "../../formats/binaryformat.h"
-
-
 #include "resourcefile.h"
 
 using namespace KABC;
 
@@ -125,13 +121,11 @@ void ResourceFile::init( const QString &fileName, const QString &formatName )
   else
     qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1());
 */
 
-/*US we have no KDirWatch. SO simulate the signals from inside the apropriate methods
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
-*/
 
   setFileName( fileName );
 }
 
@@ -325,21 +319,19 @@ void ResourceFile::unlock( const QString &fileName )
 }
 
 void ResourceFile::setFileName( const QString &fileName )
 {
-/*US ToDo: no synchronization so far. Has to be changed in the future
   mDirWatch.stopScan();
   mDirWatch.removeFile( mFileName );
-*/
+  
   mFileName = fileName;
 
   
-/*US ToDo: no synchronization so far. Has to be changed in the future
   mDirWatch.addFile( mFileName );
   mDirWatch.startScan();
-*/
+
 //US simulate KDirWatch event  
-  fileChanged();
+//US  fileChanged();
 }
 
 QString ResourceFile::fileName() const
 {
diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro
index 75a5dab..4048cc0 100644
--- a/kabc/plugins/opie/opieE.pro
+++ b/kabc/plugins/opie/opieE.pro
@@ -2,9 +2,9 @@ TEMPLATE	= lib
 CONFIG += qt warn_on
 #release debug
 TARGET = microkabc_opie
 
-INCLUDEPATH += ../.. ../../converter/opie ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include $(OPIEDIR)/include
+INCLUDEPATH += ../.. ../../converter/opie ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include $(OPIEDIR)/include
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index bc14e68..77fce1b 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -5,9 +5,9 @@ DESTDIR= ../bin
 
 include( ../variables.pri )
 
 
-INCLUDEPATH += . ./details  ./features ./kcmconfigs  ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kdeui ../kabc  ../ interfaces 
+INCLUDEPATH += . ./details  ./features ./kcmconfigs  ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../kabc  ../ interfaces 
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
 
 unix : {
 LIBS += ../bin/libmicrokdepim.so
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index 9451f52..dc4a2f2 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -9,9 +9,9 @@ DESTDIR=$(QPEDIR)/bin
 
 #LFLAGS += -Wl,-export-dynamic
 
 
-INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kdeui ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
+INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER
 #DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL
 #DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 #DEFINES += KORG_NOLVALTERNATION
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 05833a9..4ebf53c 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -1,9 +1,9 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on 
 #INCLUDEPATH     += $(QTDIR)/include .
 #DEPENDPATH      += $(QTDIR)/include
-INCLUDEPATH     += .  ../  ../kabc ./kdecore ./kdeui ./kio/kfile
+INCLUDEPATH     += .  ../  ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio
 #LIBS            += -lqtcompat
 
         TARGET  = microkde
 DESTDIR= ../bin
@@ -69,8 +69,10 @@ KDGanttMinimizeSplitter.h \
  kdeui/knuminput.h \
  kdeui/knumvalidator.h \
  kdeui/ksqueezedtextlabel.h \
  kio/job.h \
+ kio/kio/kdirwatch.h \
+ kio/kio/kdirwatch_p.h \
  kio/kfile/kurlrequester.h \
  kresources/resource.h \
  kresources/factory.h \
  kresources/managerimpl.h \
@@ -145,8 +147,9 @@ KDGanttMinimizeSplitter.cpp \
  kdeui/knuminput.cpp \
  kdeui/knumvalidator.cpp \
  kdeui/kseparator.cpp \
  kdeui/ksqueezedtextlabel.cpp \
+ kio/kio/kdirwatch.cpp \
  kio/kfile/kurlrequester.cpp \
  kresources/configpage.cpp \
  kresources/configdialog.cpp \
  kresources/configwidget.cpp \
@@ -164,5 +167,5 @@ KDGanttMinimizeSplitter.cpp \
  kdeui/ktoolbarbutton.cpp \
  kdeui/ktoolbarhandler.cpp \
  kdeui/kstdaction.cpp \
  kdeui/kxmlguiclient.cpp \
- kdecore/klibloader.cpp 
\ No newline at end of file
+ kdecore/klibloader.cpp 
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index 4ee4dd7..ec2b1f7 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -1,7 +1,7 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
-INCLUDEPATH     += . ../qtcompat ../kabc ./kdecore ./kdeui ./kio/kfile $(QPEDIR)/include
+INCLUDEPATH     += . ../qtcompat ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio $(QPEDIR)/include
 
 DEPENDPATH      += $(QPEDIR)/include
 LIBS            += -lmicroqtcompat -L$(QPEDIR)/lib
 
@@ -29,9 +29,8 @@ KDGanttMinimizeSplitter.h \
  kdatetbl.h \
  kdebug.h \
  kdialog.h \
  kdialogbase.h \
- kdirwatch.h \
  keditlistbox.h \
  kemailsettings.h \
  kfiledialog.h \
  kfontdialog.h \
@@ -77,8 +76,10 @@ osmartpointer.h \
  kdeui/ktoolbarbutton.h \
  kdeui/ktoolbarhandler.h \
  kdeui/kxmlguiclient.h \
  kio/job.h \
+ kio/kio/kdirwatch.h \
+ kio/kio/kdirwatch_p.h \
  kio/kfile/kurlrequester.h \
  kresources/resource.h \
  kresources/factory.h \
  kresources/managerimpl.h \
@@ -158,8 +159,9 @@ oprocess.cpp \
  kdeui/ktoolbarbutton.cpp \
  kdeui/ktoolbarhandler.cpp \
  kdeui/kxmlguiclient.cpp \
  kio/kfile/kurlrequester.cpp \
+ kio/kio/kdirwatch.cpp \
  kresources/configpage.cpp \
  kresources/configdialog.cpp \
  kresources/configwidget.cpp \
  kresources/factory.cpp \