From 28080abb3eed401c343e6df552cec0d39f1b38c1 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Sun, 23 Aug 2020 14:00:53 +0200 Subject: [PATCH] first steps documentation changes --- doc/first-steps.md | 12 ++++++------ examples/windows.cpp | 4 ++-- src/fbutton.cpp | 2 +- src/flabel.cpp | 2 +- src/flineedit.cpp | 2 +- src/fmenuitem.cpp | 4 ++-- src/ftogglebutton.cpp | 2 +- src/fvterm.cpp | 6 +++--- src/include/final/fmenuitem.h | 2 +- src/include/final/fvterm.h | 6 +++--- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/doc/first-steps.md b/doc/first-steps.md index 0ebf79ea..2697c652 100644 --- a/doc/first-steps.md +++ b/doc/first-steps.md @@ -609,7 +609,7 @@ With `delCallback(...)` you can remove a connection to a signal handler or a widget instance. Alternatively, you can use `delCallbacks()` to remove all existing callbacks from an object. -To delete functions or static methods callbacks via a pointer:(4) +(1) To delete functions or static methods callbacks via a pointer: ```cpp template void addClickedCallback ( finalcut::FWidget* @@ -330,7 +330,7 @@ void Window::configureDialogButtons() } //---------------------------------------------------------------------- -void Window::activateWindow (finalcut::FDialog* win) +void Window::activateWindow (finalcut::FDialog* win) const { if ( ! win || win->isWindowHidden() || win->isWindowActive() ) return; diff --git a/src/fbutton.cpp b/src/fbutton.cpp index 5047d074..d0134c8b 100644 --- a/src/fbutton.cpp +++ b/src/fbutton.cpp @@ -353,7 +353,7 @@ void FButton::onAccel (FAccelEvent* ev) if ( ! hasFocus() ) { - auto focused_widget = static_cast(ev->focusedWidget()); + auto focused_widget = ev->focusedWidget(); if ( focused_widget && focused_widget->isWidget() ) { diff --git a/src/flabel.cpp b/src/flabel.cpp index c9aaa3bc..9fbfd9d3 100644 --- a/src/flabel.cpp +++ b/src/flabel.cpp @@ -221,7 +221,7 @@ void FLabel::onAccel (FAccelEvent* ev) if ( ! accel_widget->hasFocus() ) { - auto focused_widget = static_cast(ev->focusedWidget()); + auto focused_widget = ev->focusedWidget(); if ( focused_widget && focused_widget->isWidget() ) { diff --git a/src/flineedit.cpp b/src/flineedit.cpp index 1a087fb0..317b784e 100644 --- a/src/flineedit.cpp +++ b/src/flineedit.cpp @@ -544,7 +544,7 @@ void FLineEdit::onAccel (FAccelEvent* ev) if ( ! hasFocus() ) { - auto focused_widget = static_cast(ev->focusedWidget()); + auto focused_widget = ev->focusedWidget(); if ( focused_widget && focused_widget->isWidget() ) { diff --git a/src/fmenuitem.cpp b/src/fmenuitem.cpp index 0333b9ae..369fa3e0 100644 --- a/src/fmenuitem.cpp +++ b/src/fmenuitem.cpp @@ -225,7 +225,7 @@ void FMenuItem::delAccelerator (FWidget* obj) } //---------------------------------------------------------------------- -void FMenuItem::openMenu() +void FMenuItem::openMenu() const { if ( ! hasMenu() ) return; @@ -402,7 +402,7 @@ void FMenuItem::onAccel (FAccelEvent* ev) setSelected(); mbar->setSelectedItem(this); openMenu(); - auto focused_widget = static_cast(ev->focusedWidget()); + auto focused_widget = ev->focusedWidget(); menu->unselectItem(); menu->selectFirstItem(); diff --git a/src/ftogglebutton.cpp b/src/ftogglebutton.cpp index a59ee9f1..a96e029f 100644 --- a/src/ftogglebutton.cpp +++ b/src/ftogglebutton.cpp @@ -273,7 +273,7 @@ void FToggleButton::onAccel (FAccelEvent* ev) if ( ! hasFocus() ) { - auto focused_widget = static_cast(ev->focusedWidget()); + auto focused_widget = ev->focusedWidget(); if ( focused_widget && focused_widget->isWidget() ) { diff --git a/src/fvterm.cpp b/src/fvterm.cpp index 3ddd709c..413ab2ce 100644 --- a/src/fvterm.cpp +++ b/src/fvterm.cpp @@ -153,7 +153,7 @@ void FVTerm::setTermXY (int x, int y) const } //---------------------------------------------------------------------- -void FVTerm::setTerminalUpdates (terminal_update refresh_state) +void FVTerm::setTerminalUpdates (terminal_update refresh_state) const { if ( refresh_state == stop_terminal_updates ) { @@ -240,7 +240,7 @@ void FVTerm::resizeVTerm (const FSize& size) const } //---------------------------------------------------------------------- -void FVTerm::putVTerm() +void FVTerm::putVTerm() const { for (int i{0}; i < vterm->height; i++) { @@ -1311,7 +1311,7 @@ void FVTerm::clearArea (FTermArea* area, int fillchar) const } //---------------------------------------------------------------------- -void FVTerm::processTerminalUpdate() +void FVTerm::processTerminalUpdate() const { // Retains terminal updates if there are unprocessed inputs static constexpr int max_skip = 8; diff --git a/src/include/final/fmenuitem.h b/src/include/final/fmenuitem.h index 5b3c2756..c535e1ca 100644 --- a/src/include/final/fmenuitem.h +++ b/src/include/final/fmenuitem.h @@ -125,7 +125,7 @@ class FMenuItem : public FWidget // Methods void addAccelerator (FKey, FWidget*) override; void delAccelerator (FWidget*) override; - void openMenu(); + void openMenu() const; // Event handlers void onKeyPress (FKeyEvent*) override; diff --git a/src/include/final/fvterm.h b/src/include/final/fvterm.h index 97b57e69..a3081c4a 100644 --- a/src/include/final/fvterm.h +++ b/src/include/final/fvterm.h @@ -152,7 +152,7 @@ class FVTerm // Mutators void setTermXY (int, int) const; - void setTerminalUpdates (terminal_update); + void setTerminalUpdates (terminal_update) const; void hideCursor (bool) const; void hideCursor() const; void showCursor() const; @@ -252,7 +252,7 @@ class FVTerm virtual void clearArea (int = ' '); void createVTerm (const FSize&); void resizeVTerm (const FSize&) const; - void putVTerm(); + void putVTerm() const; void updateTerminal() const; virtual void addPreprocessingHandler ( const FVTerm* , const FPreprocessingFunction& ); @@ -314,7 +314,7 @@ class FVTerm void scrollAreaForward (FTermArea*) const; void scrollAreaReverse (FTermArea*) const; void clearArea (FTermArea*, int = ' ') const; - void processTerminalUpdate(); + void processTerminalUpdate() const; static void startTerminalUpdate(); static void finishTerminalUpdate(); virtual void initTerminal();