From 4993ff1921e107e0e49f4096c855cd56fe52a169 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 29 Jun 2017 13:27:09 +0300 Subject: [PATCH] Finalize rename / move. --- Telegram/SourceFiles/apiwrap.cpp | 2 +- Telegram/SourceFiles/app.h | 2 +- Telegram/SourceFiles/chat_helpers/message_field.cpp | 2 +- Telegram/SourceFiles/data/data_drafts.cpp | 2 +- Telegram/SourceFiles/history/history.cpp | 2 +- Telegram/SourceFiles/history/history_drag_area.cpp | 2 +- Telegram/SourceFiles/history/history_inner_widget.cpp | 2 +- Telegram/SourceFiles/history/history_widget.cpp | 2 +- Telegram/SourceFiles/mainwidget.cpp | 2 +- Telegram/SourceFiles/platform/mac/main_window_mac.mm | 2 +- Telegram/SourceFiles/platform/mac/specific_mac.mm | 2 +- Telegram/gyp/telegram_sources.txt | 8 ++++---- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 7a9280541..7798e8cb8 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "messenger.h" #include "mainwidget.h" -#include "historywidget.h" +#include "history/history_widget.h" #include "storage/localstorage.h" #include "auth_session.h" #include "boxes/confirm_box.h" diff --git a/Telegram/SourceFiles/app.h b/Telegram/SourceFiles/app.h index a4266f441..08dee4bf4 100644 --- a/Telegram/SourceFiles/app.h +++ b/Telegram/SourceFiles/app.h @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "core/basic_types.h" -#include "history.h" +#include "history/history.h" #include "history/history_item.h" #include "layout.h" diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp index 207a3bba4..a1e00e503 100644 --- a/Telegram/SourceFiles/chat_helpers/message_field.cpp +++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "chat_helpers/message_field.h" -#include "historywidget.h" +#include "history/history_widget.h" #include "base/qthelp_regex.h" #include "styles/style_history.h" #include "window/window_controller.h" diff --git a/Telegram/SourceFiles/data/data_drafts.cpp b/Telegram/SourceFiles/data/data_drafts.cpp index 39c6c64c7..bf540747a 100644 --- a/Telegram/SourceFiles/data/data_drafts.cpp +++ b/Telegram/SourceFiles/data/data_drafts.cpp @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/input_fields.h" #include "chat_helpers/message_field.h" -#include "historywidget.h" +#include "history/history_widget.h" #include "mainwidget.h" #include "storage/localstorage.h" diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp index c4bbfb5d4..9f75c8b2b 100644 --- a/Telegram/SourceFiles/history/history.cpp +++ b/Telegram/SourceFiles/history/history.cpp @@ -18,7 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "history.h" +#include "history/history.h" #include "history/history_message.h" #include "history/history_media_types.h" diff --git a/Telegram/SourceFiles/history/history_drag_area.cpp b/Telegram/SourceFiles/history/history_drag_area.cpp index d70fd363b..501435505 100644 --- a/Telegram/SourceFiles/history/history_drag_area.cpp +++ b/Telegram/SourceFiles/history/history_drag_area.cpp @@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "inline_bots/inline_bot_result.h" #include "inline_bots/inline_bot_layout_item.h" #include "dialogs/dialogs_layout.h" -#include "historywidget.h" +#include "history/history_widget.h" #include "storage/localstorage.h" #include "lang/lang_keys.h" #include "mainwindow.h" diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index cc3ddd212..b788f99f1 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/popup_menu.h" #include "window/window_controller.h" #include "chat_helpers/message_field.h" -#include "historywidget.h" +#include "history/history_widget.h" #include "mainwindow.h" #include "mainwidget.h" #include "auth_session.h" diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 7818fbd92..2e359c89e 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -18,7 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "historywidget.h" +#include "history/history_widget.h" #include "styles/style_history.h" #include "styles/style_dialogs.h" diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 93428bbbd..056309a97 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -34,7 +34,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "observer_peer.h" #include "apiwrap.h" #include "dialogswidget.h" -#include "historywidget.h" +#include "history/history_widget.h" #include "history/history_message.h" #include "history/history_media.h" #include "history/history_service_layout.h" diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index ecb32f3c8..30c379366 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "mainwidget.h" #include "application.h" -#include "historywidget.h" +#include "history/history_widget.h" #include "history/history_inner_widget.h" #include "storage/localstorage.h" #include "window/notifications_manager_default.h" diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm index 541e51f75..54206e728 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_keys.h" #include "application.h" #include "mainwidget.h" -#include "historywidget.h" +#include "history/history_widget.h" #include "storage/localstorage.h" #include "passcodewidget.h" diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index f8a5f54a7..bfc18fdce 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -141,6 +141,8 @@ <(src_loc)/dialogs/dialogs_list.h <(src_loc)/dialogs/dialogs_row.cpp <(src_loc)/dialogs/dialogs_row.h +<(src_loc)/history/history.cpp +<(src_loc)/history/history.h <(src_loc)/history/history_admin_log_inner.cpp <(src_loc)/history/history_admin_log_inner.h <(src_loc)/history/history_admin_log_item.cpp @@ -165,6 +167,8 @@ <(src_loc)/history/history_service.h <(src_loc)/history/history_service_layout.cpp <(src_loc)/history/history_service_layout.h +<(src_loc)/history/history_widget.cpp +<(src_loc)/history/history_widget.h <(src_loc)/inline_bots/inline_bot_layout_internal.cpp <(src_loc)/inline_bots/inline_bot_layout_internal.h <(src_loc)/inline_bots/inline_bot_layout_item.cpp @@ -543,10 +547,6 @@ <(src_loc)/dialogswidget.h <(src_loc)/facades.cpp <(src_loc)/facades.h -<(src_loc)/history.cpp -<(src_loc)/history.h -<(src_loc)/historywidget.cpp -<(src_loc)/historywidget.h <(src_loc)/layerwidget.cpp <(src_loc)/layerwidget.h <(src_loc)/layout.cpp