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

[Daniel Burrows]

Author: dburrows
Date: Mon Sep 26 06:01:28 2005
New Revision: 4282

Added:
   branches/aptitude-0.3/aptitude/src/generic/util/slotarg.h
      - copied unchanged from r4272, branches/aptitude-0.3/aptitude/src/vscreen/slotarg.h
Removed:
   branches/aptitude-0.3/aptitude/src/vscreen/slotarg.h
Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/download_list.cc
   branches/aptitude-0.3/aptitude/src/download_list.h
   branches/aptitude-0.3/aptitude/src/ui.h
   branches/aptitude-0.3/aptitude/src/vscreen/vs_menu.h
   branches/aptitude-0.3/aptitude/src/vscreen/vs_util.h
Log:
Move slotarg to the generic code layer.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Sep 26 06:01:28 2005
@@ -1,5 +1,9 @@
 2005-09-25  Daniel Burrows  <dburrows at debian.org>
 
+	* src/download_list.cc, src/download_list.h, src/generic/util/slotarg.h, src/ui.h, src/vscreen/slotarg.h, src/vscreen/vs_menu.h, src/vscreen/vs_menu.cc:
+
+	  Move slotarg to the generic code layer.
+
 	* src/generic/apt/aptcache.cc:
 
 	  Add a missing permission check in internal_mark_install.

Modified: branches/aptitude-0.3/aptitude/src/download_list.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_list.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/download_list.cc	Mon Sep 26 06:01:28 2005
@@ -1,6 +1,21 @@
 // download_list.cc
 //
-//  Copyright 2001 Daniel Burrows
+//   Copyright (C) 2001-2005 Daniel Burrows
+//
+//   This program is free software; you can redistribute it and/or
+//   modify it under the terms of the GNU General Public License as
+//   published by the Free Software Foundation; either version 2 of
+//   the License, or (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//   General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program; see the file COPYING.  If not, write to
+//   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+//   Boston, MA 02111-1307, USA.
 
 #include "aptitude.h"
 #include "download_list.h"

Modified: branches/aptitude-0.3/aptitude/src/download_list.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_list.h	(original)
+++ branches/aptitude-0.3/aptitude/src/download_list.h	Mon Sep 26 06:01:28 2005
@@ -1,6 +1,21 @@
 // download_list.h  (this is -*-c++-*-)
 //
-//  Copyright 2001 Daniel Burrows
+//   Copyright (C) 2001-2005 Daniel Burrows
+//
+//   This program is free software; you can redistribute it and/or
+//   modify it under the terms of the GNU General Public License as
+//   published by the Free Software Foundation; either version 2 of
+//   the License, or (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//   General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program; see the file COPYING.  If not, write to
+//   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+//   Boston, MA 02111-1307, USA.
 //
 //  A better download manager.  (..finally..)
 
@@ -12,8 +27,9 @@
 
 #include <apt-pkg/acquire.h>
 
+#include <generic/util/slotarg.h>
+
 #include <vscreen/vscreen_widget.h>
-#include <vscreen/slotarg.h>
 
 class download_manager;
 

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 06:01:28 2005
@@ -16,8 +16,8 @@
 #include <string>
 
 #include <generic/util/bool_accumulate.h>
+#include <generic/util/slotarg.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 06:01:28 2005
@@ -25,9 +25,8 @@
 #include "vscreen_widget.h"
 #include "config/keybindings.h"
 
-#include "slotarg.h"
-
 #include <generic/util/bool_accumulate.h>
+#include <generic/util/slotarg.h>
 
 #include <vector>
 

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_util.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_util.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_util.h	Mon Sep 26 06:01:28 2005
@@ -8,9 +8,10 @@
 #ifndef VS_UTIL_H
 #define VS_UTIL_H
 
-#include "slotarg.h"
 #include "vs_editline.h"
 
+#include <generic/util/slotarg.h>
+
 #include <string>
 
 class fragment;