2 files changed, 6 insertions, 14 deletions

diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index 15dc152..e7c35fb 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -25,23 +25,18 @@
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kdebug.h>
 
 #include "ksyncprofile.h"
 
 
-KSyncProfile::KSyncProfile( const char * identifier): QObject (0, identifier )
+KSyncProfile::KSyncProfile(): QObject ()
 {
-    setIdentifier( identifier );
-
-    if (getIdentifier().isEmpty())
-      setIdentifier( "noID" );
-
     setDefault();
 }
 KSyncProfile::~KSyncProfile()
 {
 
 }
 
 
@@ -63,17 +58,17 @@ KSyncProfile* KSyncProfile::clone()
     myClone->setWriteBackFuture( mWriteBackFuture );
     myClone->setWriteBackFutureWeeks( mWriteBackFutureWeeks );
     myClone->setIncludeInRingSync( mIncludeInRingSync );
     myClone->setIncludeInRingSyncAB( mIncludeInRingSyncAB );
     myClone->setSyncPrefs( mSyncPrefs);
     myClone->setIsLocalFileSync( mIsLocalFileSync );
     myClone->setIsPhoneSync( mIsPhoneSync );
     myClone->setName( "noName" );
-    myClone->setIdentifier( "noID" );
+    //myClone->setIdentifier( "noID" );
     return myClone;
 }
 
 
 void KSyncProfile::setDefault()
 {
     mPreSyncCommand = i18n("command for downloading remote file to local device");
     mPostSyncCommand = i18n("command for uploading local temp file to remote device");
@@ -99,17 +94,17 @@ void KSyncProfile::setDefault()
     mPhoneConnection = "irda";
     mPhoneModel = "6310i";
 }
 void KSyncProfile::readConfig(KConfig *config )
 {
   if (config)
   {
 
-    config->setGroup("SyncProfile_" + mIdentifier);
+    config->setGroup( mName );
 
     mName = config->readEntry( "Name", mName );
     mPreSyncCommand = config->readEntry( "PreSyncCommand",mPreSyncCommand  );
     mPostSyncCommand = config->readEntry( "PostSyncCommand", mPostSyncCommand );
     mLocalTempFile = config->readEntry( "LocalTempFile", mLocalTempFile );
     mRemoteFileName = config->readEntry( "RemoteFileName", mRemoteFileName );
 
     mPreSyncCommandAB = config->readEntry( "PreSyncCommandAB",mPreSyncCommandAB  );
@@ -135,22 +130,22 @@ void KSyncProfile::readConfig(KConfig *config )
   else
   {
     setDefault();
   }
 }
 
 void KSyncProfile::deleteConfig(KConfig *config )
 {
-	config->deleteGroup( "SyncProfile_" + mIdentifier );
+	config->deleteGroup( mName );
 }
 
 void KSyncProfile::writeConfig( KConfig * config )
 {
-    config->setGroup("SyncProfile_" + mIdentifier);
+    config->setGroup(mName);
 
     config->writeEntry( "Name", mName );
     config->writeEntry( "PreSyncCommand",mPreSyncCommand  );
     config->writeEntry( "PostSyncCommand", mPostSyncCommand );
     config->writeEntry( "LocalTempFile", mLocalTempFile );
     config->writeEntry( "RemoteFileName", mRemoteFileName );
 
     config->writeEntry( "PreSyncCommandAB",mPreSyncCommandAB  );
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index 8995def..a0cfb71 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -41,27 +41,25 @@ class KConfig;
   This class represents one preferences setting as used by @ref KPrefs.
   Subclasses of KPrefsItem implement storage functions for a certain type of
   setting. Normally you don't have to use this class directly. Use the special
   addItem() functions of KPrefs instead. If you subclass this class you will
   have to register instances with the function KPrefs::addItem().
 */
 class KSyncProfile : public QObject {
   public:
-    KSyncProfile( const char * identifier = 0);
+    KSyncProfile();
     ~KSyncProfile() ;
 
     KSyncProfile* clone();
     void setDefault();
     void readConfig(KConfig *);
     void writeConfig(KConfig *);
 	void deleteConfig(KConfig *);
 
-    void setIdentifier( const QString& i ) {mIdentifier = i;}
-    QString getIdentifier( ) { return mIdentifier;}
     void setPreSyncCommand( const QString& n ) {mPreSyncCommand = n;}
     QString getPreSyncCommand( ) { return mPreSyncCommand; }
     void setPostSyncCommand( const QString& n ) {mPostSyncCommand = n;}
     QString getPostSyncCommand( ) { return mPostSyncCommand;}
     void setLocalTempFile( const QString& n ) { mLocalTempFile= n;}
     QString getLocalTempFile( ) { return mLocalTempFile;}
     void setRemoteFileName( const QString& n ) { mRemoteFileName = n;}
     QString getRemoteFileName( ) { return mRemoteFileName;}
@@ -107,17 +105,16 @@ class KSyncProfile : public QObject {
     void setWriteBackFutureWeeks( int n ) { mWriteBackFutureWeeks= n;}
     int getWriteBackFutureWeeks( ) { return mWriteBackFutureWeeks;}
     void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;}
     bool getIsLocalFileSync( ) { return mIsLocalFileSync;}
     void setIsPhoneSync( bool b ) { mIsPhoneSync= b;}
     bool getIsPhoneSync( ) { return mIsPhoneSync;}
   private:
     QString mName;
-    QString mIdentifier;
     QString mPreSyncCommand;
     QString mPostSyncCommand;
     QString mLocalTempFile;
     QString mRemoteFileName;
     QString mPreSyncCommandAB;
     QString mPostSyncCommandAB;
     QString mLocalTempFileAB;
     QString mRemoteFileNameAB;