[gtksourceview/wip/chergert/vim: 66/73] rename restore to resume




commit 1b827fff15b5012e49168c0748bca44469b0ea7e
Author: Christian Hergert <chergert redhat com>
Date:   Mon Oct 25 19:10:28 2021 -0700

    rename restore to resume
    
    better matches terminology with suspend

 gtksourceview/vim/gtk-source-vim-insert.c  | 6 +++---
 gtksourceview/vim/gtk-source-vim-normal.c  | 6 +++---
 gtksourceview/vim/gtk-source-vim-replace.c | 6 +++---
 gtksourceview/vim/gtk-source-vim-state.c   | 4 ++--
 gtksourceview/vim/gtk-source-vim-state.h   | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gtksourceview/vim/gtk-source-vim-insert.c b/gtksourceview/vim/gtk-source-vim-insert.c
index 1da2ba18..cbca287e 100644
--- a/gtksourceview/vim/gtk-source-vim-insert.c
+++ b/gtksourceview/vim/gtk-source-vim-insert.c
@@ -131,8 +131,8 @@ gtk_source_vim_insert_handle_event (GtkSourceVimState *state,
 }
 
 static void
-gtk_source_vim_insert_restore (GtkSourceVimState *state,
-                               GtkSourceVimState *from)
+gtk_source_vim_insert_resume (GtkSourceVimState *state,
+                              GtkSourceVimState *from)
 {
        g_assert (GTK_SOURCE_IS_VIM_INSERT (state));
        g_assert (GTK_SOURCE_IS_VIM_STATE (from));
@@ -172,7 +172,7 @@ gtk_source_vim_insert_class_init (GtkSourceVimInsertClass *klass)
        object_class->dispose = gtk_source_vim_insert_dispose;
 
        state_class->handle_event = gtk_source_vim_insert_handle_event;
-       state_class->restore = gtk_source_vim_insert_restore;
+       state_class->resume = gtk_source_vim_insert_resume;
        state_class->enter = gtk_source_vim_insert_enter;
 }
 
diff --git a/gtksourceview/vim/gtk-source-vim-normal.c b/gtksourceview/vim/gtk-source-vim-normal.c
index d5a06d34..81f4bff3 100644
--- a/gtksourceview/vim/gtk-source-vim-normal.c
+++ b/gtksourceview/vim/gtk-source-vim-normal.c
@@ -554,8 +554,8 @@ gtk_source_vim_normal_handle_keypress (GtkSourceVimState *state,
 }
 
 static void
-gtk_source_vim_normal_restore (GtkSourceVimState *state,
-                               GtkSourceVimState *from)
+gtk_source_vim_normal_resume (GtkSourceVimState *state,
+                              GtkSourceVimState *from)
 {
        GtkSourceVimNormal *self = (GtkSourceVimNormal *)state;
 
@@ -603,7 +603,7 @@ gtk_source_vim_normal_class_init (GtkSourceVimNormalClass *klass)
 
        state_class->handle_keypress = gtk_source_vim_normal_handle_keypress;
        state_class->enter = gtk_source_vim_normal_enter;
-       state_class->restore = gtk_source_vim_normal_restore;
+       state_class->resume = gtk_source_vim_normal_resume;
 }
 
 static void
diff --git a/gtksourceview/vim/gtk-source-vim-replace.c b/gtksourceview/vim/gtk-source-vim-replace.c
index 1c2dea3e..3cdd28b1 100644
--- a/gtksourceview/vim/gtk-source-vim-replace.c
+++ b/gtksourceview/vim/gtk-source-vim-replace.c
@@ -97,8 +97,8 @@ gtk_source_vim_replace_enter (GtkSourceVimState *state)
 }
 
 static void
-gtk_source_vim_replace_restore (GtkSourceVimState *state,
-                                GtkSourceVimState *from)
+gtk_source_vim_replace_resume (GtkSourceVimState *state,
+                               GtkSourceVimState *from)
 {
        g_assert (GTK_SOURCE_IS_VIM_REPLACE (state));
        g_assert (GTK_SOURCE_IS_VIM_REPLACE (from));
@@ -113,7 +113,7 @@ gtk_source_vim_replace_class_init (GtkSourceVimReplaceClass *klass)
 
        state_class->handle_keypress = gtk_source_vim_replace_handle_keypress;
        state_class->enter = gtk_source_vim_replace_enter;
-       state_class->restore = gtk_source_vim_replace_restore;
+       state_class->resume = gtk_source_vim_replace_resume;
 }
 
 static void
diff --git a/gtksourceview/vim/gtk-source-vim-state.c b/gtksourceview/vim/gtk-source-vim-state.c
index c4a122d9..345f737e 100644
--- a/gtksourceview/vim/gtk-source-vim-state.c
+++ b/gtksourceview/vim/gtk-source-vim-state.c
@@ -438,9 +438,9 @@ gtk_source_vim_state_pop (GtkSourceVimState *self)
                GTK_SOURCE_VIM_STATE_GET_CLASS (self)->leave (self);
        }
 
-       if (GTK_SOURCE_VIM_STATE_GET_CLASS (parent)->restore)
+       if (GTK_SOURCE_VIM_STATE_GET_CLASS (parent)->resume)
        {
-               GTK_SOURCE_VIM_STATE_GET_CLASS (parent)->restore (parent, self);
+               GTK_SOURCE_VIM_STATE_GET_CLASS (parent)->resume (parent, self);
        }
 
        g_object_unref (self);
diff --git a/gtksourceview/vim/gtk-source-vim-state.h b/gtksourceview/vim/gtk-source-vim-state.h
index 1d12802b..202746db 100644
--- a/gtksourceview/vim/gtk-source-vim-state.h
+++ b/gtksourceview/vim/gtk-source-vim-state.h
@@ -39,7 +39,7 @@ struct _GtkSourceVimStateClass
        void     (*enter)           (GtkSourceVimState *state);
        void     (*suspend)         (GtkSourceVimState *state,
                                     GtkSourceVimState *to);
-       void     (*restore)         (GtkSourceVimState *state,
+       void     (*resume)          (GtkSourceVimState *state,
                                     GtkSourceVimState *from);
        void     (*leave)           (GtkSourceVimState *state);
        gboolean (*handle_event)    (GtkSourceVimState *state,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]