Diffstat (limited to 'kabc/plugins/file/resourcefile.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
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 | |||
@@ -46,16 +46,12 @@ $Id$ | |||
46 | #include "formatfactory.h" | 46 | #include "formatfactory.h" |
47 | 47 | ||
48 | #include "resource.h" | 48 | #include "resource.h" |
49 | #include "resourcefileconfig.h" | 49 | #include "resourcefileconfig.h" |
50 | #include "stdaddressbook.h" | 50 | #include "stdaddressbook.h" |
51 | 51 | ||
52 | //US #include "../../formats/vcardformatplugin2.h" | ||
53 | //US #include "../../formats/binaryformat.h" | ||
54 | |||
55 | |||
56 | #include "resourcefile.h" | 52 | #include "resourcefile.h" |
57 | 53 | ||
58 | using namespace KABC; | 54 | using namespace KABC; |
59 | 55 | ||
60 | extern "C" | 56 | extern "C" |
61 | #ifdef _WIN32_ | 57 | #ifdef _WIN32_ |
@@ -123,17 +119,15 @@ void ResourceFile::init( const QString &fileName, const QString &formatName ) | |||
123 | // qDebug("ResourceFile::init format BinaryFormat"); | 119 | // qDebug("ResourceFile::init format BinaryFormat"); |
124 | } | 120 | } |
125 | else | 121 | else |
126 | qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1()); | 122 | qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1()); |
127 | */ | 123 | */ |
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() ) ); |
131 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); | 126 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); |
132 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); | 127 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); |
133 | */ | ||
134 | 128 | ||
135 | setFileName( fileName ); | 129 | setFileName( fileName ); |
136 | } | 130 | } |
137 | 131 | ||
138 | ResourceFile::~ResourceFile() | 132 | ResourceFile::~ResourceFile() |
139 | { | 133 | { |
@@ -323,25 +317,23 @@ void ResourceFile::unlock( const QString &fileName ) | |||
323 | QFile::remove( mLockUniqueName ); | 317 | QFile::remove( mLockUniqueName ); |
324 | addressBook()->emitAddressBookUnlocked(); | 318 | addressBook()->emitAddressBookUnlocked(); |
325 | } | 319 | } |
326 | 320 | ||
327 | void ResourceFile::setFileName( const QString &fileName ) | 321 | 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; |
334 | 327 | ||
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 | } |
343 | 335 | ||
344 | QString ResourceFile::fileName() const | 336 | QString ResourceFile::fileName() const |
345 | { | 337 | { |
346 | return mFileName; | 338 | return mFileName; |
347 | } | 339 | } |