-rw-r--r-- | kabc/plugins/opie/resourceopie.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp index 1222242..5559827 100644 --- a/kabc/plugins/opie/resourceopie.cpp +++ b/kabc/plugins/opie/resourceopie.cpp | |||
@@ -51,5 +51,5 @@ $Id$ | |||
51 | #include "resourceopieconfig.h" | 51 | #include "resourceopieconfig.h" |
52 | #include "stdaddressbook.h" | 52 | #include "stdaddressbook.h" |
53 | #include "syncwidget.h" | 53 | #include "syncprefwidget.h" |
54 | 54 | ||
55 | #include "opieconverter.h" | 55 | #include "opieconverter.h" |
@@ -62,5 +62,5 @@ extern "C" | |||
62 | void *init_microkabc_opie() | 62 | void *init_microkabc_opie() |
63 | { | 63 | { |
64 | return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, KRES::SyncWidget>(); | 64 | return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, SyncPrefWidget>(); |
65 | } | 65 | } |
66 | } | 66 | } |
@@ -77,6 +77,4 @@ ResourceOpie::ResourceOpie( const KConfig *config, bool syncable ) | |||
77 | } | 77 | } |
78 | 78 | ||
79 | // qDebug("ResourceOpie::ResourceOpie : %s", fileName.latin1() ); | ||
80 | |||
81 | init( fileName ); | 79 | init( fileName ); |
82 | } | 80 | } |
@@ -85,5 +83,4 @@ ResourceOpie::ResourceOpie( const QString &fileName, bool syncable ) | |||
85 | : Resource( 0, syncable ) | 83 | : Resource( 0, syncable ) |
86 | { | 84 | { |
87 | // qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1()); | ||
88 | init( fileName ); | 85 | init( fileName ); |
89 | } | 86 | } |
@@ -96,7 +93,5 @@ void ResourceOpie::init( const QString &fileName ) | |||
96 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); | 93 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); |
97 | 94 | ||
98 | |||
99 | setFileName( fileName ); | 95 | setFileName( fileName ); |
100 | |||
101 | } | 96 | } |
102 | 97 | ||
@@ -108,5 +103,4 @@ ResourceOpie::~ResourceOpie() | |||
108 | if(mAccess != 0) | 103 | if(mAccess != 0) |
109 | delete mAccess; | 104 | delete mAccess; |
110 | |||
111 | } | 105 | } |
112 | 106 | ||
@@ -252,14 +246,8 @@ bool ResourceOpie::lock( const QString &lockfileName ) | |||
252 | qDebug("ResourceOpie::lock: %s", fileName().latin1()); | 246 | qDebug("ResourceOpie::lock: %s", fileName().latin1()); |
253 | 247 | ||
254 | |||
255 | // qDebug("ResourceOpie::lock() %s", fileName.latin1()); | ||
256 | kdDebug(5700) << "ResourceOpie::lock()" << endl; | 248 | kdDebug(5700) << "ResourceOpie::lock()" << endl; |
257 | 249 | ||
258 | QString fn = lockfileName; | 250 | QString fn = lockfileName; |
259 | 251 | ||
260 | //US change the implementation how the lockfilename is getting created | ||
261 | //US fn.replace( QRegExp("/"), "_" ); | ||
262 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); | ||
263 | |||
264 | KURL url(fn); | 252 | KURL url(fn); |
265 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 253 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
@@ -303,8 +291,4 @@ void ResourceOpie::unlock( const QString &fileName ) | |||
303 | 291 | ||
304 | QString fn = fileName; | 292 | QString fn = fileName; |
305 | //US change the implementation how the lockfilename is getting created | ||
306 | //US fn.replace( QRegExp( "/" ), "_" ); | ||
307 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); | ||
308 | //US QString lockName = fn + ".lock"; | ||
309 | KURL url(fn); | 293 | KURL url(fn); |
310 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 294 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |