diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index e97cde14..2f9ae946 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -79,7 +79,7 @@ SET(cockatrice_SOURCES src/tab_replays.cpp src/tab_supervisor.cpp src/tab_admin.cpp - src/tab_userlists.cpp + src/tab_account.cpp src/tab_deck_editor.cpp src/tab_logs.cpp src/replay_timeline_widget.cpp diff --git a/cockatrice/src/chatview/chatview.cpp b/cockatrice/src/chatview/chatview.cpp index 858166f7..9d28c66d 100644 --- a/cockatrice/src/chatview/chatview.cpp +++ b/cockatrice/src/chatview/chatview.cpp @@ -3,7 +3,7 @@ #include "../pixmapgenerator.h" #include "../settingscache.h" #include "../soundengine.h" -#include "../tab_userlists.h" +#include "../tab_account.h" #include "../user_context_menu.h" #include "user_level.h" diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/gameselector.cpp index a41c8128..a6093464 100644 --- a/cockatrice/src/gameselector.cpp +++ b/cockatrice/src/gameselector.cpp @@ -8,9 +8,9 @@ #include "pb/room_commands.pb.h" #include "pb/serverinfo_game.pb.h" #include "pending_command.h" +#include "tab_account.h" #include "tab_room.h" #include "tab_supervisor.h" -#include "tab_userlists.h" #include #include diff --git a/cockatrice/src/gamesmodel.cpp b/cockatrice/src/gamesmodel.cpp index e34b02e1..8bf5540d 100644 --- a/cockatrice/src/gamesmodel.cpp +++ b/cockatrice/src/gamesmodel.cpp @@ -3,7 +3,7 @@ #include "pb/serverinfo_game.pb.h" #include "pixmapgenerator.h" #include "settingscache.h" -#include "tab_userlists.h" +#include "tab_account.h" #include "userlist.h" #include diff --git a/cockatrice/src/playerlistwidget.cpp b/cockatrice/src/playerlistwidget.cpp index ebdf2ff5..c4c706d9 100644 --- a/cockatrice/src/playerlistwidget.cpp +++ b/cockatrice/src/playerlistwidget.cpp @@ -5,9 +5,9 @@ #include "pb/serverinfo_playerproperties.pb.h" #include "pb/session_commands.pb.h" #include "pixmapgenerator.h" +#include "tab_account.h" #include "tab_game.h" #include "tab_supervisor.h" -#include "tab_userlists.h" #include "user_context_menu.h" #include "userlist.h" diff --git a/cockatrice/src/tab_userlists.cpp b/cockatrice/src/tab_account.cpp similarity index 99% rename from cockatrice/src/tab_userlists.cpp rename to cockatrice/src/tab_account.cpp index ad0ec8dc..4da8dc4b 100644 --- a/cockatrice/src/tab_userlists.cpp +++ b/cockatrice/src/tab_account.cpp @@ -1,4 +1,4 @@ -#include "tab_userlists.h" +#include "tab_account.h" #include "abstractclient.h" #include "customlineedit.h" diff --git a/cockatrice/src/tab_userlists.h b/cockatrice/src/tab_account.h similarity index 97% rename from cockatrice/src/tab_userlists.h rename to cockatrice/src/tab_account.h index caa9166f..ba6eb78a 100644 --- a/cockatrice/src/tab_userlists.h +++ b/cockatrice/src/tab_account.h @@ -1,5 +1,5 @@ -#ifndef TAB_USERLISTS_H -#define TAB_USERLISTS_H +#ifndef TAB_ACCOUNT_H +#define TAB_ACCOUNT_H #include "pb/serverinfo_user.pb.h" #include "tab.h" diff --git a/cockatrice/src/tab_room.cpp b/cockatrice/src/tab_room.cpp index 9cffdda3..fdeee397 100644 --- a/cockatrice/src/tab_room.cpp +++ b/cockatrice/src/tab_room.cpp @@ -14,8 +14,8 @@ #include "pb/serverinfo_room.pb.h" #include "pending_command.h" #include "settingscache.h" +#include "tab_account.h" #include "tab_supervisor.h" -#include "tab_userlists.h" #include "userlist.h" #include diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index d6f07873..f5a199cc 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -13,6 +13,7 @@ #include "pb/serverinfo_user.pb.h" #include "pixmapgenerator.h" #include "settingscache.h" +#include "tab_account.h" #include "tab_admin.h" #include "tab_deck_editor.h" #include "tab_deck_storage.h" @@ -22,7 +23,6 @@ #include "tab_replays.h" #include "tab_room.h" #include "tab_server.h" -#include "tab_userlists.h" #include "userlist.h" #include diff --git a/cockatrice/src/user_context_menu.cpp b/cockatrice/src/user_context_menu.cpp index 29d7d2eb..e32b0192 100644 --- a/cockatrice/src/user_context_menu.cpp +++ b/cockatrice/src/user_context_menu.cpp @@ -12,9 +12,9 @@ #include "pb/response_warn_list.pb.h" #include "pb/session_commands.pb.h" #include "pending_command.h" +#include "tab_account.h" #include "tab_game.h" #include "tab_supervisor.h" -#include "tab_userlists.h" #include "userinfobox.h" #include "userlist.h" diff --git a/cockatrice/src/userlist.cpp b/cockatrice/src/userlist.cpp index 879027f9..fa39d69b 100644 --- a/cockatrice/src/userlist.cpp +++ b/cockatrice/src/userlist.cpp @@ -8,8 +8,8 @@ #include "pb/session_commands.pb.h" #include "pending_command.h" #include "pixmapgenerator.h" +#include "tab_account.h" #include "tab_supervisor.h" -#include "tab_userlists.h" #include "user_context_menu.h" #include