[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdepim-3.5.5+/kpilot/lib
From:       Jason vanRijn Kasper <vR () movingparts ! net>
Date:       2007-04-02 6:29:09
Message-ID: 1175495349.438280.1456.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 649141 by vanrijn:

refactoring friend code into ConduitAction.  g'night Gracie.

 M  +19 -10    branches/work/kdepim-3.5.5+/kpilot/lib/plugin.cc  
 M  +5 -2      branches/work/kdepim-3.5.5+/kpilot/lib/plugin.h  


--- branches/work/kdepim-3.5.5+/kpilot/lib/plugin.cc #649140:649141
@@ -448,7 +448,24 @@
 	return false;
 }
 
+void ConduitAction::finished()
+{
+	FUNCTIONSETUP;
 
+	if (fDatabase && fCtrHH)
+		fCtrHH->setEndCount(fDatabase->recordCount());
+
+	if (fCtrHH && fCtrPC) 
+	{
+		addSyncLogEntry(fCtrHH->moo() +"\n",false); 
+		DEBUGKPILOT << fname << ": " << fCtrHH->moo() << endl;;
+		addSyncLogEntry(fCtrPC->moo() +"\n",false);
+		DEBUGKPILOT << fname << ": " << fCtrPC->moo() << endl;;
+	}
+
+}
+
+
 ConduitProxy::ConduitProxy(KPilotLink *p,
 	const QString &name,
 	const SyncAction::SyncMode &m) :
@@ -571,17 +588,9 @@
 		return;
 	}
 
-	if (fConduit->fDatabase && fConduit->fCtrHH)
-		fConduit->fCtrHH->setEndCount(fConduit->fDatabase->recordCount());
+	// give our worker a chance to sanity check the results...
+	fConduit->finished();
 
-	if (fConduit->fCtrHH && fConduit->fCtrPC) 
-	{
-		addSyncLogEntry(fConduit->fCtrHH->moo() +"\n",false); 
-		DEBUGKPILOT << fname << ": " << fConduit->fCtrHH->moo() << endl;;
-		addSyncLogEntry(fConduit->fCtrPC->moo() +"\n",false);
-		DEBUGKPILOT << fname << ": " << fConduit->fCtrPC->moo() << endl;;
-	}
-
 	addSyncLogEntry(CSL1("\n"),false); // Put bits of the conduit logs on separate lines
 
 	KPILOT_DELETE(p);
--- branches/work/kdepim-3.5.5+/kpilot/lib/plugin.h #649140:649141
@@ -256,14 +256,17 @@
 {
 Q_OBJECT
 
-friend class ConduitProxy;
-
 public:
 	ConduitAction(KPilotLink *,
 		const char *name=0L,
 		const QStringList &args = QStringList());
 	virtual ~ConduitAction();
 
+	/** ConduitAction is done doing work.  Allow it to sanity-check the
+	 * results
+	 */
+	void finished();
+
 	QString conduitName() const { return fConduitName; } ;
 
 	/** Retrieve the sync mode set for this action. */
[prev in list] [next in list] [prev in thread] [next in thread]