First pass over the code.

This tree version is still BROKEN.  This commit changes a bunch of code mechanically,
and completely fixes all the subdirectories and files through download_screen in
the top-level directory.

Some unfortunate namespace choices in cwidget showed up here.  widgets and config
should probably be merged into the cwidget namespace, and I've created namespace
aliases that pretend this happened as I go through the .cc files.  Luckily, that
change can largely be accounted for automatically.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/cmdline/cmdline_util.cc b/src/cmdline/cmdline_util.cc
index 67f339b1..b5589142 100644
--- a/src/cmdline/cmdline_util.cc
+++ b/src/cmdline/cmdline_util.cc
@@ -9,7 +9,7 @@
 
 #include <aptitude.h>
 #include <ui.h>
-#include <vs_progress.h>
+#include <progress.h>
 
 #include <generic/apt/apt.h>
 #include <generic/apt/config_signal.h>
@@ -23,7 +23,7 @@
 void ui_preview()
 {
   ui_init();
-  file_quit.connect(sigc::ptr_fun(vscreen_exitmain));
+  file_quit.connect(sigc::ptr_fun(cwidget::toplevel::exitmain));
   do_package_run_or_show_preview();
   ui_main();
   exit(0);
@@ -32,9 +32,9 @@ void ui_preview()
 void ui_solution_screen()
 {
   ui_init();
-  file_quit.connect(sigc::ptr_fun(vscreen_exitmain));
+  file_quit.connect(sigc::ptr_fun(cwidget::toplevel::exitmain));
 
-  vs_progress_ref p = gen_progress_bar();
+  progress_ref p = gen_progress_bar();
   do_new_package_view(*p.unsafe_get_ref());
 
   do_examine_solution();