From 625244ab41640ec43d2621465ace81b4c242385b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Wed, 22 Apr 2015 12:45:52 +0200 Subject: [PATCH] Rename window.[ch] to view.[ch] --- README.md | 4 ++-- editor.h | 4 ++-- ui.h | 2 +- window.c => view.c | 2 +- window.h => view.h | 0 vis.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename window.c => view.c (99%) rename window.h => view.h (100%) diff --git a/README.md b/README.md index 77f739ef6..bd1b6e7b9 100644 --- a/README.md +++ b/README.md @@ -554,9 +554,9 @@ A quick overview over the code structure to get you started: `text-objects.[ch]` | functions take a file position and return a file range `vis.c` | vi(m) specific editor frontend, program entry point `editor.[ch]` | editor window management - `window.[ch]` | ui-independent viewport, syntax highlighting, cursor placement + `view.[ch]` | ui-independent viewport, shows part of a file, syntax highlighting, cursor placement `ui.h` | abstract interface as implemented by user interface - `ui-curses.h` | a terminal / curses based user interface implementation + `ui-curses.[ch]` | a terminal / curses based user interface implementation `buffer.[ch]` | dynamically growing buffer used for registers and macros `ring-buffer.[ch]` | fixed size ring buffer used for the jump list `map.[ch]` | crit-bit tree based map supporting unique prefix lookups and ordered iteration. used to implement `:`-commands. diff --git a/editor.h b/editor.h index e2684a041..0bff84eb7 100644 --- a/editor.h +++ b/editor.h @@ -9,7 +9,7 @@ typedef struct Editor Editor; typedef struct Win Win; #include "ui.h" -#include "window.h" +#include "view.h" #include "register.h" #include "macro.h" #include "syntax.h" @@ -79,7 +79,7 @@ typedef struct { typedef struct { size_t (*cmd)(const Arg*); /* a custom movement based on user input from vis.c */ - size_t (*view)(View*); /* a movement based on current window content from window.h */ + size_t (*view)(View*); /* a movement based on current window content from view.h */ size_t (*txt)(Text*, size_t pos); /* a movement form text-motions.h */ size_t (*file)(File*, size_t pos); enum { diff --git a/ui.h b/ui.h index 1d3df4bed..7c3ec7e34 100644 --- a/ui.h +++ b/ui.h @@ -18,7 +18,7 @@ enum UiOption { #include #include #include "text.h" -#include "window.h" +#include "view.h" #include "editor.h" struct Ui { diff --git a/window.c b/view.c similarity index 99% rename from window.c rename to view.c index 000e42d52..73fca1728 100644 --- a/window.c +++ b/view.c @@ -20,7 +20,7 @@ #include #include #include "editor.h" -#include "window.h" +#include "view.h" #include "syntax.h" #include "text.h" #include "text-motions.h" diff --git a/window.h b/view.h similarity index 100% rename from window.h rename to view.h diff --git a/vis.c b/vis.c index 6ce90045d..342e4c605 100644 --- a/vis.c +++ b/vis.c @@ -133,7 +133,7 @@ enum { MOVE_WINDOW_LINE_BOTTOM, }; -/** movements which can be used besides the one in text-motions.h and window.h */ +/** movements which can be used besides the one in text-motions.h and view.h */ /* search in forward direction for the word under the cursor */ static size_t search_word_forward(Text *txt, size_t pos);