kdenonbeta/kdedebian/kapture/kapture
CVS commit by mornfall:
- fix compile breakage (sorry for this)
- start working on upgrade & install
M +1 -1 pkggrouper.h 1.14
M +2 -2 pkglist.cpp 1.10
M +14 -14 pkglist.h 1.8
M +22 -1 pkgmanager.cpp 1.3
M +6 -2 pkgmanager.h 1.3
--- kdenonbeta/kdedebian/kapture/kapture/pkggrouper.h #1.13:1.14
@@ -174,5 +174,5 @@ namespace capture {
public:
static void registerFactory ();
- static PkgGrouper *factory (argmap args = argmap ());
+ static PkgGrouper *factory (const argmap &args = argmap ());
PkgSectGrouper (const argmap &args = argmap ());
virtual ~PkgSectGrouper ();
--- kdenonbeta/kdedebian/kapture/kapture/pkglist.cpp #1.9:1.10
@@ -35,5 +35,5 @@ PkgTreeNode* PkgListTreeFactory::constru
PkgListItem::PkgListItem (
- QListView *list,
+ PkgList *list,
PkgTreeNode *parent,
pkgCache::PkgIterator iter)
@@ -52,5 +52,5 @@ PkgListItem::PkgListItem (
PkgListSItem::PkgListSItem (
- QListView *list,
+ PkgList *list,
PkgTreeNode *parent,
string name)
--- kdenonbeta/kdedebian/kapture/kapture/pkglist.h #1.7:1.8
@@ -29,18 +29,4 @@ namespace kapture {
using namespace capture;
- class PkgListSItem: public QListViewItem, public PkgSubTree
- {
- public:
- PkgListSItem (QListView *list,
- PkgTreeNode *parent, std::string name);
- };
-
- class PkgListItem: public QListViewItem, public PkgTreeItem
- {
- public:
- PkgListItem (QListView *list,
- PkgTreeNode *parent, pkgCache::PkgIterator iter);
- };
-
class PkgList: public KListView
{
@@ -61,4 +47,18 @@ namespace kapture {
PkgTreeFactory* m_fact;
};
+ class PkgListSItem: public QListViewItem, public PkgSubTree
+ {
+ public:
+ PkgListSItem (PkgList *list,
+ PkgTreeNode *parent, std::string name);
+ };
+
+ class PkgListItem: public QListViewItem, public PkgTreeItem
+ {
+ public:
+ PkgListItem (PkgList *list,
+ PkgTreeNode *parent, pkgCache::PkgIterator iter);
+ };
+
};
--- kdenonbeta/kdedebian/kapture/kapture/pkgmanager.cpp #1.2:1.3
@@ -82,4 +82,10 @@ bool PkgManager::loadCache ()
return false; // XXX
}
+ notifyRebuild ();
+ return true;
+}
+
+void PkgManager::notifyRebuild ()
+{
cerr << "rebuilding..." << endl;
for (list <Watcher *>::iterator it = m_watchers . begin (); it != m_watchers . end (); it ++) {
@@ -87,5 +93,13 @@ bool PkgManager::loadCache ()
(*it) -> rebuild ();
}
- return true;
+}
+
+void PkgManager::notifyRefresh ()
+{
+ cerr << "refreshing..." << endl;
+ for (list <Watcher *>::iterator it = m_watchers . begin (); it != m_watchers . end (); it ++) {
+ cerr << "refreshing watcher: " << (*it) << endl;
+ (*it) -> refresh ();
+ }
}
@@ -123,4 +137,11 @@ bool PkgManager::update (pkgAcquireStatu
}
+bool PkgManager::upgrade ()
+{
+ bool res = pkgAllUpgrade (m_cache);
+ notifyRefresh ();
+ return res;
+}
+
PkgManager::~PkgManager ()
{
--- kdenonbeta/kdedebian/kapture/kapture/pkgmanager.h #1.2:1.3
@@ -73,10 +73,14 @@ namespace capture {
bool loadCache (void);
bool update (pkgAcquireStatus *);
- bool calculateUpgrade (void);
- bool calculateDistUpgrade (void);
+ bool upgrade (void);
+ bool distUpgrade (void);
+ bool install (pkgCache::PkgIterator pkg);
+ bool uninstall (pkgCache::PkgIterator pkg);
bool fixBroken (void);
bool commit (bool force = false);
pkgCacheFile &cache () { return m_cache; };
pkgRecords *recs () { return m_records; };
+ void notifyRefresh (void);
+ void notifyRebuild (void);
};
Reply to: