Diffstat (limited to 'kabc/plugins/dir/resourcedir.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kabc/plugins/dir/resourcedir.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
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 | |||
@@ -109,17 +109,15 @@ ResourceDir::ResourceDir( const KConfig *config ) | |||
109 | else if (mFormatName == "binary") | 109 | else if (mFormatName == "binary") |
110 | mFormat = new BinaryFormat(); | 110 | mFormat = new BinaryFormat(); |
111 | else | 111 | else |
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 | } |
123 | 121 | ||
124 | ResourceDir::~ResourceDir() | 122 | ResourceDir::~ResourceDir() |
125 | { | 123 | { |
@@ -295,25 +293,22 @@ void ResourceDir::unlock( const QString &path ) | |||
295 | QFile::remove( mLockUniqueName ); | 293 | QFile::remove( mLockUniqueName ); |
296 | addressBook()->emitAddressBookUnlocked(); | 294 | addressBook()->emitAddressBookUnlocked(); |
297 | } | 295 | } |
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 | ||
317 | QString ResourceDir::path() const | 312 | QString ResourceDir::path() const |
318 | { | 313 | { |
319 | return mPath; | 314 | return mPath; |