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

Daniel Burrows dburrows@costa.debian.org
Sat, 02 Jul 2005 13:02:44 +0000


Author: dburrows
Date: Sat Jul  2 13:02:42 2005
New Revision: 3526

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.h
Log:
Avoid several copies when displaying a vs_layout_item.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul  2 13:02:42 2005
@@ -1,5 +1,9 @@
 2005-07-02  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_layout_item.cc, src/vscreen/vs_layout_item.h:
+
+	  Avoid several copies when displaying a vs_layout_item.
+
 	* src/vscreen/testvscreen.cc, src/vscreen/vs_layout_item.cc, src/vscreen/vs_layout_item.h, src/vscreen/vs_staticitem.h, src/vscreen/vs_subtree.h, src/vscreen/vs_tree.cc, src/vscreen/vs_treeitem.cc, src/vscreen/vs_treeitem.h:
 
 	  Adjust the treeitem interface to use wide characters; while I'm

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.cc	Sat Jul  2 13:02:42 2005
@@ -77,8 +77,8 @@
   delete f;
 }
 
-fragment_line vs_layout_item::get_line(vs_tree *win, size_t n, int basex,
-				       const style &st)
+const fragment_line &vs_layout_item::get_line(vs_tree *win, size_t n,
+					      int basex, const style &st)
 {
   if(win->getmaxx()!=lastw)
     {
@@ -104,7 +104,7 @@
 {
   int basex=hierarchical?2*get_depth():0;
 
-  fragment_line s=get_line(win, n, basex, st);
+  const fragment_line &s=get_line(win, n, basex, st);
 
   win->mvaddnstr(y, 0, fragment_line(basex, ' ', st.get_attrs())+s, basex+s.size());
 }

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_layout_item.h	Sat Jul  2 13:02:42 2005
@@ -76,8 +76,8 @@
   levelref *end();
   bool has_visible_children();
 
-  fragment_line get_line(vs_tree *win, size_t n, int basex,
-			 const style &st);
+  const fragment_line &get_line(vs_tree *win, size_t n, int basex,
+				const style &st);
 
   ~vs_layout_item();
 };