refactor: move KeyEvent out of mutt_curses.h

KeyEvent doesn't belong in mutt_curses.h.

diff --git a/curs_lib.h b/curs_lib.h
index 70c8bc5ce36d7613a346cb5b7c68c3b074da7a6a..4bfaabd624e6bd7f35f1abfe00d975f06927d833 100644 (file)
--- a/curs_lib.h
+++ b/curs_lib.h
@@ -29,6 +29,7 @@
 #include "config/lib.h"
 #include "mutt.h"
 #include "browser.h"
+#include "keymap.h"
 #include "pager.h"
 
 struct Buffer;

diff --git a/keymap.h b/keymap.h
index 138f9216a07c97f613d6af608dc6e2e503fe9408..0ef9ed64d97f9908c12f7b93a680c1520508f5ac 100644 (file)
--- a/keymap.h
+++ b/keymap.h
@@ -54,6 +54,15 @@ struct Keymap
   keycode_t *keys;     /**< key sequence */
 };
 
+/**
+ * struct KeyEvent - An event such as a keypress
+ */
+struct KeyEvent
+{
+  int ch; ///< raw key pressed
+  int op; ///< function op
+};
+
 /**
  * enum MenuType - Types of GUI selections
  */

diff --git a/mutt.h b/mutt.h
index 84cb22a19a2ad6c5d8cc2fabb965c59f0b4febe2..c876e0768aec9371b6b372820fa7966de97e552a 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -27,11 +27,9 @@
 #include "config.h"
 #include <stddef.h>
 #include <limits.h>
-#include <regex.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include "config/lib.h"
-#include "email/lib.h"
 #include "hook.h"
 #include "keymap.h"
 #include "mutt_commands.h"

diff --git a/mutt_curses.h b/mutt_curses.h
index b5e47d6a3ed48c70764580058c9c9aa5fbd8827e..b6a893f41c9c86636f22bbc5401e2db9c1a5fb86 100644 (file)
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -101,15 +101,6 @@ void mutt_curs_set(int cursor);
 #define CI_is_return(ch) (((ch) == '\r') || ((ch) == '\n'))
 #endif
 
-/**
- * struct KeyEvent - An event such as a keypress
- */
-struct KeyEvent
-{
-  int ch; /**< raw key pressed */
-  int op; /**< function op */
-};
-
 void mutt_resize_screen(void);
 
 /* If the system has bkgdset() use it rather than attrset() so that the clr*()

diff --git a/mutt_parse.h b/mutt_parse.h
index f4a5ab47695f41da6df97630441aae86cea0b685..6fff1f8072a6d62f3f0e287d8cdcecd6ac287569 100644 (file)
--- a/mutt_parse.h
+++ b/mutt_parse.h
@@ -23,9 +23,10 @@
 #ifndef MUTT_MUTT_PARSE_H
 #define MUTT_MUTT_PARSE_H
 
-#include "mutt/queue.h"
+#include <regex.h>
+#include "mutt/mutt.h"
+#include "email/lib.h"
 
-struct Email;
 struct Mailbox;
 
 /**