diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-01 19:13:11 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-01 19:13:11 +0300 |
| commit | a260aeab234704ace8ba672b1d1ce57e18425e07 (patch) | |
| tree | e215c6eeeae7e6c2ca4f4453718cef6ca9a8af6a /src/gui/widgets/colorpage.h | |
| parent | 382067b05c4fe97bcf0da0143405375ec295f7c6 (diff) | |
| parent | 2c62286a7ecf246e8a445dd7d00f618efae2a96a (diff) | |
| download | plus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.gz plus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.bz2 plus-a260aeab234704ace8ba672b1d1ce57e18425e07.tar.xz plus-a260aeab234704ace8ba672b1d1ce57e18425e07.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/widgets/colorpage.h')
| -rw-r--r-- | src/gui/widgets/colorpage.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/colorpage.h b/src/gui/widgets/colorpage.h index c1c90eddf..88182e4f2 100644 --- a/src/gui/widgets/colorpage.h +++ b/src/gui/widgets/colorpage.h @@ -29,14 +29,14 @@ class ColorPage final : public ListBox { public: ColorPage(const Widget2 *const widget, - gcn::ListModel *const listModel, + ListModel *const listModel, const std::string &skin); A_DELETE_COPY(ColorPage) ~ColorPage(); - void draw(gcn::Graphics *graphics) override final; + void draw(Graphics *graphics) override final; void resetAction(); |