X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flistdata.h;h=77be5ee7b8e1cb52200936eb05d85ddc0b8cc3c4;hb=d10d1de6d17c285c63d7b3cea549017aaa1ddb01;hp=9d1a45704fea947c33f1168787c2154b87039da3;hpb=1bc84ded58379ee24315db8784d9fb710a02e24e;p=libs%2Fgltk.git diff --git a/source/listdata.h b/source/listdata.h index 9d1a457..77be5ee 100644 --- a/source/listdata.h +++ b/source/listdata.h @@ -6,11 +6,12 @@ #include #include #include +#include "mspgltk_api.h" namespace Msp { namespace GLtk { -class ListData +class MSPGLTK_API ListData { public: sigc::signal signal_item_added; @@ -19,9 +20,9 @@ public: sigc::signal signal_refresh_item; protected: - ListData() { } + ListData() = default; public: - virtual ~ListData() { } + virtual ~ListData() = default; virtual unsigned size() const = 0; virtual std::string get_string(unsigned) const = 0; @@ -39,7 +40,7 @@ class ListDataStore: public ListData protected: std::vector items; - ListDataStore() { } + ListDataStore() = default; public: void append(const T &v) { insert(items.size(), v); } @@ -92,7 +93,7 @@ public: signal_cleared.emit(); } - virtual unsigned size() const { return items.size(); } + unsigned size() const override { return items.size(); } }; template @@ -110,12 +111,12 @@ public: typedef std::string Func(const T &); private: - Func *func; + Func *func = 0; public: FunctionListData(Func f): func(f) { } - virtual std::string get_string(unsigned i) const + std::string get_string(unsigned i) const override { return func(this->get(i)); } };