[Aptitude-svn-commit] r3728 - in branches/aptitude-0.3/aptitude: . src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Mon Aug  8 16:45:53 2005
New Revision: 3728

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_util.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_util.h
Log:
Death to header interdependencies.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Aug  8 16:45:53 2005
@@ -1,5 +1,10 @@
 2005-08-08  Daniel Burrows  <dburrows at debian.org>
 
+	* src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
+
+	  Further reduce header interdependencies by forward-declaring the
+	  ref_ptr class.
+
 	* src/vscreen/ref_ptr.h, src/vscreen/testvscreen.cc, src/vscreen/vs_bin.cc, src/vscreen/vs_bin.h, src/vscreen/vs_container.cc, src/vscreen/vs_container.h, src/vscreen/vs_frame.cc, src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h, src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h, src/vscreen/vs_radiogroup.cc, src/vscreen/vs_radiogroup.h, src/vscreen/vs_stacked.cc, src/vscreen/vs_stacked.h, src/vscreen/vs_table.cc, src/vscreen/vs_table.h, src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
 
 	  Binding references as slot arguments causes weird and painful

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_util.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_util.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_util.cc	Mon Aug  8 16:45:53 2005
@@ -101,9 +101,9 @@
 
 vs_widget_ref vs_dialog_yesno(const vs_widget_ref &widget,
 			      slot0arg yesslot,
-			      wstring yeslabel,
+			      const wstring &yeslabel,
 			      slot0arg noslot,
-			      wstring nolabel,
+			      const wstring &nolabel,
 			      const style &st,
 			      bool deflt)
 {

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 Aug  8 16:45:53 2005
@@ -8,7 +8,6 @@
 #ifndef VS_UTIL_H
 #define VS_UTIL_H
 
-#include "ref_ptr.h"
 #include "slotarg.h"
 #include "vs_editline.h"
 
@@ -19,6 +18,9 @@
 class vscreen_widget;
 class vs_pager;
 
+template<class T>
+class ref_ptr;
+
 typedef ref_ptr<vscreen_widget> vs_widget_ref;
 
 // Canned dialog-boxes:
@@ -67,7 +69,7 @@
  *  \param deflt if \b true, the "yes" button will be selected by default;
  *  otherwise, the "no" button will be selected by default.
  */
-vs_widget_ref vs_dialog_yesno(vscreen_widget *widget,
+vs_widget_ref vs_dialog_yesno(const vs_widget_ref &widget,
 			      slot0arg yesslot,
 			      const std::wstring &yeslabel,
 			      slot0arg noslot,