From kde-commits  Fri Sep 24 09:30:39 2010
From: Marc Mutz <mutz () kde ! org>
Date: Fri, 24 Sep 2010 09:30:39 +0000
To: kde-commits
Subject: KDE/kdepim/libkdepim
Message-Id: <20100924093039.AB361AC88C () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128532031731257

SVN commit 1179002 by mutz:

separate akonadi dependency

(this implementation file is used in Kleopatra, and we don't want the
akonadi-dependency there)

 M  +1 -0      CMakeLists.txt  
 M  +0 -26     progressmanager.cpp  
 AM            progressmanager_akonadiagent.cpp   progressmanager.cpp#1178987 [License: LGPL (v2+)]


--- trunk/KDE/kdepim/libkdepim/CMakeLists.txt #1179001:1179002
@@ -29,6 +29,7 @@
    ldap/ldapsearchdialog.cpp
    overlaywidget.cpp
    progressmanager.cpp
+   progressmanager_akonadiagent.cpp
    agentprogressmonitor.cpp
    progressdialog.cpp
    statusbarprogresswidget.cpp
--- trunk/KDE/kdepim/libkdepim/progressmanager.cpp #1179001:1179002
@@ -23,16 +23,10 @@
 
 #include "progressmanager.h"
 
-#include "agentprogressmonitor.h"
-
 #include <KDebug>
 #include <KLocale>
 #include <KGlobal>
 
-#include <Akonadi/AgentInstance>
-
-using namespace Akonadi;
-
 namespace KPIM {
 
 unsigned int KPIM::ProgressManager::uID = 42;
@@ -212,26 +206,6 @@
   return createProgressItemImpl( p, id, label, status, canBeCanceled, usesCrypto );
 }
 
-ProgressItem *ProgressManager::createProgressItemForAgent( ProgressItem *parent,
-                                                           const Akonadi::AgentInstance &instance,
-                                                           const QString &id,
-                                                           const QString &label,
-                                                           const QString &status,
-                                                           bool cancellable,
-                                                           bool usesCrypto )
-{
-  const bool itemAlreadyExists = ( mTransactions.value( id ) != 0 );
-  ProgressItem *t = createProgressItemImpl( parent, id, label, status, cancellable, usesCrypto );
-  // TODO ^ emits progressItemAdded() before I'm done connecting the signals.
-  // Should I block that and emit it when I'm done?
-
-  if (!itemAlreadyExists) {
-//    kDebug() << "Created ProgressItem for agent" << instance.name();
-    new AgentProgressMonitor( instance, t );
-  }
-  return t;
-}
-
 void ProgressManager::emitShowProgressDialogImpl()
 {
   emit showProgressDialog();