X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fpanel.cpp;h=31cdf4b4ff9e62fa306fa0848c0879046e79aa56;hb=aa9b8db38efb9e97460c76e27cecc4d1591b23e5;hp=871d7a2d9ebffb211d1bdc3f389a4fd6374e31e6;hpb=9f38197854e699a6093a906ab43f4238f3cd2388;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index 871d7a2..31cdf4b 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -35,7 +35,7 @@ Panel::Panel()
 Panel::~Panel()
 {
 	delete layout;
-	layout = 0;
+	layout = nullptr;
 }
 
 void Panel::set_layout(Layout *l)
@@ -134,7 +134,7 @@ bool Panel::navigate(Navigation nav)
 
 Widget *Panel::find_next_child(int origin_x, int origin_y, int origin_dim, int nav_x, int nav_y) const
 {
-	Widget *sibling = 0;
+	Widget *sibling = nullptr;
 	int best_score = 0;
 	for(const Child *c: children)
 	{
@@ -210,7 +210,7 @@ void Panel::on_child_removed(Widget &wdg)
 Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	DataFile::DerivedObjectLoader<Panel, Widget::Loader>(p),
 	wdg_map(m),
-	last_widget(0)
+	last_widget(nullptr)
 {
 	if(!widget_registry_init_done)
 	{
@@ -288,7 +288,7 @@ void Panel::Loader::gravity(int h, int v)
 	get_layout().set_gravity(get_last_widget(), h, v);
 }
 
-void Panel::Loader::grid(unsigned cols)
+void Panel::Loader::grid(size_t cols)
 {
 	Grid grd(get_layout(), cols);
 	ArrangedLoader<Grid> ldr(*this, grd);