*** empty log message ***

1 files changed, 19 insertions, 20 deletions

diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index 2e9547e..6a1dd30 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -130,16 +130,6 @@ struct PwMMetaData
 			uniqueid = KApplication::randomString(8);
 		}
 
-	PwMMetaData& operator = (const PwMMetaData& x)
-	{
-	  create = x.create;
-	  expire = x.expire;
-	  update = x.update;
-	  updateInt = x.updateInt;
-	  uniqueid = x.uniqueid;
-	  return *this;
-	}
-
 	inline bool isValid() const
 		{
 			if (valid.isNull())
@@ -217,10 +207,26 @@ struct PwMDataItem
 		if (clearMeta)
 			meta.clear();
 	}
-  
+  //US ENH: we need this operator to compare two items if we have no unique ids
+  //available. Generaly this happens before the first sync
+	bool PwMDataItem::operator==( const PwMDataItem &a ) const
+	{
+	  qDebug("oper==%s", a.desc.c_str());
+	  if ( desc != a.desc ) return false;
+	  if ( name != a.name ) return false;
+	  if ( pw != a.pw ) return false;
+	  if ( comment != a.comment ) return false;
+	  if ( url != a.url ) return false;
+	  if ( launcher != a.launcher ) return false;
+	  //all other field will not be checked.
+	  return true;
+	}
+
+  //US ENH:this operator is used to copy an elements data during syncronization
+  //Attention: listViewPos will not be copied. So the position will stay the same.
 	PwMDataItem& operator = (const PwMDataItem& x)
 	{
-	  qDebug("oper=%s", x.desc.c_str());
+	  //	  qDebug("oper=%s", x.desc.c_str());
 	  desc = x.desc;
 	  name = x.name;
 	  pw = x.pw;
@@ -228,7 +234,7 @@ struct PwMDataItem
 	  url = x.url;
 	  launcher = x.launcher;
 	  lockStat = x.lockStat;
-	  listViewPos = x.listViewPos;
+	  //Do not copy listViewPos!!! listViewPos = x.listViewPos;
 	  binary = x.binary;
 	  meta = x.meta;
 	  rev = x.rev;
@@ -774,13 +780,6 @@ protected:
 	//the following methods are the overwritten callbackmethods from the syncinterface
 	virtual bool sync(KSyncManager* manager, QString filename, int mode);
 
-	//called by the syncmanager to indicate that the work has to be marked as dirty.
-	virtual void sync_setModified();
-	//called by the syncmanager to ask if the dirty flag is set.
-	virtual bool sync_isModified();
-	//called by the syncmanager to indicate that the work has to be saved.
-	virtual void sync_save();
-
 #endif
  private:
 	//US ENH: helpermethods to access the sync data for a certain syncname.