Rename clish_view_restore_t to clish_view_restore_e

clish/command.h

@@ -73,7 +73,7 @@ void clish_command__set_pview(clish_command_t * instance, clish_view_t * view);
 clish_view_t *clish_command__get_pview(const clish_command_t * instance);
 int clish_command__get_depth(const clish_command_t * instance);
 clish_config_t *clish_command__get_config(const clish_command_t *instance);
-clish_view_restore_t clish_command__get_restore(const clish_command_t * instance);
+clish_view_restore_e clish_command__get_restore(const clish_command_t * instance);
 const clish_command_t * clish_command__get_orig(const clish_command_t * instance);
 const clish_command_t * clish_command__get_cmd(const clish_command_t * instance);
 bool_t clish_command__get_lock(const clish_command_t * instance);

clish/command/command.c

@@ -382,7 +382,7 @@ int clish_command__get_depth(const clish_command_t * this)
 }
 
 /*--------------------------------------------------------- */
-clish_view_restore_t clish_command__get_restore(const clish_command_t * this)
+clish_view_restore_e clish_command__get_restore(const clish_command_t * this)
 {
 	if (!this->pview)
 		return CLISH_RESTORE_NONE;

clish/shell/shell_execute.c

@@ -96,7 +96,7 @@ int clish_shell_execute(clish_context_t *context, char **out)
 
 	/* Pre-change view if the command is from another depth/view */
 	{
-		clish_view_restore_t restore = clish_command__get_restore(cmd);
+		clish_view_restore_e restore = clish_command__get_restore(cmd);
 		if ((CLISH_RESTORE_VIEW == restore) &&
 			(clish_command__get_pview(cmd) != cur_view)) {
 			clish_view_t *view = clish_command__get_pview(cmd);

clish/view.h

@@ -22,7 +22,7 @@ typedef enum {
 	CLISH_RESTORE_NONE,
 	CLISH_RESTORE_DEPTH,
 	CLISH_RESTORE_VIEW
-} clish_view_restore_t;
+} clish_view_restore_e;
 
 #include "lub/list.h"
 #include "clish/command.h"
@@ -70,8 +70,8 @@ char *clish_view__get_prompt(const clish_view_t *instance);
 void clish_view__set_depth(clish_view_t * instance, unsigned depth);
 unsigned clish_view__get_depth(const clish_view_t * instance);
 void clish_view__set_restore(clish_view_t * instance,
-	clish_view_restore_t restore);
+	clish_view_restore_e restore);
-clish_view_restore_t clish_view__get_restore(const clish_view_t * instance);
+clish_view_restore_e clish_view__get_restore(const clish_view_t * instance);
 int clish_view_insert_hotkey(const clish_view_t *instance, const char *key, const char *cmd);
 const char *clish_view_find_hotkey(const clish_view_t *instance, int code);
 void clish_view__set_access(clish_view_t *instance, const char *access);

clish/view/private.h

@@ -18,5 +18,5 @@ struct clish_view_s {
 	lub_list_t *nspaces;
 	clish_hotkeyv_t *hotkeys;
 	unsigned int depth;
-	clish_view_restore_t restore;
+	clish_view_restore_e restore;
 };

clish/view/view.c

@@ -379,13 +379,13 @@ unsigned clish_view__get_depth(const clish_view_t * this)
 
 /*--------------------------------------------------------- */
 void clish_view__set_restore(clish_view_t * this,
-	clish_view_restore_t restore)
+	clish_view_restore_e restore)
 {
 	this->restore = restore;
 }
 
 /*--------------------------------------------------------- */
-clish_view_restore_t clish_view__get_restore(const clish_view_t * this)
+clish_view_restore_e clish_view__get_restore(const clish_view_t * this)
 {
 	return this->restore;
 }