Merge branch 'cmd-tidy'

4 files changed, 10 insertions, 9 deletions

diff --git a/src/ui/console.c b/src/ui/console.c
index cae0d637..a5ff3a76 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -43,7 +43,7 @@
 #include <ncurses.h>
 #endif
 
-#include "command/command.h"
+#include "command/cmd_defs.h"
 #include "common.h"
 #include "log.h"
 #include "muc.h"
diff --git a/src/ui/core.c b/src/ui/core.c
index 0b761274..3a89008f 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -55,7 +55,8 @@
 #endif
 
 #include "chat_session.h"
-#include "command/command.h"
+#include "command/cmd_defs.h"
+#include "command/cmd_ac.h"
 #include "common.h"
 #include "config/preferences.h"
 #include "config/theme.h"
@@ -651,12 +652,12 @@ ui_focus_win(ProfWin *window)
     ProfWin *old_current = wins_get_current();
     if (old_current->type == WIN_MUC_CONFIG) {
         ProfMucConfWin *confwin = (ProfMucConfWin*)old_current;
-        cmd_autocomplete_remove_form_fields(confwin->form);
+        cmd_ac_remove_form_fields(confwin->form);
     }
 
     if (window->type == WIN_MUC_CONFIG) {
         ProfMucConfWin *confwin = (ProfMucConfWin*)window;
-        cmd_autocomplete_add_form_fields(confwin->form);
+        cmd_ac_add_form_fields(confwin->form);
     }
 
     int i = wins_get_num(window);
@@ -679,7 +680,7 @@ ui_close_win(int index)
     if (window && window->type == WIN_MUC_CONFIG) {
         ProfMucConfWin *confwin = (ProfMucConfWin*)window;
         if (confwin->form) {
-            cmd_autocomplete_remove_form_fields(confwin->form);
+            cmd_ac_remove_form_fields(confwin->form);
         }
     }
 
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index 2c7eae34..8f896dbe 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -53,7 +53,7 @@
 #include <ncurses.h>
 #endif
 
-#include "command/command.h"
+#include "command/cmd_ac.h"
 #include "common.h"
 #include "config/accounts.h"
 #include "config/preferences.h"
@@ -452,7 +452,7 @@ _inp_rl_getc(FILE *stream)
     int ch = rl_getc(stream);
     if (_inp_printable(ch)) {
         ProfWin *window = wins_get_current();
-        cmd_reset_autocomplete(window);
+        cmd_ac_reset(window);
     }
     return ch;
 }
@@ -482,7 +482,7 @@ _inp_rl_tab_handler(int count, int key)
         }
     } else if (strncmp(rl_line_buffer, "/", 1) == 0) {
         ProfWin *window = wins_get_current();
-        char *result = cmd_autocomplete(window, rl_line_buffer);
+        char *result = cmd_ac_complete(window, rl_line_buffer);
         if (result) {
             rl_replace_line(result, 1);
             rl_point = rl_end;
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 18a5864f..2213ccc1 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -37,7 +37,7 @@
 
 #include "config.h"
 
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 #include "ui/win_types.h"
 #include "muc.h"
 #include "config/tlscerts.h"