Merge branch 'cmd-tidy'

12 files changed, 16 insertions, 15 deletions

diff --git a/tests/unittests/test_cmd_account.c b/tests/unittests/test_cmd_account.c
index 74781177..0b723bde 100644
--- a/tests/unittests/test_cmd_account.c
+++ b/tests/unittests/test_cmd_account.c
@@ -13,7 +13,7 @@
 
 #include "config/accounts.h"
 
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 
 #define CMD_ACCOUNT "/account"
 
diff --git a/tests/unittests/test_cmd_alias.c b/tests/unittests/test_cmd_alias.c
index fd8f824f..d1cdaf01 100644
--- a/tests/unittests/test_cmd_alias.c
+++ b/tests/unittests/test_cmd_alias.c
@@ -13,8 +13,9 @@
 
 #include "config/preferences.h"
 
-#include "command/command.h"
-#include "command/commands.h"
+#include "command/cmd_defs.h"
+#include "command/cmd_funcs.h"
+#include "command/cmd_ac.h"
 
 #define CMD_ALIAS "/alias"
 
@@ -77,7 +78,7 @@ void cmd_alias_add_shows_message_when_exists(void **state)
 
     cmd_init();
     prefs_add_alias("hc", "/help commands");
-    cmd_autocomplete_add("/hc");
+    cmd_ac_add("/hc");
 
     expect_cons_show("Command or alias '/hc' already exists.");
 
diff --git a/tests/unittests/test_cmd_bookmark.c b/tests/unittests/test_cmd_bookmark.c
index 8b8b4871..5b17c6e0 100644
--- a/tests/unittests/test_cmd_bookmark.c
+++ b/tests/unittests/test_cmd_bookmark.c
@@ -14,7 +14,7 @@
 #include "muc.h"
 #include "common.h"
 
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 
 #include "xmpp/bookmark.h"
 
diff --git a/tests/unittests/test_cmd_connect.c b/tests/unittests/test_cmd_connect.c
index e4f01271..b2511183 100644
--- a/tests/unittests/test_cmd_connect.c
+++ b/tests/unittests/test_cmd_connect.c
@@ -11,7 +11,7 @@
 #include "ui/ui.h"
 #include "ui/stub_ui.h"
 
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 #include "config/accounts.h"
 
 #define CMD_CONNECT "/connect"
diff --git a/tests/unittests/test_cmd_disconnect.c b/tests/unittests/test_cmd_disconnect.c
index ba73adf5..9bf78a7a 100644
--- a/tests/unittests/test_cmd_disconnect.c
+++ b/tests/unittests/test_cmd_disconnect.c
@@ -6,7 +6,7 @@
 #include <string.h>
 
 #include "chat_session.h"
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 #include "xmpp/xmpp.h"
 #include "roster_list.h"
 
diff --git a/tests/unittests/test_cmd_join.c b/tests/unittests/test_cmd_join.c
index 8b71c5e5..709b4145 100644
--- a/tests/unittests/test_cmd_join.c
+++ b/tests/unittests/test_cmd_join.c
@@ -13,7 +13,7 @@
 
 #include "config/accounts.h"
 
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 #include "muc.h"
 
 #define CMD_JOIN "/join"
diff --git a/tests/unittests/test_cmd_otr.c b/tests/unittests/test_cmd_otr.c
index 44703943..ab03e7d4 100644
--- a/tests/unittests/test_cmd_otr.c
+++ b/tests/unittests/test_cmd_otr.c
@@ -15,8 +15,8 @@
 
 #include "config/preferences.h"
 
-#include "command/command.h"
-#include "command/commands.h"
+#include "command/cmd_defs.h"
+#include "command/cmd_funcs.h"
 #include "window_list.h"
 #include "xmpp/xmpp.h"
 
diff --git a/tests/unittests/test_cmd_pgp.c b/tests/unittests/test_cmd_pgp.c
index ec010cce..b2a1aa7e 100644
--- a/tests/unittests/test_cmd_pgp.c
+++ b/tests/unittests/test_cmd_pgp.c
@@ -8,7 +8,7 @@
 
 #include "config.h"
 
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 #include "xmpp/xmpp.h"
 
 #include "ui/stub_ui.h"
diff --git a/tests/unittests/test_cmd_rooms.c b/tests/unittests/test_cmd_rooms.c
index 85a528b5..2cb6be6b 100644
--- a/tests/unittests/test_cmd_rooms.c
+++ b/tests/unittests/test_cmd_rooms.c
@@ -12,7 +12,7 @@
 #include "ui/stub_ui.h"
 
 #include "config/accounts.h"
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 
 #define CMD_ROOMS "/rooms"
 
diff --git a/tests/unittests/test_cmd_roster.c b/tests/unittests/test_cmd_roster.c
index 8b194de4..6628147d 100644
--- a/tests/unittests/test_cmd_roster.c
+++ b/tests/unittests/test_cmd_roster.c
@@ -11,7 +11,7 @@
 
 #include "xmpp/xmpp.h"
 #include "roster_list.h"
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 
 #define CMD_ROSTER "/roster"
 
diff --git a/tests/unittests/test_cmd_statuses.c b/tests/unittests/test_cmd_statuses.c
index bd5337c3..f4d8c067 100644
--- a/tests/unittests/test_cmd_statuses.c
+++ b/tests/unittests/test_cmd_statuses.c
@@ -11,7 +11,7 @@
 #include "ui/ui.h"
 #include "ui/stub_ui.h"
 
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 
 #define CMD_STATUSES "/statuses"
 
diff --git a/tests/unittests/test_cmd_sub.c b/tests/unittests/test_cmd_sub.c
index a89e82bf..4afe8752 100644
--- a/tests/unittests/test_cmd_sub.c
+++ b/tests/unittests/test_cmd_sub.c
@@ -11,7 +11,7 @@
 #include "ui/ui.h"
 #include "ui/stub_ui.h"
 
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 
 #define CMD_SUB "/sub"