author | ulf69 <ulf69> | 2004-07-14 14:52:15 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-14 14:52:15 (UTC) |
commit | cf7175c9a6b96cd11fb7f3cba459f5223aa4aacb (patch) (unidiff) | |
tree | e14057a10fba52a7b2881f5bacb0d266e415bd83 /kabc/plugins/file | |
parent | 80b35ebb50cac5007c074a4900f518f48f704eac (diff) | |
download | kdepimpi-cf7175c9a6b96cd11fb7f3cba459f5223aa4aacb.zip kdepimpi-cf7175c9a6b96cd11fb7f3cba459f5223aa4aacb.tar.gz kdepimpi-cf7175c9a6b96cd11fb7f3cba459f5223aa4aacb.tar.bz2 |
added changes to support the kdirwatch implementation
-rw-r--r-- | kabc/plugins/file/file.pro | 4 | ||||
-rw-r--r-- | kabc/plugins/file/fileE.pro | 2 | ||||
-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 14 |
3 files changed, 6 insertions, 14 deletions
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 | |||
@@ -5,3 +5,3 @@ CONFIG += qt warn_on release | |||
5 | TARGET = microkabc_file | 5 | TARGET = microkabc_file |
6 | INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat | 6 | INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat |
7 | 7 | ||
@@ -34,2 +34,2 @@ LIBS += ../../../bin/microkde.lib | |||
34 | LIBS += ../../../bin/microkabc.lib | 34 | LIBS += ../../../bin/microkabc.lib |
35 | } \ No newline at end of file | 35 | } |
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 | |||
@@ -5,3 +5,3 @@ CONFIG += qt warn_on release | |||
5 | TARGET = microkabc_file | 5 | TARGET = microkabc_file |
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) |
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 | |||
@@ -51,6 +51,2 @@ $Id$ | |||
51 | 51 | ||
52 | //US #include "../../formats/vcardformatplugin2.h" | ||
53 | //US #include "../../formats/binaryformat.h" | ||
54 | |||
55 | |||
56 | #include "resourcefile.h" | 52 | #include "resourcefile.h" |
@@ -128,3 +124,2 @@ void ResourceFile::init( const QString &fileName, const QString &formatName ) | |||
128 | 124 | ||
129 | /*US we have no KDirWatch. SO simulate the signals from inside the apropriate methods | ||
130 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); | 125 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); |
@@ -132,3 +127,2 @@ void ResourceFile::init( const QString &fileName, const QString &formatName ) | |||
132 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); | 127 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); |
133 | */ | ||
134 | 128 | ||
@@ -328,6 +322,5 @@ void ResourceFile::setFileName( const QString &fileName ) | |||
328 | { | 322 | { |
329 | /*US ToDo: no synchronization so far. Has to be changed in the future | ||
330 | mDirWatch.stopScan(); | 323 | mDirWatch.stopScan(); |
331 | mDirWatch.removeFile( mFileName ); | 324 | mDirWatch.removeFile( mFileName ); |
332 | */ | 325 | |
333 | mFileName = fileName; | 326 | mFileName = fileName; |
@@ -335,8 +328,7 @@ void ResourceFile::setFileName( const QString &fileName ) | |||
335 | 328 | ||
336 | /*US ToDo: no synchronization so far. Has to be changed in the future | ||
337 | mDirWatch.addFile( mFileName ); | 329 | mDirWatch.addFile( mFileName ); |
338 | mDirWatch.startScan(); | 330 | mDirWatch.startScan(); |
339 | */ | 331 | |
340 | //US simulate KDirWatch event | 332 | //US simulate KDirWatch event |
341 | fileChanged(); | 333 | //US fileChanged(); |
342 | } | 334 | } |