-rw-r--r-- | kabc/plugins/dir/dir.pro | 4 | ||||
-rw-r--r-- | kabc/plugins/dir/dirE.pro | 2 | ||||
-rw-r--r-- | kabc/plugins/dir/resourcedir.cpp | 9 |
3 files changed, 5 insertions, 10 deletions
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 | |||
@@ -3,7 +3,7 @@ CONFIG += qt warn_on release | |||
3 | #release debug | 3 | #release debug |
4 | 4 | ||
5 | TARGET = microkabc_dir | 5 | TARGET = microkabc_dir |
6 | INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat | 6 | INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat |
7 | DESTDIR = ../../../bin | 7 | DESTDIR = ../../../bin |
8 | #LIBS += -lmicrokde -lmicrokabc | 8 | #LIBS += -lmicrokde -lmicrokabc |
9 | #LIBS += -L$(QPEDIR)/lib | 9 | #LIBS += -L$(QPEDIR)/lib |
@@ -31,4 +31,4 @@ LIBS += ../../../bin/microkdepim.lib | |||
31 | LIBS += ../../../bin/microkcal.lib | 31 | LIBS += ../../../bin/microkcal.lib |
32 | LIBS += ../../../bin/microkde.lib | 32 | LIBS += ../../../bin/microkde.lib |
33 | LIBS += ../../../bin/microkabc.lib | 33 | LIBS += ../../../bin/microkabc.lib |
34 | } \ No newline at end of file | 34 | } |
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 | |||
@@ -3,7 +3,7 @@ CONFIG += qt warn_on release | |||
3 | #release debug | 3 | #release debug |
4 | 4 | ||
5 | TARGET = microkabc_dir | 5 | TARGET = microkabc_dir |
6 | INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat | 6 | INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat |
7 | OBJECTS_DIR = obj/$(PLATFORM) | 7 | OBJECTS_DIR = obj/$(PLATFORM) |
8 | MOC_DIR = moc/$(PLATFORM) | 8 | MOC_DIR = moc/$(PLATFORM) |
9 | DESTDIR = $(QPEDIR)/lib | 9 | DESTDIR = $(QPEDIR)/lib |
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 | |||
@@ -112,11 +112,9 @@ ResourceDir::ResourceDir( const KConfig *config ) | |||
112 | qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1()); | 112 | qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1()); |
113 | */ | 113 | */ |
114 | 114 | ||
115 | /*US we have no KDirWatch. SO simulate the signals from inside the apropriate methods | ||
116 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) ); | 115 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) ); |
117 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) ); | 116 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) ); |
118 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) ); | 117 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) ); |
119 | */ | ||
120 | 118 | ||
121 | setPath( path ); | 119 | setPath( path ); |
122 | } | 120 | } |
@@ -298,19 +296,16 @@ void ResourceDir::unlock( const QString &path ) | |||
298 | 296 | ||
299 | void ResourceDir::setPath( const QString &path ) | 297 | void ResourceDir::setPath( const QString &path ) |
300 | { | 298 | { |
301 | /*US ToDo: no synchronization so far. Has to be changed in the future | ||
302 | mDirWatch.stopScan(); | 299 | mDirWatch.stopScan(); |
303 | mDirWatch.removeDir( mPath ); | 300 | mDirWatch.removeDir( mPath ); |
304 | */ | 301 | |
305 | mPath = path; | 302 | mPath = path; |
306 | 303 | ||
307 | /*US ToDo: no synchronization so far. Has to be changed in the future | ||
308 | mDirWatch.addDir( mPath, true ); | 304 | mDirWatch.addDir( mPath, true ); |
309 | mDirWatch.startScan(); | 305 | mDirWatch.startScan(); |
310 | */ | ||
311 | 306 | ||
312 | //US simulate KDirWatch event | 307 | //US simulate KDirWatch event |
313 | pathChanged(); | 308 | //US pathChanged(); |
314 | 309 | ||
315 | } | 310 | } |
316 | 311 | ||