diff options
36 files changed, 96 insertions, 96 deletions
diff --git a/src/apt_config_treeitems.cc b/src/apt_config_treeitems.cc index dbeea666..540fc127 100644 --- a/src/apt_config_treeitems.cc +++ b/src/apt_config_treeitems.cc @@ -33,10 +33,10 @@ #include <vscreen/fragment.h> #include <vscreen/transcode.h> #include <vscreen/vscreen_widget.h> -#include <vscreen/vs_layout_item.h> -#include <vscreen/vs_treeitem.h> -#include <vscreen/vs_subtree.h> -#include <vscreen/vs_tree.h> +#include <cwidget/widgets/layout_item.h> +#include <cwidget/widgets/treeitem.h> +#include <cwidget/widgets/subtree.h> +#include <cwidget/widgets/tree.h> #include <map> diff --git a/src/apt_config_treeitems.h b/src/apt_config_treeitems.h index 869b765c..48372695 100644 --- a/src/apt_config_treeitems.h +++ b/src/apt_config_treeitems.h @@ -20,7 +20,7 @@ #ifndef APT_CONFIG_TREEITEMS_H #define APT_CONFIG_TREEITEMS_H -#include <vscreen/vs_treeitem.h> +#include <cwidget/widgets/treeitem.h> class fragment; diff --git a/src/apt_config_widgets.cc b/src/apt_config_widgets.cc index 102881c8..0abd82fc 100644 --- a/src/apt_config_widgets.cc +++ b/src/apt_config_widgets.cc @@ -25,7 +25,7 @@ #include <vscreen/config/colors.h> #include <vscreen/fragment.h> #include <vscreen/transcode.h> -#include <vscreen/vs_size_box.h> +#include <cwidget/widgets/size_box.h> using namespace std; diff --git a/src/apt_config_widgets.h b/src/apt_config_widgets.h index 8e69c06e..ca85226f 100644 --- a/src/apt_config_widgets.h +++ b/src/apt_config_widgets.h @@ -27,9 +27,9 @@ #ifndef APT_CONFIG_WIDGETS_H #define APT_CONFIG_WIDGETS_H -#include <vscreen/vs_togglebutton.h> -#include <vscreen/vs_editline.h> -#include <vscreen/vs_radiogroup.h> +#include <cwidget/widgets/togglebutton.h> +#include <cwidget/widgets/editline.h> +#include <cwidget/widgets/radiogroup.h> #include <sigc++/object.h> diff --git a/src/apt_options.cc b/src/apt_options.cc index 5553b4d6..94983510 100644 --- a/src/apt_options.cc +++ b/src/apt_options.cc @@ -26,14 +26,14 @@ #include "aptitude.h" #include <vscreen/fragment.h> -#include <vscreen/vs_button.h> -#include <vscreen/vs_center.h> -#include <vscreen/vs_frame.h> -#include <vscreen/vs_label.h> -#include <vscreen/vs_scrollbar.h> -#include <vscreen/vs_subtree.h> -#include <vscreen/vs_table.h> -#include <vscreen/vs_text_layout.h> +#include <cwidget/widgets/button.h> +#include <cwidget/widgets/center.h> +#include <cwidget/widgets/frame.h> +#include <cwidget/widgets/label.h> +#include <cwidget/widgets/scrollbar.h> +#include <cwidget/widgets/subtree.h> +#include <cwidget/widgets/table.h> +#include <cwidget/widgets/text_layout.h> #include <vscreen/transcode.h> #include <vscreen/config/keybindings.h> diff --git a/src/broken_indicator.cc b/src/broken_indicator.cc index 67e32e93..d971c84c 100644 --- a/src/broken_indicator.cc +++ b/src/broken_indicator.cc @@ -35,7 +35,7 @@ #include <vscreen/config/colors.h> #include <vscreen/config/keybindings.h> #include <vscreen/fragment.h> -#include <vscreen/vs_text_layout.h> +#include <cwidget/widgets/text_layout.h> #include <vscreen/vscreen.h> #include <apt-pkg/pkgsystem.h> diff --git a/src/download_bar.cc b/src/download_bar.cc index 8d7213e8..5fbf5bf2 100644 --- a/src/download_bar.cc +++ b/src/download_bar.cc @@ -25,8 +25,8 @@ #include <vscreen/config/keybindings.h> #include <vscreen/config/colors.h> #include <vscreen/fragment.h> -#include <vscreen/vs_minibuf_win.h> -#include <vscreen/vs_util.h> +#include <cwidget/widgets/minibuf_win.h> +#include <cwidget/widgets/util.h> #include <vscreen/transcode.h> #include <apt-pkg/strutl.h> diff --git a/src/download_item.cc b/src/download_item.cc index d2697761..eb646630 100644 --- a/src/download_item.cc +++ b/src/download_item.cc @@ -25,7 +25,7 @@ #include <apt-pkg/strutl.h> #include <vscreen/transcode.h> -#include <vscreen/vs_tree.h> +#include <cwidget/widgets/tree.h> style download_item::get_normal_style() { diff --git a/src/download_list.cc b/src/download_list.cc index 4a4c1fda..8128f7cf 100644 --- a/src/download_list.cc +++ b/src/download_list.cc @@ -33,7 +33,7 @@ #include <vscreen/fragment.h> #include <vscreen/vscreen.h> -#include <vscreen/vs_util.h> +#include <cwidget/widgets/util.h> #include <vscreen/config/colors.h> #include <vscreen/config/keybindings.h> #include <vscreen/transcode.h> diff --git a/src/download_screen.cc b/src/download_screen.cc index c22e8a1f..3435605d 100644 --- a/src/download_screen.cc +++ b/src/download_screen.cc @@ -33,7 +33,7 @@ #include <vscreen/transcode.h> #include <vscreen/vscreen.h> -#include <vscreen/vs_util.h> +#include <cwidget/widgets/util.h> #include <sigc++/adaptors/bind.h> #include <sigc++/functors/ptr_fun.h> diff --git a/src/download_screen.h b/src/download_screen.h index 5927da54..fc048d77 100644 --- a/src/download_screen.h +++ b/src/download_screen.h @@ -39,9 +39,9 @@ #endif #endif -#include <vscreen/vs_table.h> -#include <vscreen/vs_tree.h> -#include <vscreen/vs_subtree.h> +#include <cwidget/widgets/table.h> +#include <cwidget/widgets/tree.h> +#include <cwidget/widgets/subtree.h> class download_item; diff --git a/src/edit_pkg_hier.cc b/src/edit_pkg_hier.cc index 5b2c9d64..a184c619 100644 --- a/src/edit_pkg_hier.cc +++ b/src/edit_pkg_hier.cc @@ -34,7 +34,7 @@ #include <generic/util/util.h> #include <vscreen/config/keybindings.h> -#include <vscreen/vs_subtree.h> +#include <cwidget/widgets/subtree.h> #include <vscreen/transcode.h> using namespace std; diff --git a/src/edit_pkg_hier.h b/src/edit_pkg_hier.h index 32de0c27..172a8544 100644 --- a/src/edit_pkg_hier.h +++ b/src/edit_pkg_hier.h @@ -32,7 +32,7 @@ #include <apt-pkg/pkgcache.h> -#include <vscreen/vs_tree.h> +#include <cwidget/widgets/tree.h> class vs_hier_editor:public vs_tree { diff --git a/src/load_pkgview.cc b/src/load_pkgview.cc index 4a5dd5de..954f506e 100644 --- a/src/load_pkgview.cc +++ b/src/load_pkgview.cc @@ -12,7 +12,7 @@ #include <generic/apt/apt.h> #include <vscreen/transcode.h> -#include <vscreen/vs_table.h> +#include <cwidget/widgets/table.h> #include <apt-pkg/error.h> diff --git a/src/main.cc b/src/main.cc index ad60f877..07091419 100644 --- a/src/main.cc +++ b/src/main.cc @@ -40,7 +40,7 @@ #include <vscreen/config/keybindings.h> #include <vscreen/transcode.h> #include <vscreen/vscreen.h> -#include <vscreen/vs_util.h> +#include <cwidget/widgets/util.h> #include <cmdline/cmdline_changelog.h> #include <cmdline/cmdline_check_resolver.h> diff --git a/src/menu_redirect.cc b/src/menu_redirect.cc index 736cdf2e..47d9f52d 100644 --- a/src/menu_redirect.cc +++ b/src/menu_redirect.cc @@ -24,7 +24,7 @@ #include <sigc++/bind.h> #include <vscreen/ref_ptr.h> -#include <vscreen/vs_container.h> +#include <cwidget/widgets/container.h> bool menu_redirect::undo_undo_enabled() { return false; } bool menu_redirect::undo_undo() { return false; } diff --git a/src/menu_text_layout.h b/src/menu_text_layout.h index 089a4628..e7e65fd3 100644 --- a/src/menu_text_layout.h +++ b/src/menu_text_layout.h @@ -22,8 +22,8 @@ #include "menu_redirect.h" -#include <vscreen/vs_editline.h> -#include <vscreen/vs_text_layout.h> +#include <cwidget/widgets/editline.h> +#include <cwidget/widgets/text_layout.h> class menu_text_layout : public vs_text_layout, public menu_redirect { diff --git a/src/menu_tree.h b/src/menu_tree.h index 44890a5f..566f3121 100644 --- a/src/menu_tree.h +++ b/src/menu_tree.h @@ -24,9 +24,9 @@ #include "menu_redirect.h" -#include <vscreen/vs_editline.h> +#include <cwidget/widgets/editline.h> -#include <vscreen/vs_tree.h> +#include <cwidget/widgets/tree.h> class pkg_matcher; class pkg_tree_node; diff --git a/src/mine/cmine.cc b/src/mine/cmine.cc index 3ce35466..1c5cb4a3 100644 --- a/src/mine/cmine.cc +++ b/src/mine/cmine.cc @@ -17,15 +17,15 @@ #include <vscreen/vscreen.h> #include <vscreen/transcode.h> -#include <vscreen/vs_button.h> -#include <vscreen/vs_center.h> -#include <vscreen/vs_editline.h> -#include <vscreen/vs_frame.h> -#include <vscreen/vs_label.h> -#include <vscreen/vs_radiogroup.h> -#include <vscreen/vs_table.h> -#include <vscreen/vs_togglebutton.h> -#include <vscreen/vs_util.h> +#include <cwidget/widgets/button.h> +#include <cwidget/widgets/center.h> +#include <cwidget/widgets/editline.h> +#include <cwidget/widgets/frame.h> +#include <cwidget/widgets/label.h> +#include <cwidget/widgets/radiogroup.h> +#include <cwidget/widgets/table.h> +#include <cwidget/widgets/togglebutton.h> +#include <cwidget/widgets/util.h> #include <string> #include <fstream> diff --git a/src/mine/cmine.h b/src/mine/cmine.h index 5b601f8b..5f33febc 100644 --- a/src/mine/cmine.h +++ b/src/mine/cmine.h @@ -24,8 +24,8 @@ #include "board.h" -#include <vscreen/vs_minibuf_win.h> -#include <vscreen/vs_editline.h> +#include <cwidget/widgets/minibuf_win.h> +#include <cwidget/widgets/editline.h> class vs_radiogroup; class keybindings; diff --git a/src/pkg_item.cc b/src/pkg_item.cc index 278fa739..d09e8794 100644 --- a/src/pkg_item.cc +++ b/src/pkg_item.cc @@ -25,7 +25,7 @@ #include <vscreen/config/keybindings.h> #include <vscreen/fragment.h> #include <vscreen/transcode.h> -#include <vscreen/vs_util.h> +#include <cwidget/widgets/util.h> #include "edit_pkg_hier.h" #include "pkg_columnizer.h" diff --git a/src/pkg_item_with_subtree.h b/src/pkg_item_with_subtree.h index baf26232..6171a08e 100644 --- a/src/pkg_item_with_subtree.h +++ b/src/pkg_item_with_subtree.h @@ -29,7 +29,7 @@ #include <vscreen/columnify.h> #include <vscreen/config/column_definition.h> #include <vscreen/transcode.h> -#include <vscreen/vs_subtree.h> +#include <cwidget/widgets/subtree.h> template<class child, class sorter=tag_sort_policy> class pkg_item_with_subtree:public vs_subtree<child, sorter>, public pkg_item diff --git a/src/pkg_node.cc b/src/pkg_node.cc index 6a88f5a7..a9e15ec9 100644 --- a/src/pkg_node.cc +++ b/src/pkg_node.cc @@ -31,7 +31,7 @@ #include <generic/util/undo.h> -#include <vscreen/vs_tree.h> +#include <cwidget/widgets/tree.h> keybindings *pkg_tree_node::bindings=NULL; diff --git a/src/pkg_node.h b/src/pkg_node.h index 6bde9709..78963f06 100644 --- a/src/pkg_node.h +++ b/src/pkg_node.h @@ -25,7 +25,7 @@ #include "menu_redirect.h" -#include <vscreen/vs_treeitem.h> +#include <cwidget/widgets/treeitem.h> class undo_group; class keybindings; diff --git a/src/pkg_sortpolicy.cc b/src/pkg_sortpolicy.cc index 0ee02dfa..38f79717 100644 --- a/src/pkg_sortpolicy.cc +++ b/src/pkg_sortpolicy.cc @@ -24,7 +24,7 @@ #include <apt-pkg/pkgsystem.h> #include <apt-pkg/version.h> -#include <vscreen/vs_subtree.h> +#include <cwidget/widgets/subtree.h> // Blah, this is the easiest way to define trivial subclasses: // (not that far from lambda, actually) diff --git a/src/pkg_sortpolicy.h b/src/pkg_sortpolicy.h index 9badf477..30174279 100644 --- a/src/pkg_sortpolicy.h +++ b/src/pkg_sortpolicy.h @@ -27,7 +27,7 @@ #define PKG_SORTPOLICY_H #include <apt-pkg/pkgcache.h> -#include <vscreen/vs_treeitem.h> +#include <cwidget/widgets/treeitem.h> class pkg_tree_node; diff --git a/src/pkg_subtree.cc b/src/pkg_subtree.cc index f7502ec0..0051a074 100644 --- a/src/pkg_subtree.cc +++ b/src/pkg_subtree.cc @@ -23,7 +23,7 @@ #include <generic/apt/apt.h> -#include <vscreen/vs_tree.h> +#include <cwidget/widgets/tree.h> void pkg_subtree::paint(vs_tree *win, int y, bool hierarchical, const style &st) diff --git a/src/pkg_tree.cc b/src/pkg_tree.cc index 3855038c..e1ada921 100644 --- a/src/pkg_tree.cc +++ b/src/pkg_tree.cc @@ -34,7 +34,7 @@ #include <vscreen/columnify.h> #include <vscreen/transcode.h> -#include <vscreen/vs_treeitem.h> +#include <cwidget/widgets/treeitem.h> #include <generic/apt/apt.h> #include <generic/apt/config_signal.h> diff --git a/src/pkg_view.cc b/src/pkg_view.cc index 97830732..271fe945 100644 --- a/src/pkg_view.cc +++ b/src/pkg_view.cc @@ -32,11 +32,11 @@ #include <cmdline/cmdline_why.h> #include <vscreen/fragment.h> -#include <vscreen/vs_label.h> -#include <vscreen/vs_multiplex.h> -#include <vscreen/vs_scrollbar.h> -#include <vscreen/vs_table.h> -#include <vscreen/vs_text_layout.h> +#include <cwidget/widgets/label.h> +#include <cwidget/widgets/multiplex.h> +#include <cwidget/widgets/scrollbar.h> +#include <cwidget/widgets/table.h> +#include <cwidget/widgets/text_layout.h> #include <vscreen/vscreen_widget.h> #include <vscreen/config/keybindings.h> #include <vscreen/transcode.h> diff --git a/src/solution_dialog.cc b/src/solution_dialog.cc index 86d9f22f..0c039bd0 100644 --- a/src/solution_dialog.cc +++ b/src/solution_dialog.cc @@ -26,12 +26,12 @@ #include <vscreen/config/colors.h> #include <vscreen/config/keybindings.h> #include <vscreen/fragment.h> -#include <vscreen/vs_button.h> -#include <vscreen/vs_center.h> -#include <vscreen/vs_frame.h> -#include <vscreen/vs_scrollbar.h> -#include <vscreen/vs_table.h> -#include <vscreen/vs_text_layout.h> +#include <cwidget/widgets/button.h> +#include <cwidget/widgets/center.h> +#include <cwidget/widgets/frame.h> +#include <cwidget/widgets/scrollbar.h> +#include <cwidget/widgets/table.h> +#include <cwidget/widgets/text_layout.h> #include <vscreen/vscreen.h> #include <generic/apt/apt.h> diff --git a/src/solution_item.cc b/src/solution_item.cc index afd3d496..0dc3fba9 100644 --- a/src/solution_item.cc +++ b/src/solution_item.cc @@ -35,7 +35,7 @@ #include <vscreen/config/keybindings.h> #include <vscreen/fragment.h> #include <vscreen/transcode.h> -#include <vscreen/vs_tree.h> +#include <cwidget/widgets/tree.h> using namespace std; diff --git a/src/solution_item.h b/src/solution_item.h index dd291333..06972a9b 100644 --- a/src/solution_item.h +++ b/src/solution_item.h @@ -30,7 +30,7 @@ #include <generic/problemresolver/solution.h> -#include <vscreen/vs_treeitem.h> +#include <cwidget/widgets/treeitem.h> class fragment; diff --git a/src/solution_screen.cc b/src/solution_screen.cc index a792fe25..aeb12d07 100644 --- a/src/solution_screen.cc +++ b/src/solution_screen.cc @@ -37,12 +37,12 @@ #include <vscreen/config/style.h> #include <vscreen/fragment.h> #include <vscreen/transcode.h> -#include <vscreen/vs_label.h> -#include <vscreen/vs_layout_item.h> -#include <vscreen/vs_multiplex.h> -#include <vscreen/vs_staticitem.h> -#include <vscreen/vs_subtree.h> -#include <vscreen/vs_table.h> +#include <cwidget/widgets/label.h> +#include <cwidget/widgets/layout_item.h> +#include <cwidget/widgets/multiplex.h> +#include <cwidget/widgets/staticitem.h> +#include <cwidget/widgets/subtree.h> +#include <cwidget/widgets/table.h> typedef generic_solution<aptitude_universe> aptitude_solution; @@ -63,24 +63,24 @@ #include <vscreen/curses++.h> #include <vscreen/fragment.h> #include <vscreen/vscreen.h> -#include <vscreen/vs_button.h> -#include <vscreen/vs_center.h> -#include <vscreen/vs_editline.h> -#include <vscreen/vs_frame.h> -#include <vscreen/vs_label.h> -#include <vscreen/vs_menu.h> -#include <vscreen/vs_menubar.h> -#include <vscreen/vs_multiplex.h> -#include <vscreen/vs_pager.h> -#include <vscreen/vs_scrollbar.h> -#include <vscreen/vs_stacked.h> -#include <vscreen/vs_statuschoice.h> -#include <vscreen/vs_table.h> -#include <vscreen/vs_text_layout.h> -#include <vscreen/vs_transient.h> -#include <vscreen/vs_togglebutton.h> -#include <vscreen/vs_tree.h> -#include <vscreen/vs_util.h> +#include <cwidget/widgets/button.h> +#include <cwidget/widgets/center.h> +#include <cwidget/widgets/editline.h> +#include <cwidget/widgets/frame.h> +#include <cwidget/widgets/label.h> +#include <cwidget/widgets/menu.h> +#include <cwidget/widgets/menubar.h> +#include <cwidget/widgets/multiplex.h> +#include <cwidget/widgets/pager.h> +#include <cwidget/widgets/scrollbar.h> +#include <cwidget/widgets/stacked.h> +#include <cwidget/widgets/statuschoice.h> +#include <cwidget/widgets/table.h> +#include <cwidget/widgets/text_layout.h> +#include <cwidget/widgets/transient.h> +#include <cwidget/widgets/togglebutton.h> +#include <cwidget/widgets/tree.h> +#include <cwidget/widgets/util.h> #include <mine/cmine.h> @@ -18,7 +18,7 @@ #include <generic/util/bool_accumulate.h> #include <generic/util/slotarg.h> -#include <vscreen/vs_editline.h> +#include <cwidget/widgets/editline.h> // Bleah..this needs to be included so histories work class OpProgress; diff --git a/src/view_changelog.cc b/src/view_changelog.cc index 8719c9c6..edb20cff 100644 --- a/src/view_changelog.cc +++ b/src/view_changelog.cc @@ -20,10 +20,10 @@ #include <vscreen/config/colors.h> #include <vscreen/config/keybindings.h> #include <vscreen/transcode.h> -#include <vscreen/vs_pager.h> -#include <vscreen/vs_scrollbar.h> -#include <vscreen/vs_table.h> -#include <vscreen/vs_text_layout.h> +#include <cwidget/widgets/pager.h> +#include <cwidget/widgets/scrollbar.h> +#include <cwidget/widgets/table.h> +#include <cwidget/widgets/text_layout.h> #include "changelog_parse.h" #include "download_bar.h" |