Move some methods to Editor

magiblot · Oct 15, 2022 · 721be80 · 721be80
1 parent fab4833
commit 721be80
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/include/turbo/editor.h b/include/turbo/editor.h
@@ -103,6 +103,10 @@ class Editor : protected TScintillaParent
     template <class Func>
     inline void lockReflow(Func &&func);
     inline sptr_t callScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+
+    inline void uppercase();
+    inline void lowercase();
+    inline void capitalize();
 };
 
 template <class Func>
@@ -119,6 +123,21 @@ inline sptr_t Editor::callScintilla(unsigned int iMessage, uptr_t wParam, sptr_t
     return turbo::call(scintilla, iMessage, wParam, lParam);
 }
 
+inline void Editor::uppercase()
+{
+    turbo::changeCaseOfSelection(scintilla, caseConvUpper);
+}
+
+inline void Editor::lowercase()
+{
+    turbo::changeCaseOfSelection(scintilla, caseConvLower);
+}
+
+inline void Editor::capitalize()
+{
+    turbo::changeCaseOfSelection(scintilla, caseConvCapitalize);
+}
+
 class EditorView : public TSurfaceView
 {
     // 'EditorView' is used to display an 'Editor's contents and feed input

diff --git a/include/turbo/editstates.h b/include/turbo/editstates.h
@@ -92,21 +92,6 @@ void updateBraces(const ColorScheme *scheme, TScintilla &scintilla);
 void stripTrailingSpaces(TScintilla &scintilla);
 void ensureNewlineAtEnd(TScintilla &scintilla);
 
-inline void uppercase(TScintilla &scintilla)
-{
-    changeCaseOfSelection(scintilla, caseConvUpper);
-}
-
-inline void lowercase(TScintilla &scintilla)
-{
-    changeCaseOfSelection(scintilla, caseConvLower);
-}
-
-inline void capitalize(TScintilla &scintilla)
-{
-    changeCaseOfSelection(scintilla, caseConvCapitalize);
-}
-
 } // namespace turbo
 
 #endif
diff --git a/source/turbo/editwindow.cc b/source/turbo/editwindow.cc
@@ -79,15 +79,15 @@ void EditorWindow::handleEvent(TEvent &ev) {
                 handled = message(this, evCommand, cmClose, nullptr); // May delete 'this'!
                 break;
             case cmSelUppercase:
-                turbo::uppercase(editor.scintilla);
+                editor.uppercase();
                 editor.partialRedraw();
                 break;
             case cmSelLowercase:
-                turbo::lowercase(editor.scintilla);
+                editor.lowercase();
                 editor.partialRedraw();
                 break;
             case cmSelCapitalize:
-                turbo::capitalize(editor.scintilla);
+                editor.capitalize();
                 editor.partialRedraw();
                 break;
             default: