kdenonbeta/kdedebian/kapture/libcapture

[Peter Rockai]

CVS commit by mornfall: 

Start generic OpProgress support in libcapture.


  A            opprogress.cpp   1.1 [no copyright]
  A            opprogress.h   1.1 [LGPL (v2+)]
  M +1 -1      Makefile.am   1.19
  M +4 -3      pkgmanager.cpp   1.43


--- kdenonbeta/kdedebian/kapture/libcapture/Makefile.am  #1.18:1.19
@@ -24,5 +24,5 @@
     pkgcache.cpp safeiterators.cpp pkggroup.cpp \
     grouper.cpp filters.cpp depgroupers.cpp \
-    tree.cpp treenode.cpp param.cpp \
+    tree.cpp treenode.cpp param.cpp opprogress.cpp \
     groupermanager.cpp pkgmanager.cpp pkgsystem.cpp dpkgpm.cpp \
     stl_util.cpp

--- kdenonbeta/kdedebian/kapture/libcapture/pkgmanager.cpp  #1.42:1.43
@@ -54,4 +54,5 @@
 #include "tree.h"
 #include "tagcollbuilder.h"
+#include "opprogress.h"
 // }}}
 
@@ -164,11 +165,11 @@ bool PkgManager::loadCache ()
     notifySave ();
     closeCache ();
-    OpProgress prog;
+    OpProgress *prog = OpProgressFactory::create ();
     m_write = true;
     bool ext = _config -> FindB ("Capture::Cache::UseExtState", false);
-    if (! m_cache . Open (prog, ext, m_write)) {
+    if (! m_cache . Open (*prog, ext, m_write)) {
         _error -> Discard ();
         m_write = false;
-        if (! m_cache . Open (prog, ext, m_write))
+        if (! m_cache . Open (*prog, ext, m_write))
             return false; // XXX
     }