Simplify constructors with C++11

[libs/gltk.git] / source / list.h

diff --git a/source/list.h b/source/list.h
index 68a96bf36cb65fb0c9361a0b1a156984cc1cd12f..9bc30c685d146a88d9d3b0fc8b886037f7ffa724 100644 (file)
--- a/source/list.h
+++ b/source/list.h
@@ -81,7 +81,7 @@ public:
        class SimpleItem: public Item
        {
        protected:
-               SimpleItem() { }
+               SimpleItem() = default;
 
                virtual void on_style_change();
        };
@@ -89,7 +89,7 @@ public:
        class MultiColumnItem: public Item
        {
        protected:
-               MultiColumnItem() { }
+               MultiColumnItem() = default;
 
                virtual void check_widths(std::vector<unsigned> &) const;
                virtual void set_widths(const std::vector<unsigned> &);
@@ -110,9 +110,9 @@ private:
        class ItemFactory
        {
        protected:
-               ItemFactory() { }
+               ItemFactory() = default;
        public:
-               virtual ~ItemFactory() { }
+               virtual ~ItemFactory() = default;
 
                virtual void set_data(const ListData &) = 0;
                virtual Item *create_item(unsigned) const = 0;
@@ -157,22 +157,22 @@ public:
        sigc::signal<void> signal_selection_cleared;
 
 private:
-       ListData *data;
-       bool own_data;
-       DataObserver *observer;
-       ItemFactory *item_factory;
-       ViewMode view_mode;
-       int sel_index;
-       int focus_index;
-       unsigned first_row;
-       unsigned max_scroll;
-       unsigned view_rows;
-       unsigned view_columns;
-       const Part *items_part;
-       bool ignore_slider_change;
-       bool dragging;
-       int drag_start_x;
-       int drag_start_y;
+       ListData *data = 0;
+       bool own_data = false;
+       DataObserver *observer = 0;
+       ItemFactory *item_factory = 0;
+       ViewMode view_mode = LIST;
+       int sel_index = -1;
+       int focus_index = -1;
+       unsigned first_row = 0;
+       unsigned max_scroll = 0;
+       unsigned view_rows = 5;
+       unsigned view_columns = 5;
+       const Part *items_part = 0;
+       bool ignore_slider_change = false;
+       bool dragging = false;
+       int drag_start_x = 0;
+       int drag_start_y = 0;
 
        VSlider slider;
        std::vector<Item *> items;
@@ -181,9 +181,6 @@ private:
 public:
        List();
        List(ListData &);
-private:
-       void init();
-public:
        virtual ~List();
 
        virtual const char *get_class() const { return "list"; }