diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 2917d1ad32..cf1d5800ef 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -29,7 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "historywidget.h" #include "storage/localstorage.h" #include "auth_session.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "window/themes/window_theme.h" #include "window/notifications_manager.h" diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index 506e10c2bb..b69c1184dc 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_overview.h" #include "styles/style_mediaview.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "styles/style_history.h" #include "styles/style_boxes.h" #include "lang.h" diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index abc2e8b244..fac7a256a1 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/localstorage.h" #include "autoupdater.h" #include "window/notifications_manager.h" -#include "core/task_queue.h" +#include "base/task_queue.h" #include "messenger.h" namespace { diff --git a/Telegram/SourceFiles/base/build_config.h b/Telegram/SourceFiles/base/build_config.h index 8eef32ad7b..1731630389 100644 --- a/Telegram/SourceFiles/base/build_config.h +++ b/Telegram/SourceFiles/base/build_config.h @@ -31,7 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #elif defined(_WIN32) // __APPLE__ || __linux__ #define OS_WIN 1 #else // __APPLE__ || __linux__ || _WIN32 -#error Please add support for your platform in core/build_config.h +#error Please add support for your platform in base/build_config.h #endif // else for __APPLE__ || __linux__ || _WIN32 // For access to standard POSIXish features, use OS_POSIX instead of a @@ -48,7 +48,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #elif defined(_MSC_VER) // __clang__ || __GNUC__ #define COMPILER_MSVC 1 #else // _MSC_VER || __clang__ || __GNUC__ -#error Please add support for your compiler in core/build_config.h +#error Please add support for your compiler in base/build_config.h #endif // else for _MSC_VER || __clang__ || __GNUC__ // Processor architecture detection. @@ -61,7 +61,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #define ARCH_CPU_X86 1 #define ARCH_CPU_32_BITS 1 #else -#error Please add support for your architecture in core/build_config.h +#error Please add support for your architecture in base/build_config.h #endif #if defined(COMPILER_GCC) || defined(COMPILER_CLANG) diff --git a/Telegram/SourceFiles/base/observer.cpp b/Telegram/SourceFiles/base/observer.cpp index 53d7489bd7..071470da6d 100644 --- a/Telegram/SourceFiles/base/observer.cpp +++ b/Telegram/SourceFiles/base/observer.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 "core/observer.h" +#include "base/observer.h" namespace base { namespace internal { diff --git a/Telegram/SourceFiles/base/observer.h b/Telegram/SourceFiles/base/observer.h index bbde082a2d..57a6f05bd7 100644 --- a/Telegram/SourceFiles/base/observer.h +++ b/Telegram/SourceFiles/base/observer.h @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include -#include "core/type_traits.h" +#include "base/type_traits.h" namespace base { namespace internal { diff --git a/Telegram/SourceFiles/base/parse_helper.cpp b/Telegram/SourceFiles/base/parse_helper.cpp index 9ae0518a50..a65bfa600b 100644 --- a/Telegram/SourceFiles/base/parse_helper.cpp +++ b/Telegram/SourceFiles/base/parse_helper.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 "core/parse_helper.h" +#include "base/parse_helper.h" namespace base { namespace parse { diff --git a/Telegram/SourceFiles/base/qthelp_url.cpp b/Telegram/SourceFiles/base/qthelp_url.cpp index ea2ab4f75f..d3c4d9b1c6 100644 --- a/Telegram/SourceFiles/base/qthelp_url.cpp +++ b/Telegram/SourceFiles/base/qthelp_url.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 "core/qthelp_url.h" +#include "base/qthelp_url.h" namespace qthelp { diff --git a/Telegram/SourceFiles/base/runtime_composer.cpp b/Telegram/SourceFiles/base/runtime_composer.cpp index 73ceadfcaa..e17eab90b4 100644 --- a/Telegram/SourceFiles/base/runtime_composer.cpp +++ b/Telegram/SourceFiles/base/runtime_composer.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 "core/runtime_composer.h" +#include "base/runtime_composer.h" struct RuntimeComposerMetadatasMap { QMap data; diff --git a/Telegram/SourceFiles/base/task_queue.cpp b/Telegram/SourceFiles/base/task_queue.cpp index 59508ac7cf..e36a662906 100644 --- a/Telegram/SourceFiles/base/task_queue.cpp +++ b/Telegram/SourceFiles/base/task_queue.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 "core/task_queue.h" +#include "base/task_queue.h" #include #include diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp index 6e4e72cc5c..5f216e604c 100644 --- a/Telegram/SourceFiles/boxes/about_box.cpp +++ b/Telegram/SourceFiles/boxes/about_box.cpp @@ -18,13 +18,13 @@ 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 "boxes/aboutbox.h" +#include "boxes/about_box.h" #include "lang.h" #include "mainwidget.h" #include "mainwindow.h" #include "autoupdater.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "application.h" #include "ui/widgets/buttons.h" #include "ui/widgets/labels.h" diff --git a/Telegram/SourceFiles/boxes/about_box.h b/Telegram/SourceFiles/boxes/about_box.h index 30bba8ad0c..624eab40cd 100644 --- a/Telegram/SourceFiles/boxes/about_box.h +++ b/Telegram/SourceFiles/boxes/about_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { class LinkButton; diff --git a/Telegram/SourceFiles/boxes/abstract_box.cpp b/Telegram/SourceFiles/boxes/abstract_box.cpp index 883a39a210..05a3ef959d 100644 --- a/Telegram/SourceFiles/boxes/abstract_box.cpp +++ b/Telegram/SourceFiles/boxes/abstract_box.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 "boxes/abstractbox.h" +#include "boxes/abstract_box.h" #include "styles/style_boxes.h" #include "storage/localstorage.h" diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp index c109b46e77..a199670584 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.cpp +++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp @@ -18,15 +18,15 @@ 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 "boxes/addcontactbox.h" +#include "boxes/add_contact_box.h" #include "styles/style_boxes.h" #include "styles/style_dialogs.h" #include "lang.h" #include "messenger.h" -#include "boxes/contactsbox.h" -#include "boxes/confirmbox.h" -#include "boxes/photocropbox.h" +#include "boxes/contacts_box.h" +#include "boxes/confirm_box.h" +#include "boxes/photo_crop_box.h" #include "core/file_utilities.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" diff --git a/Telegram/SourceFiles/boxes/add_contact_box.h b/Telegram/SourceFiles/boxes/add_contact_box.h index 0fa4976c8d..b16503a23b 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.h +++ b/Telegram/SourceFiles/boxes/add_contact_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" class ConfirmBox; diff --git a/Telegram/SourceFiles/boxes/autolock_box.cpp b/Telegram/SourceFiles/boxes/autolock_box.cpp index 9a331a88b8..2338dea725 100644 --- a/Telegram/SourceFiles/boxes/autolock_box.cpp +++ b/Telegram/SourceFiles/boxes/autolock_box.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 "boxes/autolockbox.h" +#include "boxes/autolock_box.h" #include "lang.h" #include "storage/localstorage.h" diff --git a/Telegram/SourceFiles/boxes/autolock_box.h b/Telegram/SourceFiles/boxes/autolock_box.h index a772d30d52..6ec5473248 100644 --- a/Telegram/SourceFiles/boxes/autolock_box.h +++ b/Telegram/SourceFiles/boxes/autolock_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { class Radiobutton; diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp index 60156f5abf..73ba337f6f 100644 --- a/Telegram/SourceFiles/boxes/background_box.cpp +++ b/Telegram/SourceFiles/boxes/background_box.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 "boxes/backgroundbox.h" +#include "boxes/background_box.h" #include "lang.h" #include "mainwidget.h" diff --git a/Telegram/SourceFiles/boxes/background_box.h b/Telegram/SourceFiles/boxes/background_box.h index b5ebbcbde5..f24331dd84 100644 --- a/Telegram/SourceFiles/boxes/background_box.h +++ b/Telegram/SourceFiles/boxes/background_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { class RoundCheckbox; diff --git a/Telegram/SourceFiles/boxes/calendar_box.cpp b/Telegram/SourceFiles/boxes/calendar_box.cpp index a4a2720f91..4ec587fe3a 100644 --- a/Telegram/SourceFiles/boxes/calendar_box.cpp +++ b/Telegram/SourceFiles/boxes/calendar_box.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 "boxes/calendarbox.h" +#include "boxes/calendar_box.h" #include "ui/widgets/buttons.h" #include "styles/style_boxes.h" diff --git a/Telegram/SourceFiles/boxes/calendar_box.h b/Telegram/SourceFiles/boxes/calendar_box.h index d038af0283..1cb3260244 100644 --- a/Telegram/SourceFiles/boxes/calendar_box.h +++ b/Telegram/SourceFiles/boxes/calendar_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "abstractbox.h" +#include "abstract_box.h" namespace Ui { class IconButton; diff --git a/Telegram/SourceFiles/boxes/change_phone_box.cpp b/Telegram/SourceFiles/boxes/change_phone_box.cpp index e347380dc8..8829914cbd 100644 --- a/Telegram/SourceFiles/boxes/change_phone_box.cpp +++ b/Telegram/SourceFiles/boxes/change_phone_box.cpp @@ -25,9 +25,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/labels.h" #include "ui/widgets/input_fields.h" #include "ui/effects/widget_fade_wrap.h" -#include "boxes/confirmphonebox.h" +#include "boxes/confirm_phone_box.h" #include "ui/toast/toast.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" namespace { diff --git a/Telegram/SourceFiles/boxes/change_phone_box.h b/Telegram/SourceFiles/boxes/change_phone_box.h index 3e54c9a49e..0c64f7e7cb 100644 --- a/Telegram/SourceFiles/boxes/change_phone_box.h +++ b/Telegram/SourceFiles/boxes/change_phone_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" class ChangePhoneBox : public BoxContent { public: diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp index 5ebcf1ed36..4bafcc5555 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.cpp +++ b/Telegram/SourceFiles/boxes/confirm_box.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 "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "styles/style_boxes.h" #include "lang.h" diff --git a/Telegram/SourceFiles/boxes/confirm_box.h b/Telegram/SourceFiles/boxes/confirm_box.h index f5658930c7..be9f0ded04 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.h +++ b/Telegram/SourceFiles/boxes/confirm_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { class Checkbox; diff --git a/Telegram/SourceFiles/boxes/confirm_phone_box.cpp b/Telegram/SourceFiles/boxes/confirm_phone_box.cpp index 03f5dc9c38..90445bee46 100644 --- a/Telegram/SourceFiles/boxes/confirm_phone_box.cpp +++ b/Telegram/SourceFiles/boxes/confirm_phone_box.cpp @@ -18,10 +18,10 @@ 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 "boxes/confirmphonebox.h" +#include "boxes/confirm_phone_box.h" #include "styles/style_boxes.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" #include "ui/widgets/labels.h" diff --git a/Telegram/SourceFiles/boxes/confirm_phone_box.h b/Telegram/SourceFiles/boxes/confirm_phone_box.h index 5f0b8a7bdd..1e510a40ca 100644 --- a/Telegram/SourceFiles/boxes/confirm_phone_box.h +++ b/Telegram/SourceFiles/boxes/confirm_phone_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" #include "ui/widgets/input_fields.h" namespace Ui { diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp index 8f37c45ddc..722b110c34 100644 --- a/Telegram/SourceFiles/boxes/connection_box.cpp +++ b/Telegram/SourceFiles/boxes/connection_box.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 "boxes/connectionbox.h" +#include "boxes/connection_box.h" #include "lang.h" #include "storage/localstorage.h" diff --git a/Telegram/SourceFiles/boxes/connection_box.h b/Telegram/SourceFiles/boxes/connection_box.h index 5ef85ded39..d93fe460a9 100644 --- a/Telegram/SourceFiles/boxes/connection_box.h +++ b/Telegram/SourceFiles/boxes/connection_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { class InputField; diff --git a/Telegram/SourceFiles/boxes/contacts_box.cpp b/Telegram/SourceFiles/boxes/contacts_box.cpp index f00dd06554..e1a17dff8c 100644 --- a/Telegram/SourceFiles/boxes/contacts_box.cpp +++ b/Telegram/SourceFiles/boxes/contacts_box.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 "boxes/contactsbox.h" +#include "boxes/contacts_box.h" #include "dialogs/dialogs_indexed_list.h" #include "styles/style_boxes.h" @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_history.h" #include "styles/style_profile.h" #include "lang.h" -#include "boxes/addcontactbox.h" +#include "boxes/add_contact_box.h" #include "mainwidget.h" #include "mainwindow.h" #include "messenger.h" @@ -37,8 +37,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/scroll_area.h" #include "ui/effects/widget_slide_wrap.h" #include "ui/effects/ripple_animation.h" -#include "boxes/photocropbox.h" -#include "boxes/confirmbox.h" +#include "boxes/photo_crop_box.h" +#include "boxes/confirm_box.h" #include "window/themes/window_theme.h" #include "observer_peer.h" #include "apiwrap.h" diff --git a/Telegram/SourceFiles/boxes/contacts_box.h b/Telegram/SourceFiles/boxes/contacts_box.h index 471574b4d5..31af500f9c 100644 --- a/Telegram/SourceFiles/boxes/contacts_box.h +++ b/Telegram/SourceFiles/boxes/contacts_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" #include "core/single_timer.h" #include "ui/effects/round_checkbox.h" #include "boxes/members_box.h" diff --git a/Telegram/SourceFiles/boxes/download_path_box.cpp b/Telegram/SourceFiles/boxes/download_path_box.cpp index 157a50c514..b25c57befe 100644 --- a/Telegram/SourceFiles/boxes/download_path_box.cpp +++ b/Telegram/SourceFiles/boxes/download_path_box.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 "boxes/downloadpathbox.h" +#include "boxes/download_path_box.h" #include "lang.h" #include "storage/localstorage.h" diff --git a/Telegram/SourceFiles/boxes/download_path_box.h b/Telegram/SourceFiles/boxes/download_path_box.h index 98b3b1cfa0..d2a52ae10c 100644 --- a/Telegram/SourceFiles/boxes/download_path_box.h +++ b/Telegram/SourceFiles/boxes/download_path_box.h @@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" -#include "core/observer.h" +#include "boxes/abstract_box.h" +#include "base/observer.h" namespace Ui { template diff --git a/Telegram/SourceFiles/boxes/edit_color_box.cpp b/Telegram/SourceFiles/boxes/edit_color_box.cpp index 8ae0564352..79720ed6b9 100644 --- a/Telegram/SourceFiles/boxes/edit_color_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_color_box.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 "boxes/editcolorbox.h" +#include "boxes/edit_color_box.h" #include "lang.h" #include "styles/style_boxes.h" diff --git a/Telegram/SourceFiles/boxes/edit_color_box.h b/Telegram/SourceFiles/boxes/edit_color_box.h index 54bbfd3972..c6d29e40c5 100644 --- a/Telegram/SourceFiles/boxes/edit_color_box.h +++ b/Telegram/SourceFiles/boxes/edit_color_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" class EditColorBox : public BoxContent { Q_OBJECT diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.h b/Telegram/SourceFiles/boxes/edit_privacy_box.h index 85c882db62..fb8aa4e7ff 100644 --- a/Telegram/SourceFiles/boxes/edit_privacy_box.h +++ b/Telegram/SourceFiles/boxes/edit_privacy_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" #include "mtproto/sender.h" namespace Ui { diff --git a/Telegram/SourceFiles/boxes/emoji_box.cpp b/Telegram/SourceFiles/boxes/emoji_box.cpp index ab54452716..9540218741 100644 --- a/Telegram/SourceFiles/boxes/emoji_box.cpp +++ b/Telegram/SourceFiles/boxes/emoji_box.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 "boxes/emojibox.h" +#include "boxes/emoji_box.h" #include "lang.h" #include "mainwidget.h" diff --git a/Telegram/SourceFiles/boxes/emoji_box.h b/Telegram/SourceFiles/boxes/emoji_box.h index e3385ff0b9..b25993cc79 100644 --- a/Telegram/SourceFiles/boxes/emoji_box.h +++ b/Telegram/SourceFiles/boxes/emoji_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" class EmojiBox : public BoxContent { public: diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp index 9609dc7873..eb4d005ab2 100644 --- a/Telegram/SourceFiles/boxes/language_box.cpp +++ b/Telegram/SourceFiles/boxes/language_box.cpp @@ -18,13 +18,13 @@ 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 "boxes/languagebox.h" +#include "boxes/language_box.h" #include "lang.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" #include "storage/localstorage.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "mainwidget.h" #include "mainwindow.h" #include "langloaderplain.h" diff --git a/Telegram/SourceFiles/boxes/language_box.h b/Telegram/SourceFiles/boxes/language_box.h index d4659652a8..261d12b658 100644 --- a/Telegram/SourceFiles/boxes/language_box.h +++ b/Telegram/SourceFiles/boxes/language_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { class RadiobuttonGroup; diff --git a/Telegram/SourceFiles/boxes/local_storage_box.cpp b/Telegram/SourceFiles/boxes/local_storage_box.cpp index 505ea29ae6..4c5a134f8c 100644 --- a/Telegram/SourceFiles/boxes/local_storage_box.cpp +++ b/Telegram/SourceFiles/boxes/local_storage_box.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 "boxes/localstoragebox.h" +#include "boxes/local_storage_box.h" #include "styles/style_boxes.h" #include "ui/widgets/buttons.h" diff --git a/Telegram/SourceFiles/boxes/local_storage_box.h b/Telegram/SourceFiles/boxes/local_storage_box.h index 36507a1d23..0b194d78d4 100644 --- a/Telegram/SourceFiles/boxes/local_storage_box.h +++ b/Telegram/SourceFiles/boxes/local_storage_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { class LinkButton; diff --git a/Telegram/SourceFiles/boxes/members_box.cpp b/Telegram/SourceFiles/boxes/members_box.cpp index fdc4b7907a..9b2479c465 100644 --- a/Telegram/SourceFiles/boxes/members_box.cpp +++ b/Telegram/SourceFiles/boxes/members_box.cpp @@ -25,8 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "mainwidget.h" #include "mainwindow.h" -#include "boxes/contactsbox.h" -#include "boxes/confirmbox.h" +#include "boxes/contacts_box.h" +#include "boxes/confirm_box.h" #include "ui/widgets/buttons.h" #include "ui/widgets/scroll_area.h" #include "ui/effects/ripple_animation.h" diff --git a/Telegram/SourceFiles/boxes/members_box.h b/Telegram/SourceFiles/boxes/members_box.h index 01204757c2..48084d9301 100644 --- a/Telegram/SourceFiles/boxes/members_box.h +++ b/Telegram/SourceFiles/boxes/members_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" #include "core/single_timer.h" #include "ui/effects/round_checkbox.h" #include "ui/widgets/buttons.h" diff --git a/Telegram/SourceFiles/boxes/notifications_box.h b/Telegram/SourceFiles/boxes/notifications_box.h index 910787edcb..faadc2eca9 100644 --- a/Telegram/SourceFiles/boxes/notifications_box.h +++ b/Telegram/SourceFiles/boxes/notifications_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { class LinkButton; diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp index afe73da6cd..a9a73938c8 100644 --- a/Telegram/SourceFiles/boxes/passcode_box.cpp +++ b/Telegram/SourceFiles/boxes/passcode_box.cpp @@ -18,10 +18,10 @@ 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 "boxes/passcodebox.h" +#include "boxes/passcode_box.h" #include "lang.h" -#include "confirmbox.h" +#include "boxes/confirm_box.h" #include "mainwindow.h" #include "storage/localstorage.h" #include "styles/style_boxes.h" diff --git a/Telegram/SourceFiles/boxes/passcode_box.h b/Telegram/SourceFiles/boxes/passcode_box.h index 00ac285c6c..bb09b75c0e 100644 --- a/Telegram/SourceFiles/boxes/passcode_box.h +++ b/Telegram/SourceFiles/boxes/passcode_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { class InputField; diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp index 49822c0e62..a978dab7e1 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.cpp +++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp @@ -34,7 +34,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/widget_slide_wrap.h" #include "lang.h" #include "ui/effects/round_checkbox.h" -#include "boxes/contactsbox.h" +#include "boxes/contacts_box.h" #include "window/themes/window_theme.h" PeerListBox::PeerListBox(QWidget*, std::unique_ptr controller) diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h index ad1bb389b7..f01d870b12 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.h +++ b/Telegram/SourceFiles/boxes/peer_list_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { class RippleAnimation; diff --git a/Telegram/SourceFiles/boxes/photo_crop_box.cpp b/Telegram/SourceFiles/boxes/photo_crop_box.cpp index fb0b80fc42..5f1286dfca 100644 --- a/Telegram/SourceFiles/boxes/photo_crop_box.cpp +++ b/Telegram/SourceFiles/boxes/photo_crop_box.cpp @@ -18,12 +18,11 @@ 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 "boxes/photocropbox.h" +#include "boxes/photo_crop_box.h" #include "lang.h" #include "messenger.h" #include "mainwidget.h" -#include "photocropbox.h" #include "storage/file_upload.h" #include "ui/widgets/buttons.h" #include "styles/style_boxes.h" diff --git a/Telegram/SourceFiles/boxes/photo_crop_box.h b/Telegram/SourceFiles/boxes/photo_crop_box.h index 27dbf1357a..cbfb80defc 100644 --- a/Telegram/SourceFiles/boxes/photo_crop_box.h +++ b/Telegram/SourceFiles/boxes/photo_crop_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" class PhotoCropBox : public BoxContent { Q_OBJECT diff --git a/Telegram/SourceFiles/boxes/report_box.cpp b/Telegram/SourceFiles/boxes/report_box.cpp index 0733e443c3..8f7d456254 100644 --- a/Telegram/SourceFiles/boxes/report_box.cpp +++ b/Telegram/SourceFiles/boxes/report_box.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "styles/style_boxes.h" #include "styles/style_profile.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" diff --git a/Telegram/SourceFiles/boxes/report_box.h b/Telegram/SourceFiles/boxes/report_box.h index 701590613b..7f224a7373 100644 --- a/Telegram/SourceFiles/boxes/report_box.h +++ b/Telegram/SourceFiles/boxes/report_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { template diff --git a/Telegram/SourceFiles/boxes/self_destruction_box.h b/Telegram/SourceFiles/boxes/self_destruction_box.h index acbaa011c7..8b47401641 100644 --- a/Telegram/SourceFiles/boxes/self_destruction_box.h +++ b/Telegram/SourceFiles/boxes/self_destruction_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" #include "mtproto/sender.h" namespace Ui { diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h index 51fe070cd9..0ed06f9cfd 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.h +++ b/Telegram/SourceFiles/boxes/send_files_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" #include "storage/localimageloader.h" namespace Ui { diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp index 8b3a846a89..68d57aa83e 100644 --- a/Telegram/SourceFiles/boxes/sessions_box.cpp +++ b/Telegram/SourceFiles/boxes/sessions_box.cpp @@ -18,14 +18,14 @@ 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 "boxes/sessionsbox.h" +#include "boxes/sessions_box.h" #include "lang.h" #include "storage/localstorage.h" #include "mainwidget.h" #include "mainwindow.h" #include "countries.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "ui/widgets/buttons.h" #include "ui/widgets/scroll_area.h" #include "styles/style_boxes.h" diff --git a/Telegram/SourceFiles/boxes/sessions_box.h b/Telegram/SourceFiles/boxes/sessions_box.h index e47ea41b1a..707b06bd54 100644 --- a/Telegram/SourceFiles/boxes/sessions_box.h +++ b/Telegram/SourceFiles/boxes/sessions_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" #include "core/single_timer.h" class ConfirmBox; diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp index f7447dcb30..022f9bae8d 100644 --- a/Telegram/SourceFiles/boxes/share_box.cpp +++ b/Telegram/SourceFiles/boxes/share_box.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 "boxes/sharebox.h" +#include "boxes/share_box.h" #include "dialogs/dialogs_indexed_list.h" #include "styles/style_boxes.h" @@ -27,9 +27,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "mainwindow.h" #include "mainwidget.h" -#include "core/qthelp_url.h" +#include "base/qthelp_url.h" #include "storage/localstorage.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "apiwrap.h" #include "ui/toast/toast.h" #include "ui/widgets/multi_select.h" @@ -37,7 +37,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/buttons.h" #include "ui/widgets/scroll_area.h" #include "window/themes/window_theme.h" -#include "boxes/contactsbox.h" +#include "boxes/contacts_box.h" #include "auth_session.h" #include "messenger.h" diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h index 72bc70df6f..00b3d586c1 100644 --- a/Telegram/SourceFiles/boxes/share_box.h +++ b/Telegram/SourceFiles/boxes/share_box.h @@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" -#include "core/observer.h" +#include "boxes/abstract_box.h" +#include "base/observer.h" #include "ui/effects/round_checkbox.h" namespace Dialogs { diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp index 48478b7a6b..07b0c458ae 100644 --- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp +++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp @@ -18,18 +18,18 @@ 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 "boxes/stickersetbox.h" +#include "boxes/sticker_set_box.h" #include "lang.h" #include "mainwidget.h" #include "mainwindow.h" -#include "stickers/stickers.h" -#include "boxes/confirmbox.h" +#include "chat_helpers/stickers.h" +#include "boxes/confirm_box.h" #include "apiwrap.h" #include "storage/localstorage.h" #include "dialogs/dialogs_layout.h" #include "styles/style_boxes.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "ui/widgets/buttons.h" #include "ui/widgets/scroll_area.h" #include "auth_session.h" diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.h b/Telegram/SourceFiles/boxes/sticker_set_box.h index 1ffe642c56..58f70a7d0a 100644 --- a/Telegram/SourceFiles/boxes/sticker_set_box.h +++ b/Telegram/SourceFiles/boxes/sticker_set_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" #include class ConfirmBox; diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp index f68650850c..ddb5daeb75 100644 --- a/Telegram/SourceFiles/boxes/stickers_box.cpp +++ b/Telegram/SourceFiles/boxes/stickers_box.cpp @@ -22,14 +22,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "mainwidget.h" -#include "stickers/stickers.h" -#include "boxes/confirmbox.h" -#include "boxes/stickersetbox.h" +#include "chat_helpers/stickers.h" +#include "boxes/confirm_box.h" +#include "boxes/sticker_set_box.h" #include "apiwrap.h" #include "storage/localstorage.h" #include "dialogs/dialogs_layout.h" #include "styles/style_boxes.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "ui/widgets/buttons.h" #include "ui/widgets/scroll_area.h" #include "ui/effects/ripple_animation.h" diff --git a/Telegram/SourceFiles/boxes/stickers_box.h b/Telegram/SourceFiles/boxes/stickers_box.h index bcd359f023..12005e29d8 100644 --- a/Telegram/SourceFiles/boxes/stickers_box.h +++ b/Telegram/SourceFiles/boxes/stickers_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" class ConfirmBox; diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp index f8a29283a9..e8b56f7bbf 100644 --- a/Telegram/SourceFiles/boxes/username_box.cpp +++ b/Telegram/SourceFiles/boxes/username_box.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 "boxes/usernamebox.h" +#include "boxes/username_box.h" #include "lang.h" #include "application.h" diff --git a/Telegram/SourceFiles/boxes/username_box.h b/Telegram/SourceFiles/boxes/username_box.h index 78f38caa78..7eab1bb2d7 100644 --- a/Telegram/SourceFiles/boxes/username_box.h +++ b/Telegram/SourceFiles/boxes/username_box.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" namespace Ui { class UsernameInput; diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp index f4ab38c6b1..9e386b7dd5 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp @@ -18,10 +18,10 @@ 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 "stickers/emoji_list_widget.h" +#include "chat_helpers/emoji_list_widget.h" #include "ui/widgets/buttons.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "ui/widgets/shadow.h" #include "lang.h" diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h index 9f5d6205ba..7565534f59 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h +++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "stickers/emoji_panel.h" +#include "chat_helpers/emoji_panel.h" namespace ChatHelpers { diff --git a/Telegram/SourceFiles/chat_helpers/emoji_panel.cpp b/Telegram/SourceFiles/chat_helpers/emoji_panel.cpp index aa8925d9d0..678d6f7f71 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_panel.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_panel.cpp @@ -18,17 +18,17 @@ 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 "stickers/emoji_panel.h" +#include "chat_helpers/emoji_panel.h" -#include "stickers/emoji_list_widget.h" -#include "stickers/stickers_list_widget.h" -#include "stickers/gifs_list_widget.h" -#include "styles/style_stickers.h" +#include "chat_helpers/emoji_list_widget.h" +#include "chat_helpers/stickers_list_widget.h" +#include "chat_helpers/gifs_list_widget.h" +#include "chat_helpers/stickers.h" +#include "styles/style_chat_helpers.h" #include "ui/widgets/buttons.h" #include "ui/widgets/shadow.h" #include "ui/widgets/discrete_sliders.h" #include "ui/widgets/scroll_area.h" -#include "stickers/stickers.h" #include "storage/localstorage.h" #include "lang.h" #include "mainwindow.h" diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp index a5a0ce4d2b..bd9d6c15a9 100644 --- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp +++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.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/field_autocomplete.h" +#include "chat_helpers/field_autocomplete.h" #include "mainwindow.h" #include "apiwrap.h" @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/scroll_area.h" #include "styles/style_history.h" #include "styles/style_widgets.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "auth_session.h" FieldAutocomplete::FieldAutocomplete(QWidget *parent) : TWidget(parent) diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp index 4f43efcd2e..b74c479a57 100644 --- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp @@ -18,15 +18,15 @@ 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 "stickers/gifs_list_widget.h" +#include "chat_helpers/gifs_list_widget.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" #include "ui/effects/ripple_animation.h" #include "boxes/stickers_box.h" #include "inline_bots/inline_bot_result.h" -#include "stickers/stickers.h" +#include "chat_helpers/stickers.h" #include "storage/localstorage.h" #include "lang.h" #include "mainwindow.h" diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h index 94fc4ecb0a..2921cf8332 100644 --- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h +++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "stickers/emoji_panel.h" +#include "chat_helpers/emoji_panel.h" #include "inline_bots/inline_bot_layout_item.h" namespace InlineBots { diff --git a/Telegram/SourceFiles/chat_helpers/stickers.cpp b/Telegram/SourceFiles/chat_helpers/stickers.cpp index 932c2ccccf..0f7ea3c235 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers.cpp @@ -21,14 +21,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "stickers.h" #include "boxes/stickers_box.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "lang.h" #include "apiwrap.h" #include "storage/localstorage.h" #include "mainwidget.h" #include "mainwindow.h" #include "ui/toast/toast.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" namespace Stickers { namespace { diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index fa4989f431..d7131b53a8 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -18,21 +18,21 @@ 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 "stickers/stickers_list_widget.h" +#include "chat_helpers/stickers_list_widget.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "ui/widgets/buttons.h" #include "ui/effects/ripple_animation.h" #include "boxes/stickers_box.h" #include "inline_bots/inline_bot_result.h" -#include "stickers/stickers.h" +#include "chat_helpers/stickers.h" #include "storage/localstorage.h" #include "lang.h" #include "mainwindow.h" #include "dialogs/dialogs_layout.h" -#include "boxes/stickersetbox.h" +#include "boxes/sticker_set_box.h" #include "boxes/stickers_box.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" namespace ChatHelpers { namespace { diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h index c46a7bf34f..7ab30a346f 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h @@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "stickers/emoji_panel.h" -#include "core/variant.h" +#include "chat_helpers/emoji_panel.h" +#include "base/variant.h" namespace Ui { class LinkButton; diff --git a/Telegram/SourceFiles/codegen/emoji/data.cpp b/Telegram/SourceFiles/codegen/emoji/data.cpp index 2a597de3e0..0fa83aea14 100644 --- a/Telegram/SourceFiles/codegen/emoji/data.cpp +++ b/Telegram/SourceFiles/codegen/emoji/data.cpp @@ -39,7 +39,7 @@ using std::end; using InputId = vector; using InputCategory = vector; -// copied from emojibox.cpp +// copied from emoji_box.cpp struct Replace { InputId code; const char *replace; diff --git a/Telegram/SourceFiles/core/basic_types.h b/Telegram/SourceFiles/core/basic_types.h index 850ca6c3c2..859672224c 100644 --- a/Telegram/SourceFiles/core/basic_types.h +++ b/Telegram/SourceFiles/core/basic_types.h @@ -25,7 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include -#include "core/build_config.h" +#include "base/build_config.h" // Custom libc++ build used for old OS X versions already has this. #ifndef OS_MAC_OLD @@ -46,7 +46,7 @@ void as_const(const T&&) = delete; #endif // OS_MAC_OLD -#include "core/ordered_set.h" +#include "base/ordered_set.h" //using uchar = unsigned char; // Qt has uchar using int16 = qint16; diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp index 268cbc0ee4..c73e67aa58 100644 --- a/Telegram/SourceFiles/core/click_handler_types.cpp +++ b/Telegram/SourceFiles/core/click_handler_types.cpp @@ -22,9 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "platform/platform_specific.h" -#include "boxes/confirmbox.h" -#include "core/qthelp_regex.h" -#include "core/qthelp_url.h" +#include "boxes/confirm_box.h" +#include "base/qthelp_regex.h" +#include "base/qthelp_url.h" #include "storage/localstorage.h" #include "ui/widgets/tooltip.h" #include "core/file_utilities.h" diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp index 5d5b54ee0f..14f0035169 100644 --- a/Telegram/SourceFiles/core/file_utilities.cpp +++ b/Telegram/SourceFiles/core/file_utilities.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "storage/localstorage.h" #include "platform/platform_file_utilities.h" -#include "core/task_queue.h" +#include "base/task_queue.h" bool filedialogGetSaveFile(QString &file, const QString &caption, const QString &filter, const QString &initialPath) { QStringList files; diff --git a/Telegram/SourceFiles/core/file_utilities.h b/Telegram/SourceFiles/core/file_utilities.h index 9db7e7e479..922021f3de 100644 --- a/Telegram/SourceFiles/core/file_utilities.h +++ b/Telegram/SourceFiles/core/file_utilities.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/observer.h" +#include "base/observer.h" // legacy bool filedialogGetSaveFile(QString &file, const QString &caption, const QString &filter, const QString &initialPath); diff --git a/Telegram/SourceFiles/dialogswidget.cpp b/Telegram/SourceFiles/dialogswidget.cpp index 8b7912ff59..bc30235989 100644 --- a/Telegram/SourceFiles/dialogswidget.cpp +++ b/Telegram/SourceFiles/dialogswidget.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "dialogs/dialogs_indexed_list.h" #include "dialogs/dialogs_layout.h" #include "styles/style_dialogs.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "styles/style_history.h" #include "ui/widgets/buttons.h" #include "ui/widgets/popup_menu.h" @@ -33,10 +33,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "dialogswidget.h" #include "mainwidget.h" -#include "boxes/addcontactbox.h" -#include "boxes/contactsbox.h" -#include "boxes/confirmbox.h" -#include "boxes/aboutbox.h" +#include "boxes/add_contact_box.h" +#include "boxes/contacts_box.h" +#include "boxes/confirm_box.h" +#include "boxes/about_box.h" #include "storage/localstorage.h" #include "apiwrap.h" #include "ui/widgets/dropdown_menu.h" diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index 549a9372a4..6a294454b8 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -24,10 +24,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "mainwidget.h" #include "messenger.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "layerwidget.h" #include "lang.h" -#include "core/observer.h" +#include "base/observer.h" Q_DECLARE_METATYPE(ClickHandlerPtr); Q_DECLARE_METATYPE(Qt::MouseButton); diff --git a/Telegram/SourceFiles/facades.h b/Telegram/SourceFiles/facades.h index 228ed04d34..7dac46ea39 100644 --- a/Telegram/SourceFiles/facades.h +++ b/Telegram/SourceFiles/facades.h @@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/type_traits.h" -#include "core/observer.h" +#include "base/type_traits.h" +#include "base/observer.h" class LayerWidget; class BoxContent; diff --git a/Telegram/SourceFiles/history.h b/Telegram/SourceFiles/history.h index a5ada2468d..588162bbd5 100644 --- a/Telegram/SourceFiles/history.h +++ b/Telegram/SourceFiles/history.h @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "structs.h" #include "dialogs/dialogs_common.h" #include "ui/effects/send_action_animations.h" -#include "core/observer.h" +#include "base/observer.h" void historyInit(); diff --git a/Telegram/SourceFiles/history/history_drag_area.cpp b/Telegram/SourceFiles/history/history_drag_area.cpp index f630763622..1e943f680b 100644 --- a/Telegram/SourceFiles/history/history_drag_area.cpp +++ b/Telegram/SourceFiles/history/history_drag_area.cpp @@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "history/history_drag_area.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "styles/style_boxes.h" -#include "boxes/confirmbox.h" -#include "boxes/stickersetbox.h" +#include "boxes/confirm_box.h" +#include "boxes/sticker_set_box.h" #include "inline_bots/inline_bot_result.h" #include "inline_bots/inline_bot_layout_item.h" #include "dialogs/dialogs_layout.h" diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h index d76b9e2367..d325cc4411 100644 --- a/Telegram/SourceFiles/history/history_item.h +++ b/Telegram/SourceFiles/history/history_item.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/runtime_composer.h" +#include "base/runtime_composer.h" namespace Ui { class RippleAnimation; diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp index a411a9e694..ffb1a64d0e 100644 --- a/Telegram/SourceFiles/history/history_media_types.cpp +++ b/Telegram/SourceFiles/history/history_media_types.cpp @@ -27,8 +27,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "media/media_audio.h" #include "media/media_clip_reader.h" #include "media/player/media_player_instance.h" -#include "boxes/confirmbox.h" -#include "boxes/addcontactbox.h" +#include "boxes/confirm_box.h" +#include "boxes/add_contact_box.h" #include "core/click_handler_types.h" #include "history/history_location_manager.h" #include "styles/style_history.h" diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index f8bfe4681a..580d4606f3 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -25,9 +25,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_window.h" #include "styles/style_boxes.h" #include "styles/style_profile.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "boxes/send_files_box.h" -#include "boxes/sharebox.h" +#include "boxes/share_box.h" #include "core/file_utilities.h" #include "ui/toast/toast.h" #include "ui/special_buttons.h" @@ -42,7 +42,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "history/history_drag_area.h" #include "profile/profile_block_group_members.h" #include "core/click_handler_types.h" -#include "stickers/emoji_panel.h" +#include "chat_helpers/emoji_panel.h" #include "lang.h" #include "application.h" #include "mainwidget.h" @@ -57,7 +57,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/top_bar_widget.h" #include "window/themes/window_theme.h" #include "observer_peer.h" -#include "core/qthelp_regex.h" +#include "base/qthelp_regex.h" #include "ui/widgets/popup_menu.h" #include "platform/platform_file_utilities.h" #include "auth_session.h" diff --git a/Telegram/SourceFiles/historywidget.h b/Telegram/SourceFiles/historywidget.h index 7ae9dd429f..e3efef33d6 100644 --- a/Telegram/SourceFiles/historywidget.h +++ b/Telegram/SourceFiles/historywidget.h @@ -25,7 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/input_fields.h" #include "ui/widgets/scroll_area.h" #include "history/history_common.h" -#include "history/field_autocomplete.h" +#include "chat_helpers/field_autocomplete.h" #include "window/section_widget.h" #include "core/single_timer.h" diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp index 472cc614cf..ce8e5107bd 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_overview.h" #include "styles/style_history.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "styles/style_widgets.h" #include "inline_bots/inline_bot_result.h" #include "media/media_audio.h" diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp index 2070ad9c4f..d4dd45757b 100644 --- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp @@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "inline_bots/inline_results_widget.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "ui/widgets/buttons.h" #include "ui/widgets/shadow.h" #include "ui/effects/ripple_animation.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "inline_bots/inline_bot_result.h" #include "inline_bots/inline_bot_layout_item.h" #include "dialogs/dialogs_layout.h" diff --git a/Telegram/SourceFiles/intro/introphone.cpp b/Telegram/SourceFiles/intro/introphone.cpp index d0645dd584..4a3159b01f 100644 --- a/Telegram/SourceFiles/intro/introphone.cpp +++ b/Telegram/SourceFiles/intro/introphone.cpp @@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/labels.h" #include "ui/effects/widget_fade_wrap.h" #include "core/click_handler_types.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "messenger.h" namespace Intro { diff --git a/Telegram/SourceFiles/intro/intropwdcheck.cpp b/Telegram/SourceFiles/intro/intropwdcheck.cpp index 53abd9a67b..670d80d4c7 100644 --- a/Telegram/SourceFiles/intro/intropwdcheck.cpp +++ b/Telegram/SourceFiles/intro/intropwdcheck.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_intro.h" #include "styles/style_boxes.h" #include "core/file_utilities.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "lang.h" #include "application.h" #include "intro/introsignup.h" diff --git a/Telegram/SourceFiles/intro/introsignup.cpp b/Telegram/SourceFiles/intro/introsignup.cpp index b9e7d81d35..bd6cd8aa63 100644 --- a/Telegram/SourceFiles/intro/introsignup.cpp +++ b/Telegram/SourceFiles/intro/introsignup.cpp @@ -23,8 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_intro.h" #include "styles/style_boxes.h" #include "core/file_utilities.h" -#include "boxes/photocropbox.h" -#include "boxes/confirmbox.h" +#include "boxes/photo_crop_box.h" +#include "boxes/confirm_box.h" #include "lang.h" #include "application.h" #include "ui/widgets/buttons.h" diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp index a24c8e0849..6b79a14839 100644 --- a/Telegram/SourceFiles/intro/introwidget.cpp +++ b/Telegram/SourceFiles/intro/introwidget.cpp @@ -32,7 +32,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "messenger.h" #include "application.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "ui/text/text.h" #include "ui/widgets/buttons.h" #include "ui/widgets/labels.h" diff --git a/Telegram/SourceFiles/langloaderplain.cpp b/Telegram/SourceFiles/langloaderplain.cpp index 01073056d5..743ca46f66 100644 --- a/Telegram/SourceFiles/langloaderplain.cpp +++ b/Telegram/SourceFiles/langloaderplain.cpp @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "langloaderplain.h" -#include "core/parse_helper.h" +#include "base/parse_helper.h" bool LangLoaderPlain::readKeyValue(const char *&from, const char *end) { using base::parse::skipWhitespaces; diff --git a/Telegram/SourceFiles/layerwidget.cpp b/Telegram/SourceFiles/layerwidget.cpp index 6c43a0be4d..abb5bf90c7 100644 --- a/Telegram/SourceFiles/layerwidget.cpp +++ b/Telegram/SourceFiles/layerwidget.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "media/media_clip_reader.h" -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" #include "layerwidget.h" #include "application.h" #include "mainwindow.h" @@ -29,7 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/file_utilities.h" #include "styles/style_boxes.h" #include "styles/style_widgets.h" -#include "styles/style_stickers.h" +#include "styles/style_chat_helpers.h" #include "ui/widgets/shadow.h" #include "window/window_main_menu.h" #include "auth_session.h" diff --git a/Telegram/SourceFiles/layout.cpp b/Telegram/SourceFiles/layout.cpp index 515ae22805..bb7b0147c3 100644 --- a/Telegram/SourceFiles/layout.cpp +++ b/Telegram/SourceFiles/layout.cpp @@ -26,8 +26,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/file_upload.h" #include "mainwindow.h" #include "core/file_utilities.h" -#include "boxes/addcontactbox.h" -#include "boxes/confirmbox.h" +#include "boxes/add_contact_box.h" +#include "boxes/confirm_box.h" #include "media/media_audio.h" #include "storage/localstorage.h" diff --git a/Telegram/SourceFiles/layout.h b/Telegram/SourceFiles/layout.h index ad315f4b40..2cecf01ab8 100644 --- a/Telegram/SourceFiles/layout.h +++ b/Telegram/SourceFiles/layout.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/runtime_composer.h" +#include "base/runtime_composer.h" static constexpr TextSelection FullSelection = { 0xFFFF, 0xFFFF }; diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 115f0914fe..ebcf0359b9 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -36,18 +36,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "historywidget.h" #include "overviewwidget.h" #include "lang.h" -#include "boxes/addcontactbox.h" +#include "boxes/add_contact_box.h" #include "storage/file_upload.h" #include "messenger.h" #include "application.h" #include "mainwindow.h" #include "inline_bots/inline_bot_layout_item.h" -#include "boxes/confirmbox.h" -#include "boxes/stickersetbox.h" -#include "boxes/contactsbox.h" -#include "boxes/downloadpathbox.h" -#include "boxes/confirmphonebox.h" -#include "boxes/sharebox.h" +#include "boxes/confirm_box.h" +#include "boxes/sticker_set_box.h" +#include "boxes/contacts_box.h" +#include "boxes/download_path_box.h" +#include "boxes/confirm_phone_box.h" +#include "boxes/share_box.h" #include "storage/localstorage.h" #include "shortcuts.h" #include "media/media_audio.h" @@ -55,14 +55,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "media/player/media_player_widget.h" #include "media/player/media_player_volume_controller.h" #include "media/player/media_player_instance.h" -#include "core/qthelp_regex.h" -#include "core/qthelp_url.h" +#include "base/qthelp_regex.h" +#include "base/qthelp_url.h" #include "window/themes/window_theme.h" #include "window/player_wrap_widget.h" #include "styles/style_boxes.h" #include "mtproto/dc_options.h" #include "core/file_utilities.h" -#include "boxes/calendarbox.h" +#include "boxes/calendar_box.h" #include "auth_session.h" #include "window/notifications_manager.h" #include "window/window_controller.h" diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index 1386797bea..50ad9f7ce7 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_boxes.h" #include "ui/widgets/popup_menu.h" #include "ui/widgets/buttons.h" -#include "core/zlib_help.h" +#include "base/zlib_help.h" #include "lang.h" #include "shortcuts.h" #include "messenger.h" @@ -36,9 +36,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "intro/introwidget.h" #include "mainwidget.h" #include "layerwidget.h" -#include "boxes/confirmbox.h" -#include "boxes/contactsbox.h" -#include "boxes/addcontactbox.h" +#include "boxes/confirm_box.h" +#include "boxes/contacts_box.h" +#include "boxes/add_contact_box.h" #include "observer_peer.h" #include "autoupdater.h" #include "mediaview.h" @@ -50,7 +50,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/themes/window_theme.h" #include "window/themes/window_theme_warning.h" #include "window/window_main_menu.h" -#include "core/task_queue.h" +#include "base/task_queue.h" #include "auth_session.h" #include "window/window_controller.h" diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index e0161e9df9..2886b8d989 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -34,7 +34,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "media/media_audio.h" #include "history/history_media_types.h" #include "window/themes/window_theme_preview.h" -#include "core/task_queue.h" +#include "base/task_queue.h" #include "observer_peer.h" #include "auth_session.h" #include "messenger.h" diff --git a/Telegram/SourceFiles/messenger.h b/Telegram/SourceFiles/messenger.h index b596a5b1c7..f1230680c3 100644 --- a/Telegram/SourceFiles/messenger.h +++ b/Telegram/SourceFiles/messenger.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/observer.h" +#include "base/observer.h" namespace MTP { class DcOptions; diff --git a/Telegram/SourceFiles/mtproto/dc_options.h b/Telegram/SourceFiles/mtproto/dc_options.h index 5675251771..64daab026a 100644 --- a/Telegram/SourceFiles/mtproto/dc_options.h +++ b/Telegram/SourceFiles/mtproto/dc_options.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/observer.h" +#include "base/observer.h" #include #include #include diff --git a/Telegram/SourceFiles/mtproto/sender.h b/Telegram/SourceFiles/mtproto/sender.h index 43d9672874..b085659ebc 100644 --- a/Telegram/SourceFiles/mtproto/sender.h +++ b/Telegram/SourceFiles/mtproto/sender.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/variant.h" +#include "base/variant.h" namespace MTP { diff --git a/Telegram/SourceFiles/observer_peer.cpp b/Telegram/SourceFiles/observer_peer.cpp index 55f371fa97..0506e27221 100644 --- a/Telegram/SourceFiles/observer_peer.cpp +++ b/Telegram/SourceFiles/observer_peer.cpp @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "observer_peer.h" -#include "core/observer.h" +#include "base/observer.h" namespace App { // Temp forward declaration (while all peer updates are not done through observers). diff --git a/Telegram/SourceFiles/observer_peer.h b/Telegram/SourceFiles/observer_peer.h index 8731c59d7d..8d7002ce0b 100644 --- a/Telegram/SourceFiles/observer_peer.h +++ b/Telegram/SourceFiles/observer_peer.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/observer.h" +#include "base/observer.h" namespace Notify { diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp index acb46082f5..d92e362f9a 100644 --- a/Telegram/SourceFiles/overview/overview_layout.cpp +++ b/Telegram/SourceFiles/overview/overview_layout.cpp @@ -23,8 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_overview.h" #include "styles/style_history.h" #include "core/file_utilities.h" -#include "boxes/addcontactbox.h" -#include "boxes/confirmbox.h" +#include "boxes/add_contact_box.h" +#include "boxes/confirm_box.h" #include "lang.h" #include "mainwidget.h" #include "application.h" diff --git a/Telegram/SourceFiles/overviewwidget.cpp b/Telegram/SourceFiles/overviewwidget.cpp index 5dea00d22f..613d8a1277 100644 --- a/Telegram/SourceFiles/overviewwidget.cpp +++ b/Telegram/SourceFiles/overviewwidget.cpp @@ -22,9 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_dialogs.h" #include "styles/style_window.h" #include "styles/style_settings.h" -#include "boxes/addcontactbox.h" -#include "boxes/confirmbox.h" -#include "boxes/photocropbox.h" +#include "boxes/add_contact_box.h" +#include "boxes/confirm_box.h" +#include "boxes/photo_crop_box.h" #include "core/file_utilities.h" #include "ui/widgets/popup_menu.h" #include "ui/widgets/tooltip.h" diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp index 5f83de52ae..b9f06b6668 100644 --- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/linux/linux_libnotify.h" #include "platform/linux/linux_libs.h" #include "lang.h" -#include "core/task_queue.h" +#include "base/task_queue.h" namespace Platform { namespace Notifications { diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 5bbed25d3e..ace4de21d3 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -25,8 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/localstorage.h" #include "window/notifications_manager_default.h" #include "platform/platform_notifications_manager.h" -#include "boxes/contactsbox.h" -#include "boxes/aboutbox.h" +#include "boxes/contacts_box.h" +#include "boxes/about_box.h" #include "lang.h" #include "platform/mac/mac_utilities.h" diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm index c6a61cbac9..27c7476e21 100644 --- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm +++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/mac/mac_utilities.h" #include "styles/style_window.h" #include "mainwindow.h" -#include "core/task_queue.h" +#include "base/task_queue.h" #include diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp index cc916f7369..fb28ebc046 100644 --- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp +++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp @@ -25,7 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/win/windows_event_filter.h" #include "platform/win/windows_dlls.h" #include "mainwindow.h" -#include "core/task_queue.h" +#include "base/task_queue.h" #include #include diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp index c8611da4ea..1a5fad6f05 100644 --- a/Telegram/SourceFiles/platform/win/specific_win.cpp +++ b/Telegram/SourceFiles/platform/win/specific_win.cpp @@ -31,7 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "history/history_location_manager.h" #include "storage/localstorage.h" #include "passcodewidget.h" -#include "core/task_queue.h" +#include "base/task_queue.h" #include #include diff --git a/Telegram/SourceFiles/profile/profile_block_actions.cpp b/Telegram/SourceFiles/profile/profile_block_actions.cpp index 41f5024a5e..6d7dbcbfa4 100644 --- a/Telegram/SourceFiles/profile/profile_block_actions.cpp +++ b/Telegram/SourceFiles/profile/profile_block_actions.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_profile.h" #include "styles/style_boxes.h" #include "ui/widgets/buttons.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "boxes/report_box.h" #include "mainwidget.h" #include "observer_peer.h" diff --git a/Telegram/SourceFiles/profile/profile_block_group_members.cpp b/Telegram/SourceFiles/profile/profile_block_group_members.cpp index 64fe57a056..bb09d0d77b 100644 --- a/Telegram/SourceFiles/profile/profile_block_group_members.cpp +++ b/Telegram/SourceFiles/profile/profile_block_group_members.cpp @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_profile.h" #include "ui/widgets/labels.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "ui/widgets/popup_menu.h" #include "mainwidget.h" #include "apiwrap.h" diff --git a/Telegram/SourceFiles/profile/profile_block_invite_link.cpp b/Telegram/SourceFiles/profile/profile_block_invite_link.cpp index bfed4ad393..ff521c3033 100644 --- a/Telegram/SourceFiles/profile/profile_block_invite_link.cpp +++ b/Telegram/SourceFiles/profile/profile_block_invite_link.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_profile.h" #include "ui/widgets/labels.h" #include "ui/toast/toast.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "observer_peer.h" #include "mainwindow.h" #include "lang.h" diff --git a/Telegram/SourceFiles/profile/profile_block_settings.cpp b/Telegram/SourceFiles/profile/profile_block_settings.cpp index a7e244fcb6..b0750b8f7c 100644 --- a/Telegram/SourceFiles/profile/profile_block_settings.cpp +++ b/Telegram/SourceFiles/profile/profile_block_settings.cpp @@ -23,8 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_profile.h" #include "ui/widgets/buttons.h" #include "ui/widgets/checkbox.h" -#include "boxes/confirmbox.h" -#include "boxes/contactsbox.h" +#include "boxes/confirm_box.h" +#include "boxes/contacts_box.h" #include "observer_peer.h" #include "mainwidget.h" #include "apiwrap.h" diff --git a/Telegram/SourceFiles/profile/profile_block_widget.h b/Telegram/SourceFiles/profile/profile_block_widget.h index 67c12064b3..fc4c451e7b 100644 --- a/Telegram/SourceFiles/profile/profile_block_widget.h +++ b/Telegram/SourceFiles/profile/profile_block_widget.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/observer.h" +#include "base/observer.h" namespace Profile { diff --git a/Telegram/SourceFiles/profile/profile_cover.cpp b/Telegram/SourceFiles/profile/profile_cover.cpp index 19ec7b7d6a..6b05f06eaa 100644 --- a/Telegram/SourceFiles/profile/profile_cover.cpp +++ b/Telegram/SourceFiles/profile/profile_cover.cpp @@ -28,9 +28,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/file_utilities.h" #include "ui/widgets/labels.h" #include "observer_peer.h" -#include "boxes/confirmbox.h" -#include "boxes/contactsbox.h" -#include "boxes/photocropbox.h" +#include "boxes/confirm_box.h" +#include "boxes/contacts_box.h" +#include "boxes/photo_crop_box.h" #include "lang.h" #include "apiwrap.h" #include "mainwidget.h" diff --git a/Telegram/SourceFiles/profile/profile_cover.h b/Telegram/SourceFiles/profile/profile_cover.h index 0d8dfac93b..52eb449754 100644 --- a/Telegram/SourceFiles/profile/profile_cover.h +++ b/Telegram/SourceFiles/profile/profile_cover.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/observer.h" +#include "base/observer.h" namespace style { struct RoundButton; diff --git a/Telegram/SourceFiles/profile/profile_fixed_bar.cpp b/Telegram/SourceFiles/profile/profile_fixed_bar.cpp index effef1585b..2118cdd8d2 100644 --- a/Telegram/SourceFiles/profile/profile_fixed_bar.cpp +++ b/Telegram/SourceFiles/profile/profile_fixed_bar.cpp @@ -25,8 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/buttons.h" #include "lang.h" #include "mainwidget.h" -#include "boxes/addcontactbox.h" -#include "boxes/confirmbox.h" +#include "boxes/add_contact_box.h" +#include "boxes/confirm_box.h" #include "observer_peer.h" #include "styles/style_boxes.h" #include "profile/profile_back_button.h" diff --git a/Telegram/SourceFiles/profile/profile_fixed_bar.h b/Telegram/SourceFiles/profile/profile_fixed_bar.h index b719486cab..b462eda52d 100644 --- a/Telegram/SourceFiles/profile/profile_fixed_bar.h +++ b/Telegram/SourceFiles/profile/profile_fixed_bar.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/observer.h" +#include "base/observer.h" namespace Notify { struct PeerUpdate; diff --git a/Telegram/SourceFiles/profile/profile_userpic_button.h b/Telegram/SourceFiles/profile/profile_userpic_button.h index 67ea895f9c..6e710785ea 100644 --- a/Telegram/SourceFiles/profile/profile_userpic_button.h +++ b/Telegram/SourceFiles/profile/profile_userpic_button.h @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "ui/abstract_button.h" -#include "core/observer.h" +#include "base/observer.h" namespace Notify { struct PeerUpdate; diff --git a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp index c3e20c9cf1..7416afb191 100644 --- a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp @@ -22,10 +22,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_settings.h" #include "lang.h" -#include "boxes/connectionbox.h" -#include "boxes/confirmbox.h" -#include "boxes/aboutbox.h" -#include "boxes/localstoragebox.h" +#include "boxes/connection_box.h" +#include "boxes/confirm_box.h" +#include "boxes/about_box.h" +#include "boxes/local_storage_box.h" #include "mainwindow.h" #include "ui/widgets/buttons.h" #include "ui/effects/widget_slide_wrap.h" diff --git a/Telegram/SourceFiles/settings/settings_background_widget.cpp b/Telegram/SourceFiles/settings/settings_background_widget.cpp index 30ee78f2da..c7895fb0d4 100644 --- a/Telegram/SourceFiles/settings/settings_background_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_background_widget.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_settings.h" #include "lang.h" #include "mainwidget.h" -#include "boxes/backgroundbox.h" +#include "boxes/background_box.h" #include "ui/effects/widget_slide_wrap.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" diff --git a/Telegram/SourceFiles/settings/settings_block_widget.h b/Telegram/SourceFiles/settings/settings_block_widget.h index 79b6abeab4..4b6ed598fb 100644 --- a/Telegram/SourceFiles/settings/settings_block_widget.h +++ b/Telegram/SourceFiles/settings/settings_block_widget.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/observer.h" +#include "base/observer.h" #include "styles/style_boxes.h" namespace Ui { diff --git a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp index c02dcef498..9d919219d6 100644 --- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp @@ -29,11 +29,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/localstorage.h" #include "mainwidget.h" #include "mainwindow.h" -#include "boxes/emojibox.h" +#include "boxes/emoji_box.h" #include "boxes/stickers_box.h" -#include "boxes/downloadpathbox.h" -#include "boxes/connectionbox.h" -#include "boxes/confirmbox.h" +#include "boxes/download_path_box.h" +#include "boxes/connection_box.h" +#include "boxes/confirm_box.h" namespace Settings { diff --git a/Telegram/SourceFiles/settings/settings_cover.cpp b/Telegram/SourceFiles/settings/settings_cover.cpp index 3d7e194630..c89ac773f0 100644 --- a/Telegram/SourceFiles/settings/settings_cover.cpp +++ b/Telegram/SourceFiles/settings/settings_cover.cpp @@ -29,9 +29,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "apiwrap.h" #include "profile/profile_userpic_button.h" #include "profile/profile_cover_drop_area.h" -#include "boxes/confirmbox.h" -#include "boxes/photocropbox.h" -#include "boxes/addcontactbox.h" +#include "boxes/confirm_box.h" +#include "boxes/photo_crop_box.h" +#include "boxes/add_contact_box.h" #include "styles/style_settings.h" #include "styles/style_profile.h" // for divider #include "platform/platform_file_utilities.h" diff --git a/Telegram/SourceFiles/settings/settings_cover.h b/Telegram/SourceFiles/settings/settings_cover.h index 25a2a41630..ccd5072462 100644 --- a/Telegram/SourceFiles/settings/settings_cover.h +++ b/Telegram/SourceFiles/settings/settings_cover.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/observer.h" +#include "base/observer.h" #include "settings/settings_block_widget.h" namespace Ui { diff --git a/Telegram/SourceFiles/settings/settings_general_widget.cpp b/Telegram/SourceFiles/settings/settings_general_widget.cpp index 435d3f0cb2..cdfc7683a0 100644 --- a/Telegram/SourceFiles/settings/settings_general_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_general_widget.cpp @@ -29,9 +29,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/platform_specific.h" #include "mainwindow.h" #include "application.h" -#include "boxes/languagebox.h" -#include "boxes/confirmbox.h" -#include "boxes/aboutbox.h" +#include "boxes/language_box.h" +#include "boxes/confirm_box.h" +#include "boxes/about_box.h" #include "core/file_utilities.h" #include "langloaderplain.h" #include "autoupdater.h" diff --git a/Telegram/SourceFiles/settings/settings_info_widget.cpp b/Telegram/SourceFiles/settings/settings_info_widget.cpp index ff3d11feb9..c1c7dc8fd8 100644 --- a/Telegram/SourceFiles/settings/settings_info_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_info_widget.cpp @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "ui/widgets/labels.h" #include "ui/effects/widget_slide_wrap.h" -#include "boxes/usernamebox.h" +#include "boxes/username_box.h" #include "boxes/change_phone_box.h" #include "observer_peer.h" #include "messenger.h" diff --git a/Telegram/SourceFiles/settings/settings_layer.cpp b/Telegram/SourceFiles/settings/settings_layer.cpp index 0871076d7b..c10f449485 100644 --- a/Telegram/SourceFiles/settings/settings_layer.cpp +++ b/Telegram/SourceFiles/settings/settings_layer.cpp @@ -31,7 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "mainwidget.h" #include "storage/localstorage.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "application.h" #include "core/file_utilities.h" #include "window/themes/window_theme.h" diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp index 8f36e2c001..f712de91bd 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp +++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwidget.h" #include "auth_session.h" #include "storage/localstorage.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" namespace Settings { namespace { diff --git a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp index b96230ce76..a28d58cd00 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp @@ -26,9 +26,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "application.h" #include "platform/platform_specific.h" -#include "boxes/sessionsbox.h" -#include "boxes/passcodebox.h" -#include "boxes/autolockbox.h" +#include "boxes/sessions_box.h" +#include "boxes/passcode_box.h" +#include "boxes/autolock_box.h" #include "boxes/peer_list_box.h" #include "boxes/edit_privacy_box.h" #include "boxes/self_destruction_box.h" diff --git a/Telegram/SourceFiles/settings/settings_scale_widget.cpp b/Telegram/SourceFiles/settings/settings_scale_widget.cpp index b4975e6727..4a509040ab 100644 --- a/Telegram/SourceFiles/settings/settings_scale_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_scale_widget.cpp @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "storage/localstorage.h" #include "mainwindow.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "application.h" #include "ui/widgets/discrete_sliders.h" diff --git a/Telegram/SourceFiles/settings/settings_widget.cpp b/Telegram/SourceFiles/settings/settings_widget.cpp index ce4e686904..bacf0cd91b 100644 --- a/Telegram/SourceFiles/settings/settings_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_widget.cpp @@ -31,7 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "mainwidget.h" #include "storage/localstorage.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "lang.h" #include "messenger.h" #include "mtproto/mtp_instance.h" diff --git a/Telegram/SourceFiles/shortcuts.cpp b/Telegram/SourceFiles/shortcuts.cpp index 9cf0de4c8e..e22dd96f76 100644 --- a/Telegram/SourceFiles/shortcuts.cpp +++ b/Telegram/SourceFiles/shortcuts.cpp @@ -25,7 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwidget.h" #include "media/player/media_player_instance.h" #include "platform/platform_specific.h" -#include "core/parse_helper.h" +#include "base/parse_helper.h" namespace ShortcutCommands { diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h index 24b61ba9a0..aa46e6f433 100644 --- a/Telegram/SourceFiles/stdafx.h +++ b/Telegram/SourceFiles/stdafx.h @@ -59,7 +59,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/basic_types.h" #include "logs.h" #include "core/utils.h" -#include "core/lambda.h" +#include "base/lambda.h" #include "config.h" #include "mtproto/facade.h" diff --git a/Telegram/SourceFiles/storage/file_download.h b/Telegram/SourceFiles/storage/file_download.h index fa5fab9d1e..c80a564116 100644 --- a/Telegram/SourceFiles/storage/file_download.h +++ b/Telegram/SourceFiles/storage/file_download.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/observer.h" +#include "base/observer.h" #include "storage/localimageloader.h" // for TaskId namespace Storage { diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp index 4491ad5977..25cf438641 100644 --- a/Telegram/SourceFiles/storage/localimageloader.cpp +++ b/Telegram/SourceFiles/storage/localimageloader.cpp @@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwidget.h" #include "mainwindow.h" #include "lang.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" namespace { diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h index 3614c22a16..3c98ff54e6 100644 --- a/Telegram/SourceFiles/storage/localimageloader.h +++ b/Telegram/SourceFiles/storage/localimageloader.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/variant.h" +#include "base/variant.h" enum class CompressConfirm { Auto, diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp index f6c0dfb679..cbebdc401c 100644 --- a/Telegram/SourceFiles/structs.cpp +++ b/Telegram/SourceFiles/structs.cpp @@ -29,7 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "core/file_utilities.h" #include "apiwrap.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "media/media_audio.h" #include "storage/localstorage.h" #include "history/history_media_types.h" diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp index a7b7c1b7aa..b9a8fc2217 100644 --- a/Telegram/SourceFiles/ui/countryinput.cpp +++ b/Telegram/SourceFiles/ui/countryinput.cpp @@ -25,7 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/scroll_area.h" #include "ui/widgets/multi_select.h" #include "ui/effects/ripple_animation.h" -#include "boxes/contactsbox.h" +#include "boxes/contacts_box.h" #include "countries.h" #include "styles/style_boxes.h" #include "styles/style_intro.h" diff --git a/Telegram/SourceFiles/ui/countryinput.h b/Telegram/SourceFiles/ui/countryinput.h index 8c52c12b91..08291cf36a 100644 --- a/Telegram/SourceFiles/ui/countryinput.h +++ b/Telegram/SourceFiles/ui/countryinput.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "boxes/abstractbox.h" +#include "boxes/abstract_box.h" #include "styles/style_widgets.h" QString findValidCode(QString fullCode); diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp index 0188d70c26..089a17ffc3 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/text/text_block.h" #include "lang.h" #include "platform/platform_specific.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "mainwindow.h" namespace { diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp index 3aae3df571..e337a1ed37 100644 --- a/Telegram/SourceFiles/window/themes/window_theme.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme.cpp @@ -22,11 +22,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwidget.h" #include "storage/localstorage.h" -#include "core/parse_helper.h" -#include "core/zlib_help.h" +#include "base/parse_helper.h" +#include "base/zlib_help.h" #include "styles/style_widgets.h" #include "styles/style_history.h" -#include "boxes/backgroundbox.h" +#include "boxes/background_box.h" namespace Window { namespace Theme { diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp index 7d3c38f778..58facba910 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/themes/window_theme_editor_block.h" #include "mainwindow.h" #include "storage/localstorage.h" -#include "boxes/confirmbox.h" +#include "boxes/confirm_box.h" #include "styles/style_window.h" #include "styles/style_settings.h" #include "styles/style_dialogs.h" @@ -34,12 +34,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/buttons.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/multi_select.h" -#include "core/parse_helper.h" -#include "core/task_queue.h" -#include "core/zlib_help.h" +#include "base/parse_helper.h" +#include "base/task_queue.h" +#include "base/zlib_help.h" #include "ui/toast/toast.h" #include "core/file_utilities.h" -#include "boxes/editcolorbox.h" +#include "boxes/edit_color_box.h" #include "lang.h" namespace Window { diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp index bec318f9da..a3056745f3 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_window.h" #include "ui/effects/ripple_animation.h" -#include "boxes/editcolorbox.h" +#include "boxes/edit_color_box.h" #include "lang.h" namespace Window { diff --git a/Telegram/SourceFiles/window/top_bar_widget.cpp b/Telegram/SourceFiles/window/top_bar_widget.cpp index 310395a684..81a1f6f3a8 100644 --- a/Telegram/SourceFiles/window/top_bar_widget.cpp +++ b/Telegram/SourceFiles/window/top_bar_widget.cpp @@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/top_bar_widget.h" #include "styles/style_window.h" -#include "boxes/addcontactbox.h" -#include "boxes/confirmbox.h" +#include "boxes/add_contact_box.h" +#include "boxes/confirm_box.h" #include "mainwidget.h" #include "mainwindow.h" #include "shortcuts.h" diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index d86f8b7d34..dd34545b2f 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -27,8 +27,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/labels.h" #include "ui/widgets/menu.h" #include "mainwindow.h" -#include "boxes/contactsbox.h" -#include "boxes/aboutbox.h" +#include "boxes/contacts_box.h" +#include "boxes/about_box.h" #include "lang.h" #include "core/click_handler_types.h" #include "auth_session.h" diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp index a1805ebd94..d1953340f2 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -46,7 +46,7 @@ '<(src_loc)/overview/overview.style', '<(src_loc)/profile/profile.style', '<(src_loc)/settings/settings.style', - '<(src_loc)/stickers/stickers.style', + '<(src_loc)/chat_helpers/chat_helpers.style', '<(src_loc)/ui/widgets/widgets.style', '<(src_loc)/window/window.style', ], diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index 6fa7b704de..00398363d7 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -1,64 +1,94 @@ -<(src_loc)/boxes/aboutbox.cpp -<(src_loc)/boxes/aboutbox.h -<(src_loc)/boxes/abstractbox.cpp -<(src_loc)/boxes/abstractbox.h -<(src_loc)/boxes/addcontactbox.cpp -<(src_loc)/boxes/addcontactbox.h -<(src_loc)/boxes/autolockbox.cpp -<(src_loc)/boxes/autolockbox.h -<(src_loc)/boxes/backgroundbox.cpp -<(src_loc)/boxes/backgroundbox.h -<(src_loc)/boxes/calendarbox.cpp -<(src_loc)/boxes/calendarbox.h +<(src_loc)/base/build_config.h +<(src_loc)/base/lambda.h +<(src_loc)/base/observer.cpp +<(src_loc)/base/observer.h +<(src_loc)/base/ordered_set.h +<(src_loc)/base/parse_helper.cpp +<(src_loc)/base/parse_helper.h +<(src_loc)/base/qthelp_regex.h +<(src_loc)/base/qthelp_url.cpp +<(src_loc)/base/qthelp_url.h +<(src_loc)/base/runtime_composer.cpp +<(src_loc)/base/runtime_composer.h +<(src_loc)/base/task_queue.h +<(src_loc)/base/task_queue.cpp +<(src_loc)/base/type_traits.h +<(src_loc)/base/variant.h +<(src_loc)/base/virtual_method.h +<(src_loc)/base/weak_unique_ptr.h +<(src_loc)/base/zlib_help.h +<(src_loc)/boxes/about_box.cpp +<(src_loc)/boxes/about_box.h +<(src_loc)/boxes/abstract_box.cpp +<(src_loc)/boxes/abstract_box.h +<(src_loc)/boxes/add_contact_box.cpp +<(src_loc)/boxes/add_contact_box.h +<(src_loc)/boxes/autolock_box.cpp +<(src_loc)/boxes/autolock_box.h +<(src_loc)/boxes/background_box.cpp +<(src_loc)/boxes/background_box.h +<(src_loc)/boxes/calendar_box.cpp +<(src_loc)/boxes/calendar_box.h <(src_loc)/boxes/change_phone_box.cpp <(src_loc)/boxes/change_phone_box.h -<(src_loc)/boxes/confirmbox.cpp -<(src_loc)/boxes/confirmbox.h -<(src_loc)/boxes/confirmphonebox.cpp -<(src_loc)/boxes/confirmphonebox.h -<(src_loc)/boxes/connectionbox.cpp -<(src_loc)/boxes/connectionbox.h -<(src_loc)/boxes/contactsbox.cpp -<(src_loc)/boxes/contactsbox.h -<(src_loc)/boxes/downloadpathbox.cpp -<(src_loc)/boxes/downloadpathbox.h -<(src_loc)/boxes/editcolorbox.cpp -<(src_loc)/boxes/editcolorbox.h +<(src_loc)/boxes/confirm_box.cpp +<(src_loc)/boxes/confirm_box.h +<(src_loc)/boxes/confirm_phone_box.cpp +<(src_loc)/boxes/confirm_phone_box.h +<(src_loc)/boxes/connection_box.cpp +<(src_loc)/boxes/connection_box.h +<(src_loc)/boxes/contacts_box.cpp +<(src_loc)/boxes/contacts_box.h +<(src_loc)/boxes/download_path_box.cpp +<(src_loc)/boxes/download_path_box.h +<(src_loc)/boxes/edit_color_box.cpp +<(src_loc)/boxes/edit_color_box.h <(src_loc)/boxes/edit_privacy_box.cpp <(src_loc)/boxes/edit_privacy_box.h -<(src_loc)/boxes/emojibox.cpp -<(src_loc)/boxes/emojibox.h -<(src_loc)/boxes/languagebox.cpp -<(src_loc)/boxes/languagebox.h -<(src_loc)/boxes/localstoragebox.cpp -<(src_loc)/boxes/localstoragebox.h +<(src_loc)/boxes/emoji_box.cpp +<(src_loc)/boxes/emoji_box.h +<(src_loc)/boxes/language_box.cpp +<(src_loc)/boxes/language_box.h +<(src_loc)/boxes/local_storage_box.cpp +<(src_loc)/boxes/local_storage_box.h <(src_loc)/boxes/members_box.cpp <(src_loc)/boxes/members_box.h <(src_loc)/boxes/notifications_box.cpp <(src_loc)/boxes/notifications_box.h <(src_loc)/boxes/peer_list_box.cpp <(src_loc)/boxes/peer_list_box.h -<(src_loc)/boxes/passcodebox.cpp -<(src_loc)/boxes/passcodebox.h -<(src_loc)/boxes/photocropbox.cpp -<(src_loc)/boxes/photocropbox.h +<(src_loc)/boxes/passcode_box.cpp +<(src_loc)/boxes/passcode_box.h +<(src_loc)/boxes/photo_crop_box.cpp +<(src_loc)/boxes/photo_crop_box.h <(src_loc)/boxes/report_box.cpp <(src_loc)/boxes/report_box.h <(src_loc)/boxes/self_destruction_box.cpp <(src_loc)/boxes/self_destruction_box.h <(src_loc)/boxes/send_files_box.cpp <(src_loc)/boxes/send_files_box.h -<(src_loc)/boxes/sessionsbox.cpp -<(src_loc)/boxes/sessionsbox.h -<(src_loc)/boxes/sharebox.cpp -<(src_loc)/boxes/sharebox.h -<(src_loc)/boxes/stickersetbox.cpp -<(src_loc)/boxes/stickersetbox.h +<(src_loc)/boxes/sessions_box.cpp +<(src_loc)/boxes/sessions_box.h +<(src_loc)/boxes/share_box.cpp +<(src_loc)/boxes/share_box.h +<(src_loc)/boxes/sticker_set_box.cpp +<(src_loc)/boxes/sticker_set_box.h <(src_loc)/boxes/stickers_box.cpp <(src_loc)/boxes/stickers_box.h -<(src_loc)/boxes/usernamebox.cpp -<(src_loc)/boxes/usernamebox.h -<(src_loc)/core/build_config.h +<(src_loc)/boxes/username_box.cpp +<(src_loc)/boxes/username_box.h +<(src_loc)/chat_helpers/emoji_panel.cpp +<(src_loc)/chat_helpers/emoji_panel.h +<(src_loc)/chat_helpers/emoji_list_widget.cpp +<(src_loc)/chat_helpers/emoji_list_widget.h +<(src_loc)/chat_helpers/field_autocomplete.cpp +<(src_loc)/chat_helpers/field_autocomplete.h +<(src_loc)/chat_helpers/gifs_list_widget.cpp +<(src_loc)/chat_helpers/gifs_list_widget.h +<(src_loc)/chat_helpers/stickers.cpp +<(src_loc)/chat_helpers/stickers.h +<(src_loc)/chat_helpers/stickers_list_widget.cpp +<(src_loc)/chat_helpers/stickers_list_widget.h <(src_loc)/core/basic_types.h <(src_loc)/core/click_handler.cpp <(src_loc)/core/click_handler.h @@ -66,29 +96,11 @@ <(src_loc)/core/click_handler_types.h <(src_loc)/core/file_utilities.cpp <(src_loc)/core/file_utilities.h -<(src_loc)/core/lambda.h -<(src_loc)/core/observer.cpp -<(src_loc)/core/observer.h -<(src_loc)/core/ordered_set.h -<(src_loc)/core/parse_helper.cpp -<(src_loc)/core/parse_helper.h -<(src_loc)/core/qthelp_regex.h -<(src_loc)/core/qthelp_url.cpp -<(src_loc)/core/qthelp_url.h -<(src_loc)/core/runtime_composer.cpp -<(src_loc)/core/runtime_composer.h <(src_loc)/core/single_timer.cpp <(src_loc)/core/single_timer.h -<(src_loc)/core/task_queue.h -<(src_loc)/core/task_queue.cpp -<(src_loc)/core/type_traits.h <(src_loc)/core/utils.cpp <(src_loc)/core/utils.h -<(src_loc)/core/variant.h <(src_loc)/core/version.h -<(src_loc)/core/virtual_method.h -<(src_loc)/core/weak_unique_ptr.h -<(src_loc)/core/zlib_help.h <(src_loc)/data/data_abstract_structure.cpp <(src_loc)/data/data_abstract_structure.h <(src_loc)/data/data_drafts.cpp @@ -102,8 +114,6 @@ <(src_loc)/dialogs/dialogs_list.h <(src_loc)/dialogs/dialogs_row.cpp <(src_loc)/dialogs/dialogs_row.h -<(src_loc)/history/field_autocomplete.cpp -<(src_loc)/history/field_autocomplete.h <(src_loc)/history/history_common.h <(src_loc)/history/history_drag_area.cpp <(src_loc)/history/history_drag_area.h @@ -331,16 +341,6 @@ <(src_loc)/settings/settings_scale_widget.h <(src_loc)/settings/settings_widget.cpp <(src_loc)/settings/settings_widget.h -<(src_loc)/stickers/emoji_panel.cpp -<(src_loc)/stickers/emoji_panel.h -<(src_loc)/stickers/emoji_list_widget.cpp -<(src_loc)/stickers/emoji_list_widget.h -<(src_loc)/stickers/gifs_list_widget.cpp -<(src_loc)/stickers/gifs_list_widget.h -<(src_loc)/stickers/stickers.cpp -<(src_loc)/stickers/stickers.h -<(src_loc)/stickers/stickers_list_widget.cpp -<(src_loc)/stickers/stickers_list_widget.h <(src_loc)/storage/file_download.cpp <(src_loc)/storage/file_download.h <(src_loc)/storage/file_upload.cpp