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$
 #include "resourceopieconfig.h"
 #include "stdaddressbook.h"
-#include "syncwidget.h"
+#include "syncprefwidget.h"
 
 #include "opieconverter.h"
@@ -62,5 +62,5 @@ extern "C"
   void *init_microkabc_opie()
   {
-    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, KRES::SyncWidget>();
+    return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, SyncPrefWidget>();
   }
 }
@@ -77,6 +77,4 @@ ResourceOpie::ResourceOpie( const KConfig *config, bool syncable )
   }
 
-//  qDebug("ResourceOpie::ResourceOpie : %s", fileName.latin1() );
-
   init( fileName );
 }
@@ -85,5 +83,4 @@ ResourceOpie::ResourceOpie( const QString &fileName, bool syncable  )
   : Resource( 0, syncable )
 {
-//  qDebug("ResourceOpie::ResourceOpie : 3 %s", fileName.latin1());
   init( fileName );
 }
@@ -96,7 +93,5 @@ void ResourceOpie::init( const QString &fileName )
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 
-
   setFileName( fileName );
-
 }
 
@@ -108,5 +103,4 @@ ResourceOpie::~ResourceOpie()
   if(mAccess != 0)
     delete mAccess;
-
 }
 
@@ -252,14 +246,8 @@ bool ResourceOpie::lock( const QString &lockfileName )
   qDebug("ResourceOpie::lock: %s", fileName().latin1());
 
-
-//  qDebug("ResourceOpie::lock() %s", fileName.latin1());
   kdDebug(5700) << "ResourceOpie::lock()" << endl;
 
   QString fn = lockfileName;
 
-//US change the implementation how the lockfilename is getting created
-//US  fn.replace( QRegExp("/"), "_" );
-//US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
-
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
@@ -303,8 +291,4 @@ void ResourceOpie::unlock( const QString &fileName )
 
   QString fn = fileName;
-//US change the implementation how the lockfilename is getting created
-//US  fn.replace( QRegExp( "/" ), "_" );
-//US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
-//US  QString lockName = fn + ".lock";
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );