summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/broken_indicator.cc2
-rw-r--r--src/edit_pkg_hier.cc4
-rw-r--r--src/menu_redirect.cc4
-rw-r--r--src/mine/cmine.cc4
-rw-r--r--src/pkg_item.cc2
-rw-r--r--src/pkg_view.cc14
-rw-r--r--src/solution_dialog.cc4
-rw-r--r--src/solution_screen.cc6
-rw-r--r--src/ui.cc12
9 files changed, 26 insertions, 26 deletions
diff --git a/src/broken_indicator.cc b/src/broken_indicator.cc
index 3450ff80..dfcce492 100644
--- a/src/broken_indicator.cc
+++ b/src/broken_indicator.cc
@@ -435,7 +435,7 @@ public:
}
};
-cw::util::ref_ptr<cw::widgets::widget> make_broken_indicator()
+cw::util::ref_ptr<cw::widget> make_broken_indicator()
{
return broken_indicator::create();
}
diff --git a/src/edit_pkg_hier.cc b/src/edit_pkg_hier.cc
index e418c727..a897ce55 100644
--- a/src/edit_pkg_hier.cc
+++ b/src/edit_pkg_hier.cc
@@ -56,7 +56,7 @@ class hier_editor::hier_item : public sigc::trackable, public cw::treeitem
wstring group_name;
public:
hier_item(pkg_hier::group *_group, pkg_hier::item *_item)
- :widgets::treeitem(true), group(_group), group_name(cw::util::transcode(group->name, "ASCII"))
+ :cw::treeitem(true), group(_group), group_name(cw::util::transcode(group->name, "ASCII"))
{
set_item(_item);
}
@@ -147,7 +147,7 @@ class silly_subtree:public cw::subtree_generic
wstring txt;
public:
silly_subtree(bool expanded, const wstring &_txt)
- :widgets::subtree_generic(expanded), txt(_txt) {}
+ :cw::subtree_generic(expanded), txt(_txt) {}
void paint(cw::tree *win, int y, bool hierarchical, const cw::style &st)
{
diff --git a/src/menu_redirect.cc b/src/menu_redirect.cc
index 75c02098..25876cd3 100644
--- a/src/menu_redirect.cc
+++ b/src/menu_redirect.cc
@@ -63,7 +63,7 @@ bool menu_redirect::find_reset_limit() { return false; }
bool menu_redirect::find_broken_enabled() { return false; }
bool menu_redirect::find_broken() { return false; }
-static bool do_menu_callback(cwidget::widgets::widget &viewBare,
+static bool do_menu_callback(cwidget::cw::widget &viewBare,
menu_redirect *redirect,
bool (menu_redirect::* action)())
{
@@ -83,7 +83,7 @@ static bool do_menu_callback(cwidget::widgets::widget &viewBare,
}
void create_menu_bindings(menu_redirect *menu_handler,
- const cw::util::ref_ptr<cwidget::widgets::widget> &valve)
+ const cw::util::ref_ptr<cwidget::cw::widget> &valve)
{
undo_undo_enabled.connect(sigc::bind(ptr_fun(do_menu_callback),
valve.weak_ref(),
diff --git a/src/mine/cmine.cc b/src/mine/cmine.cc
index 403b580f..ce920101 100644
--- a/src/mine/cmine.cc
+++ b/src/mine/cmine.cc
@@ -315,7 +315,7 @@ void cmine::do_custom_game()
heightedit.weak_ref(),
widthedit.weak_ref(),
minesedit.weak_ref()));
- cancelbutton->pressed.connect(sigc::mem_fun(*center.unsafe_get_ref(), &cwidget::widgets::widget::destroy));
+ cancelbutton->pressed.connect(sigc::mem_fun(*center.unsafe_get_ref(), &cwidget::cw::widget::destroy));
table->connect_key("Cancel", &cwidget::config::global_bindings, cancelbutton->pressed.make_slot());
@@ -415,7 +415,7 @@ void cmine::do_new_game()
}
void cmine::do_continue_new_game(bool start,
- cwidget::widgets::widget &w_bare,
+ cwidget::cw::widget &w_bare,
cw::radiogroup *grp)
{
cw::widget_ref tmpref(this);
diff --git a/src/pkg_item.cc b/src/pkg_item.cc
index 960739f4..9a8ce5f4 100644
--- a/src/pkg_item.cc
+++ b/src/pkg_item.cc
@@ -456,7 +456,7 @@ bool pkg_item::dispatch_key(const cw::config::key &k, cw::tree *owner)
add_main_widget(e, _("Hierarchy editor"), "", _("Hierarchy Editor"));
e->connect_key("Quit", &cw::config::global_bindings,
- sigc::mem_fun(*e.unsafe_get_ref(), &cwidget::widgets::widget::destroy));
+ sigc::mem_fun(*e.unsafe_get_ref(), &cwidget::cw::widget::destroy));
}
else
return pkg_tree_node::dispatch_key(k, owner);
diff --git a/src/pkg_view.cc b/src/pkg_view.cc
index e0019857..7ceffc79 100644
--- a/src/pkg_view.cc
+++ b/src/pkg_view.cc
@@ -73,7 +73,7 @@ class pkg_handling_label:public cw::label
protected:
pkg_handling_label(column_definition_list *_columns)
- :widgets::label(" "), columns(_columns), have_pkg(false)
+ :cw::label(" "), columns(_columns), have_pkg(false)
{
cache_closed.connect(sigc::mem_fun(*this, &pkg_handling_label::zap_package));
}
@@ -313,7 +313,7 @@ protected:
const cw::table_ref &_why_table,
const cw::text_layout_ref &_reasons,
const cw::table_ref &_reasons_table)
- :widgets::multiplex(false),
+ :cw::multiplex(false),
editor(_editor),
description(_description), description_table(_description_table),
why(_why), why_table(_why_table),
@@ -568,10 +568,10 @@ cw::widget_ref make_package_view(list<package_view_item> &format,
&info_area_multiplex::cycle));
mainwidget->connect_key("EditHier", &cw::config::global_bindings,
sigc::mem_fun(*e.unsafe_get_ref(),
- &cwidget::widgets::widget::show));
+ &cwidget::cw::widget::show));
mainwidget->connect_key("EditHier", &cw::config::global_bindings,
sigc::mem_fun(*m.unsafe_get_ref(),
- &cwidget::widgets::widget::show));
+ &cwidget::cw::widget::show));
mainwidget->connect_key("EditHier", &cw::config::global_bindings,
sigc::bind(sigc::mem_fun(*rval.unsafe_get_ref(), &cw::table::focus_widget_bare),
m.weak_ref()));
@@ -624,7 +624,7 @@ cw::widget_ref make_package_view(list<package_view_item> &format,
rval->connect_key(i->popupdownkey,
&cw::config::global_bindings,
sigc::mem_fun(*i->widget.unsafe_get_ref(),
- &cwidget::widgets::widget::toggle_visible));
+ &cwidget::cw::widget::toggle_visible));
if(i->visible)
i->widget->show();
@@ -643,8 +643,8 @@ cw::widget_ref make_package_view(list<package_view_item> &format,
if(!strcasecmp(j->name.c_str(), i->popupdownlinked.c_str()))
{
// Having to make two connections is annoying.
- j->widget->shown_sig.connect(sigc::mem_fun(*i->widget.unsafe_get_ref(), &cwidget::widgets::widget::show));
- j->widget->hidden_sig.connect(sigc::mem_fun(*i->widget.unsafe_get_ref(), &cwidget::widgets::widget::hide));
+ j->widget->shown_sig.connect(sigc::mem_fun(*i->widget.unsafe_get_ref(), &cwidget::cw::widget::show));
+ j->widget->hidden_sig.connect(sigc::mem_fun(*i->widget.unsafe_get_ref(), &cwidget::cw::widget::hide));
break;
}
}
diff --git a/src/solution_dialog.cc b/src/solution_dialog.cc
index ab1dbb54..0c40106e 100644
--- a/src/solution_dialog.cc
+++ b/src/solution_dialog.cc
@@ -139,7 +139,7 @@ public:
typedef cw::util::ref_ptr<solution_dialog> solution_dialog_ref;
-static void do_apply(cwidget::widgets::widget &wBare)
+static void do_apply(cwidget::cw::widget &wBare)
{
cw::widget_ref w(&wBare);
@@ -184,7 +184,7 @@ cw::widget_ref make_solution_dialog()
bapply->pressed.connect(sigc::bind(sigc::ptr_fun(do_apply),
rval.weak_ref()));
bclose->pressed.connect(sigc::mem_fun(rval.unsafe_get_ref(),
- &cwidget::widgets::widget::destroy));
+ &cwidget::cw::widget::destroy));
rval->connect_key("ApplySolution", &cw::config::global_bindings,
sigc::bind(sigc::ptr_fun(do_apply),
diff --git a/src/solution_screen.cc b/src/solution_screen.cc
index 6e6c1376..6feadde1 100644
--- a/src/solution_screen.cc
+++ b/src/solution_screen.cc
@@ -111,7 +111,7 @@ public:
label_tree(wstring _label, bool _expanded = true,
bool selectable = true,
int depth = 0)
- :widgets::subtree_generic(_expanded), my_label(_label)
+ :cw::subtree_generic(_expanded), my_label(_label)
{
set_selectable(selectable);
set_depth(depth);
@@ -551,7 +551,7 @@ void update_dep_display(aptitude_resolver_dep d, cw::tree *tBare)
}
static
-void maybe_remove_examiner(cwidget::widgets::widget &wBare)
+void maybe_remove_examiner(cwidget::cw::widget &wBare)
{
cw::widget_ref w(&wBare);
@@ -579,7 +579,7 @@ cw::widget_ref make_solution_screen()
info_tree->connect_key("ShowHideDescription", &cw::config::global_bindings,
sigc::mem_fun(info_tree.unsafe_get_ref(),
- &cwidget::widgets::widget::toggle_visible));
+ &cwidget::cw::widget::toggle_visible));
l->set_bg_style(cw::get_style("Status"));
diff --git a/src/ui.cc b/src/ui.cc
index 0e3efef3..6cfa60fa 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -359,7 +359,7 @@ static bool do_read_only_permission()
cw::center_ref c = cw::center::create(frame);
- ok->pressed.connect(sigc::mem_fun(c.unsafe_get_ref(), &cwidget::widgets::widget::destroy));
+ ok->pressed.connect(sigc::mem_fun(c.unsafe_get_ref(), &cwidget::cw::widget::destroy));
c->destroyed.connect(sigc::bind(sigc::ptr_fun(&read_only_permissions_table_destroyed), sigc::ref(*w)));
popup_widget(c);
@@ -1542,7 +1542,7 @@ static void lists_autoclean_msg(download_update_manager *m)
{
cw::widget_ref msg = cw::center::create(cw::frame::create(cw::label::create(_("Deleting obsolete downloaded files"))));
m->post_autoclean_hook.connect(sigc::mem_fun(msg.unsafe_get_ref(),
- &cwidget::widgets::widget::destroy));
+ &cwidget::cw::widget::destroy));
popup_widget(msg);
cw::toplevel::tryupdate();
@@ -2461,7 +2461,7 @@ static void do_update_show_tabs(cw::multiplex &mp)
class help_bar:public cw::label
{
protected:
- help_bar(const wstring &txt, const cw::style &st):widgets::label(txt, st)
+ help_bar(const wstring &txt, const cw::style &st):cw::label(txt, st)
{
set_visibility();
}
@@ -2691,7 +2691,7 @@ static void setup_main_widget(const cw::widget_ref &w, const std::wstring &menur
// FIXME: if w is removed from the multiplexer but not destroyed, this may
// break. Fix for now: Don't Do That Then!
w->destroyed.connect(sigc::bind(sigc::mem_fun(views_menu.unsafe_get_ref(), &cw::menu::remove_item), menuentry));
- menuentry->selected.connect(sigc::mem_fun(w.unsafe_get_ref(), &cwidget::widgets::widget::show));
+ menuentry->selected.connect(sigc::mem_fun(w.unsafe_get_ref(), &cwidget::cw::widget::show));
views_menu->append_item(menuentry);
}
@@ -2869,13 +2869,13 @@ void prompt_string(const std::wstring &prompt,
e->entered.connect(sigc::bind(sigc::ptr_fun(do_prompt_string),
e.weak_ref(),
- sigc::mem_fun(e.unsafe_get_ref(), &cwidget::widgets::widget::destroy)));
+ sigc::mem_fun(e.unsafe_get_ref(), &cwidget::cw::widget::destroy)));
if(changed_slot)
e->text_changed.connect(*changed_slot);
e->connect_key("Cancel",
&cw::config::global_bindings,
- sigc::mem_fun(e.unsafe_get_ref(), &cwidget::widgets::widget::destroy));
+ sigc::mem_fun(e.unsafe_get_ref(), &cwidget::cw::widget::destroy));
if(cancel_slot)
e->connect_key("Cancel",
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-27 21:54:32 +0000