diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
| commit | a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63 (patch) | |
| tree | 2d85d112997176e9ab765e638b0e7f2e16677b83 /src/gui/widgets/guitable.h | |
| parent | 5c83a96b8ad85ad0562542b9720a0df6c5fb550c (diff) | |
| parent | 8983700f6c8cc6496626ed3af235e1ec31fe5501 (diff) | |
| download | manaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.gz manaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.bz2 manaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.xz manaverse-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/widgets/guitable.h')
| -rw-r--r-- | src/gui/widgets/guitable.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index 7cec854a8..64e0adae4 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -120,10 +120,10 @@ public: void moveToBottom(Widget *child) override final; - void _setFocusHandler(FocusHandler* focusHandler) override final; + void setFocusHandler(FocusHandler *const focusHandler) override final; // Inherited from KeyListener - void keyPressed(KeyEvent& keyEvent) override final; + void keyPressed(KeyEvent& event) override final; /** * Sets the table to be opaque, that is sets the table @@ -144,13 +144,13 @@ public: { return mOpaque; } // Inherited from MouseListener - void mousePressed(MouseEvent& mouseEvent) override final; + void mousePressed(MouseEvent& event) override final; - void mouseWheelMovedUp(MouseEvent& mouseEvent) override final; + void mouseWheelMovedUp(MouseEvent& event) override final; - void mouseWheelMovedDown(MouseEvent& mouseEvent) override final; + void mouseWheelMovedDown(MouseEvent& event) override final; - void mouseDragged(MouseEvent& mouseEvent) override final; + void mouseDragged(MouseEvent& event) override final; // Constraints inherited from TableModelListener void modelUpdated(const bool completed) override final; |