Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 162a0899f1dacd83007c4e82b9034f55610d8c20 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 5 Sep 2018 19:01:51 -0700 |
| 4 | Subject: [PATCH 2/2] Define own resize in NCPad and fix param type of |
| 5 | SetLabel() |
| 6 | |
| 7 | Explicitly override resize() to avoid conflicts from NCursesWindow |
| 8 | definition since there is another resize definition as well |
| 9 | |
| 10 | Fixes |
| 11 | src/NCPad.h:164:18: error: 'NCPad::resize' hides overloaded virtual function [-Werror,-Woverloaded-virtual] |
| 12 | |
| 13 | NCTablePad.h:132:18: error: 'NCTableTag::SetLabel' hides overloaded virtual function [-Werror,-Woverloaded-virtual] |
| 14 | |
| 15 | Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/69] |
| 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 17 | --- |
| 18 | src/NCPad.h | 1 + |
| 19 | src/NCTablePad.h | 2 +- |
| 20 | 2 files changed, 2 insertions(+), 1 deletion(-) |
| 21 | |
| 22 | diff --git a/src/NCPad.h b/src/NCPad.h |
| 23 | index 328c4aa..d8fb324 100644 |
| 24 | --- a/src/NCPad.h |
| 25 | +++ b/src/NCPad.h |
| 26 | @@ -162,6 +162,7 @@ public: |
| 27 | virtual void Destwin( NCursesWindow * dwin ); |
| 28 | |
| 29 | virtual void resize( wsze nsze ); |
| 30 | + virtual int resize( int lines, int columns ) { return NCursesWindow::resize(lines, columns );} |
| 31 | virtual void wRecoded(); |
| 32 | virtual void setDirty() { dirty = true; } |
| 33 | |
| 34 | diff --git a/src/NCTablePad.h b/src/NCTablePad.h |
| 35 | index c450529..3756796 100644 |
| 36 | --- a/src/NCTablePad.h |
| 37 | +++ b/src/NCTablePad.h |
| 38 | @@ -129,7 +129,7 @@ public: |
| 39 | |
| 40 | virtual ~NCTableTag() {} |
| 41 | |
| 42 | - virtual void SetLabel( const NCstring & ) { /*NOOP*/; } |
| 43 | + virtual void SetLabel( const NClabel & ) { /*NOOP*/; } |
| 44 | |
| 45 | virtual void DrawAt( NCursesWindow & w, const wrect at, |
| 46 | NCTableStyle & tableStyle, |
| 47 | -- |
| 48 | 2.18.0 |
| 49 | |