[Aptitude-svn-commit] r4275 - in branches/aptitude-0.3/aptitude: . src src/generic/util src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Mon Sep 26 04:52:57 2005
New Revision: 4275

Added:
   branches/aptitude-0.3/aptitude/src/generic/util/bool_accumulate.h
      - copied unchanged from r4272, branches/aptitude-0.3/aptitude/src/vscreen/bool_accumulate.h
Removed:
   branches/aptitude-0.3/aptitude/src/vscreen/bool_accumulate.h
Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.h
   branches/aptitude-0.3/aptitude/src/vscreen/vs_menu.h
Log:
Move bool_accumulate to generic code.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Sep 26 04:52:57 2005
@@ -1,5 +1,9 @@
 2005-09-25  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/util/bool_accumulate, src/ui/ui.h, src/vscreen/bool_accumulate, src/vscreen/vs_menu.h:
+
+	  Move bool_accumulate to generic code.
+
 	* doc/en/aptitude.xml, src/generic/apt/aptcache.cc:
 
 	  Add an option to purge packages that are unused, with big red

Modified: branches/aptitude-0.3/aptitude/src/ui.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.h	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.h	Mon Sep 26 04:52:57 2005
@@ -15,7 +15,8 @@
 
 #include <string>
 
-#include <vscreen/bool_accumulate.h>
+#include <generic/util/bool_accumulate.h>
+
 #include <vscreen/slotarg.h>
 #include <vscreen/vs_editline.h>
 // Bleah..this needs to be included so histories work

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_menu.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_menu.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_menu.h	Mon Sep 26 04:52:57 2005
@@ -22,12 +22,13 @@
 #ifndef VS_MENU_H
 #define VS_MENU_H
 
-#include "bool_accumulate.h"
 #include "vscreen_widget.h"
 #include "config/keybindings.h"
 
 #include "slotarg.h"
 
+#include <generic/util/bool_accumulate.h>
+
 #include <vector>
 
 // Currently, menu-items aren't full widgets--it's simply too much