[devel] kdenonbeta/kdedebian/kapture/libkapture

CVS commit by mornfall: 

Slight changes to build with current libapt-front.


  M +1 -1      celemview.h   1.15
  M +2 -2      kapturemanager.cpp   1.38
  M +6 -6      listtreewidget.cpp   1.48
  M +1 -1      pkgcelemview.h   1.16
  M +1 -1      summaryview.h   1.6
  M +4 -4      treeview.cpp   1.16


--- kdenonbeta/kdedebian/kapture/libkapture/celemview.h  #1.14:1.15
@@ -35,5 +35,5 @@ namespace kapture {
     };
 
-    class IteratorView: public QWidget, public aptFront::HistoryManager, public aptFront::Cache::Observer
+    class IteratorView: public QWidget, public aptFront::HistoryManager, public aptFront::CacheObserver
     {
         Q_OBJECT

--- kdenonbeta/kdedebian/kapture/libkapture/kapturemanager.cpp  #1.37:1.38
@@ -8,5 +8,5 @@
 #include "acqprogress.h"
 #include <apt-front/treenode.h>
-#include <apt-front/treeaddpkgsections.h>
+#include <apt-front/treeaddpackagesections.h>
 // #include "pkgmanager.h"
 #include "kapturemanager.h"
@@ -32,5 +32,5 @@ KaptureManager::KaptureManager (int)
     CacheGlobal::cache();
     CacheGlobal::cache().openCacheFile( 0, Cache::OpenReadOnly );
-    CacheGlobal::cache().addComponent( new PkgSectCache );
+    CacheGlobal::cache().addComponent( new PackageSectCache );
     CacheGlobal::cache().openRecordsCache();
     // PkgManager::instance ();

--- kdenonbeta/kdedebian/kapture/libkapture/listtreewidget.cpp  #1.47:1.48
@@ -8,5 +8,5 @@
 
 // #include <libcapture/treefactory.h>
-#include <apt-front/treeaddpkgsections.h>
+#include <apt-front/treeaddpackagesections.h>
 #include "listtreewidget.h"
 #include "treeview.h"
@@ -91,5 +91,5 @@ void ListTreeWidgetItem::itemRefresh ()
         m_item->setText(0, p.name());
         QString t;
-        PkgState::state s = p.state();
+        PackageState::state s = p.state();
         if (p.markedInstall ())
             t = "install";
@@ -108,9 +108,9 @@ void ListTreeWidgetItem::itemRefresh ()
         m_item->setText(1, t);
         m_item->setText(2, p.shortDescription());
-    } else if (PkgSectIterator::instance(i)) {
-        PkgSectIterator s = i;
+    } else if (PackageSectIterator::instance(i)) {
+        PackageSectIterator s = i;
         m_item->setText(0, s.name().c_str());
-    } else if (DependIterator::instance(i)) {
-        DependIterator d = i;
+    } else if (RelationIterator::instance(i)) {
+        RelationIterator d = i;
         m_item->setText(0, d.name().c_str());
         m_item->setSelectable (false);

--- kdenonbeta/kdedebian/kapture/libkapture/pkgcelemview.h  #1.15:1.16
@@ -76,5 +76,5 @@ namespace kapture {
     };
 
-    class PackageIteratorViewCommon: public PackageIteratorViewCommonUi, public aptFront::Cache::Observer
+    class PackageIteratorViewCommon: public PackageIteratorViewCommonUi, public aptFront::CacheObserver
     {
         Q_OBJECT

--- kdenonbeta/kdedebian/kapture/libkapture/summaryview.h  #1.5:1.6
@@ -16,5 +16,5 @@ class kapturePart;
 
 namespace kapture {
-    class SummaryView : public SummaryViewUi, public aptFront::Cache::Observer {
+    class SummaryView : public SummaryViewUi, public aptFront::CacheObserver {
         public:
             SummaryView (QWidget *parent = NULL, const char *name = NULL);

--- kdenonbeta/kdedebian/kapture/libkapture/treeview.cpp  #1.15:1.16
@@ -2,6 +2,6 @@
 
 #include <apt-front/treetransformchain.h>
-#include <apt-front/treeaddpkgcache.h>
-#include <apt-front/treeaddpkgsections.h>
+#include <apt-front/treeaddpackagecache.h>
+#include <apt-front/treeaddpackagesections.h>
 #include <apt-front/treedropcruft.h>
 #include "kapturemanager.h"
@@ -15,7 +15,7 @@ TreeView::TreeView (QWidget *parent, con
 {
     TreeTransformChain *custom, *main = new TreeTransformChain;
-    main->addTransform( TreeTransform( new TreeAddPkgCache() ) );
+    main->addTransform( TreeTransform( new TreeAddPackageCache() ) );
     main->addTransform( TreeTransform( new TreeDropCruft() ) );
-    main->addTransform( TreeTransform( new TreeAddPkgSections() ) );
+    main->addTransform( TreeTransform( new TreeAddPackageSections() ) );
     main->addTransform( TreeTransform( custom = new TreeTransformChain ) );
     m_mainTransformChain = main;