From 83720d87898e62e4e8ef98d2e410b931a9328562 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 4 Mar 2017 13:23:56 +0300 Subject: [PATCH] Finalizing file renaming. --- Telegram/SourceFiles/apiwrap.cpp | 2 +- Telegram/SourceFiles/app.cpp | 4 ++-- Telegram/SourceFiles/application.cpp | 4 ++-- Telegram/SourceFiles/autoupdater.cpp | 2 +- Telegram/SourceFiles/boxes/abstractbox.cpp | 2 +- Telegram/SourceFiles/boxes/autolockbox.cpp | 2 +- Telegram/SourceFiles/boxes/confirmbox.cpp | 2 +- Telegram/SourceFiles/boxes/connectionbox.cpp | 2 +- Telegram/SourceFiles/boxes/downloadpathbox.cpp | 4 ++-- Telegram/SourceFiles/boxes/languagebox.cpp | 2 +- Telegram/SourceFiles/boxes/localstoragebox.cpp | 2 +- Telegram/SourceFiles/boxes/notifications_box.cpp | 2 +- Telegram/SourceFiles/boxes/passcodebox.cpp | 2 +- Telegram/SourceFiles/boxes/photocropbox.cpp | 2 +- Telegram/SourceFiles/boxes/send_files_box.cpp | 2 +- Telegram/SourceFiles/boxes/send_files_box.h | 2 +- Telegram/SourceFiles/boxes/sessionsbox.cpp | 2 +- Telegram/SourceFiles/boxes/sharebox.cpp | 2 +- Telegram/SourceFiles/boxes/stickers_box.cpp | 2 +- Telegram/SourceFiles/boxes/stickersetbox.cpp | 2 +- Telegram/SourceFiles/core/click_handler_types.cpp | 4 ++-- Telegram/SourceFiles/core/file_utilities.cpp | 2 +- Telegram/SourceFiles/core/utils.cpp | 2 +- Telegram/SourceFiles/data/data_drafts.cpp | 2 +- Telegram/SourceFiles/dialogs/dialogs_layout.cpp | 2 +- Telegram/SourceFiles/dialogswidget.cpp | 2 +- Telegram/SourceFiles/history.cpp | 2 +- Telegram/SourceFiles/history/field_autocomplete.cpp | 2 +- Telegram/SourceFiles/history/history_drag_area.cpp | 2 +- Telegram/SourceFiles/history/history_item.cpp | 2 +- .../SourceFiles/history/history_location_manager.cpp | 2 +- Telegram/SourceFiles/history/history_media_types.cpp | 2 +- Telegram/SourceFiles/historywidget.cpp | 4 ++-- Telegram/SourceFiles/historywidget.h | 2 +- .../inline_bots/inline_bot_layout_internal.cpp | 2 +- .../SourceFiles/inline_bots/inline_bot_layout_item.cpp | 2 +- Telegram/SourceFiles/inline_bots/inline_bot_result.cpp | 2 +- .../SourceFiles/inline_bots/inline_bot_send_data.cpp | 2 +- Telegram/SourceFiles/intro/introwidget.cpp | 2 +- Telegram/SourceFiles/layout.cpp | 4 ++-- Telegram/SourceFiles/logs.cpp | 2 +- Telegram/SourceFiles/main.cpp | 5 ++--- Telegram/SourceFiles/mainwidget.cpp | 4 ++-- Telegram/SourceFiles/mainwidget.h | 2 +- Telegram/SourceFiles/mainwindow.cpp | 4 ++-- Telegram/SourceFiles/mainwindow.h | 2 +- Telegram/SourceFiles/messenger.cpp | 8 ++++---- Telegram/SourceFiles/mtproto/dcenter.cpp | 2 +- Telegram/SourceFiles/mtproto/facade.cpp | 2 +- Telegram/SourceFiles/mtproto/mtp_instance.cpp | 2 +- Telegram/SourceFiles/overview/overview_layout.cpp | 4 ++-- Telegram/SourceFiles/passcodewidget.cpp | 2 +- .../platform/linux/file_utilities_linux.cpp | 2 +- .../SourceFiles/platform/linux/main_window_linux.cpp | 2 +- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 4 ++-- Telegram/SourceFiles/platform/mac/main_window_mac.h | 2 +- Telegram/SourceFiles/platform/mac/main_window_mac.mm | 2 +- .../platform/mac/notifications_manager_mac.mm | 2 +- Telegram/SourceFiles/platform/mac/specific_mac.cpp | 4 ++-- Telegram/SourceFiles/platform/mac/specific_mac.h | 2 +- Telegram/SourceFiles/platform/mac/specific_mac_p.mm | 4 ++-- Telegram/SourceFiles/platform/platform_specific.h | 6 +++--- .../SourceFiles/platform/win/file_utilities_win.cpp | 2 +- Telegram/SourceFiles/platform/win/main_window_win.cpp | 2 +- Telegram/SourceFiles/platform/win/specific_win.cpp | 4 ++-- .../SourceFiles/profile/profile_userpic_button.cpp | 2 +- Telegram/SourceFiles/settings.cpp | 2 +- .../SourceFiles/settings/settings_advanced_widget.cpp | 2 +- .../settings/settings_background_widget.cpp | 2 +- .../settings/settings_chat_settings_widget.cpp | 2 +- .../SourceFiles/settings/settings_general_widget.cpp | 4 ++-- Telegram/SourceFiles/settings/settings_layer.cpp | 2 +- .../settings/settings_notifications_widget.cpp | 2 +- .../SourceFiles/settings/settings_privacy_widget.cpp | 2 +- .../SourceFiles/settings/settings_scale_widget.cpp | 2 +- Telegram/SourceFiles/settings/settings_widget.cpp | 2 +- Telegram/SourceFiles/shortcuts.cpp | 2 +- Telegram/SourceFiles/stickers/emoji_pan.cpp | 2 +- Telegram/SourceFiles/stickers/stickers.cpp | 2 +- Telegram/SourceFiles/storage/file_download.cpp | 4 ++-- Telegram/SourceFiles/storage/file_upload.cpp | 2 +- Telegram/SourceFiles/storage/file_upload.h | 2 +- Telegram/SourceFiles/storage/localimageloader.cpp | 2 +- Telegram/SourceFiles/storage/localstorage.cpp | 10 +++++----- Telegram/SourceFiles/storage/serialize_common.cpp | 2 +- Telegram/SourceFiles/storage/serialize_document.cpp | 4 ++-- Telegram/SourceFiles/structs.cpp | 4 ++-- Telegram/SourceFiles/ui/images.cpp | 4 ++-- Telegram/SourceFiles/ui/images.h | 2 +- Telegram/SourceFiles/ui/text/text.cpp | 2 +- Telegram/SourceFiles/ui/widgets/popup_menu.cpp | 2 +- Telegram/SourceFiles/window/main_window.cpp | 2 +- .../SourceFiles/window/notifications_utilities.cpp | 2 +- Telegram/SourceFiles/window/themes/window_theme.cpp | 2 +- .../SourceFiles/window/themes/window_theme_editor.cpp | 2 +- 95 files changed, 123 insertions(+), 124 deletions(-) diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 7d24ce4728..15a2a565c3 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "mainwidget.h" #include "historywidget.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "auth_session.h" #include "boxes/confirmbox.h" #include "window/themes/window_theme.h" diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index c1dcb741c4..e866e10b51 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -38,10 +38,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "inline_bots/inline_bot_layout_item.h" #include "messenger.h" #include "application.h" -#include "fileuploader.h" +#include "storage/file_upload.h" #include "mainwindow.h" #include "mainwidget.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "apiwrap.h" #include "numbers.h" #include "observer_peer.h" diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 0edd5f3817..2748e67646 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "application.h" -#include "pspecific.h" +#include "platform/platform_specific.h" #include "mainwidget.h" #include "mainwindow.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "autoupdater.h" #include "window/notifications_manager.h" #include "core/task_queue.h" diff --git a/Telegram/SourceFiles/autoupdater.cpp b/Telegram/SourceFiles/autoupdater.cpp index 9362c659ab..358bb6c1f2 100644 --- a/Telegram/SourceFiles/autoupdater.cpp +++ b/Telegram/SourceFiles/autoupdater.cpp @@ -33,7 +33,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #endif // else of Q_OS_WIN #include "application.h" -#include "pspecific.h" +#include "platform/platform_specific.h" #ifndef TDESKTOP_DISABLE_AUTOUPDATE diff --git a/Telegram/SourceFiles/boxes/abstractbox.cpp b/Telegram/SourceFiles/boxes/abstractbox.cpp index 31d70a62f3..9f59068f94 100644 --- a/Telegram/SourceFiles/boxes/abstractbox.cpp +++ b/Telegram/SourceFiles/boxes/abstractbox.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/abstractbox.h" #include "styles/style_boxes.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "lang.h" #include "ui/effects/widget_fade_wrap.h" #include "ui/widgets/buttons.h" diff --git a/Telegram/SourceFiles/boxes/autolockbox.cpp b/Telegram/SourceFiles/boxes/autolockbox.cpp index b2a2e099ce..be7b1c5584 100644 --- a/Telegram/SourceFiles/boxes/autolockbox.cpp +++ b/Telegram/SourceFiles/boxes/autolockbox.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/autolockbox.h" #include "lang.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "boxes/confirmbox.h" #include "mainwidget.h" #include "mainwindow.h" diff --git a/Telegram/SourceFiles/boxes/confirmbox.cpp b/Telegram/SourceFiles/boxes/confirmbox.cpp index 0a09593552..cbe0f5ea42 100644 --- a/Telegram/SourceFiles/boxes/confirmbox.cpp +++ b/Telegram/SourceFiles/boxes/confirmbox.cpp @@ -31,7 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/labels.h" #include "ui/toast/toast.h" #include "core/click_handler_types.h" -#include "localstorage.h" +#include "storage/localstorage.h" TextParseOptions _confirmBoxTextOptions = { TextParseLinks | TextParseMultiline | TextParseRichText, // flags diff --git a/Telegram/SourceFiles/boxes/connectionbox.cpp b/Telegram/SourceFiles/boxes/connectionbox.cpp index 279fab5910..bc86d62c2c 100644 --- a/Telegram/SourceFiles/boxes/connectionbox.cpp +++ b/Telegram/SourceFiles/boxes/connectionbox.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/connectionbox.h" #include "lang.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "mainwidget.h" #include "mainwindow.h" #include "ui/widgets/checkbox.h" diff --git a/Telegram/SourceFiles/boxes/downloadpathbox.cpp b/Telegram/SourceFiles/boxes/downloadpathbox.cpp index b75c3373a3..6aa99f5c0f 100644 --- a/Telegram/SourceFiles/boxes/downloadpathbox.cpp +++ b/Telegram/SourceFiles/boxes/downloadpathbox.cpp @@ -21,11 +21,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/downloadpathbox.h" #include "lang.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "core/file_utilities.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" -#include "pspecific.h" +#include "platform/platform_specific.h" #include "styles/style_boxes.h" DownloadPathBox::DownloadPathBox(QWidget *parent) diff --git a/Telegram/SourceFiles/boxes/languagebox.cpp b/Telegram/SourceFiles/boxes/languagebox.cpp index 27c520ed0c..54a0016e08 100644 --- a/Telegram/SourceFiles/boxes/languagebox.cpp +++ b/Telegram/SourceFiles/boxes/languagebox.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "boxes/confirmbox.h" #include "mainwidget.h" #include "mainwindow.h" diff --git a/Telegram/SourceFiles/boxes/localstoragebox.cpp b/Telegram/SourceFiles/boxes/localstoragebox.cpp index 77ffc1a4fd..b6af89009d 100644 --- a/Telegram/SourceFiles/boxes/localstoragebox.cpp +++ b/Telegram/SourceFiles/boxes/localstoragebox.cpp @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_boxes.h" #include "ui/widgets/buttons.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "lang.h" #include "mainwindow.h" diff --git a/Telegram/SourceFiles/boxes/notifications_box.cpp b/Telegram/SourceFiles/boxes/notifications_box.cpp index 8a3ad571bf..5328e230dc 100644 --- a/Telegram/SourceFiles/boxes/notifications_box.cpp +++ b/Telegram/SourceFiles/boxes/notifications_box.cpp @@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_dialogs.h" #include "styles/style_window.h" #include "mainwindow.h" -#include "localstorage.h" +#include "storage/localstorage.h" namespace { diff --git a/Telegram/SourceFiles/boxes/passcodebox.cpp b/Telegram/SourceFiles/boxes/passcodebox.cpp index 63afed9e46..0c026f3c40 100644 --- a/Telegram/SourceFiles/boxes/passcodebox.cpp +++ b/Telegram/SourceFiles/boxes/passcodebox.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "confirmbox.h" #include "mainwindow.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "styles/style_boxes.h" #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" diff --git a/Telegram/SourceFiles/boxes/photocropbox.cpp b/Telegram/SourceFiles/boxes/photocropbox.cpp index 43c09ff6b2..fb0b80fc42 100644 --- a/Telegram/SourceFiles/boxes/photocropbox.cpp +++ b/Telegram/SourceFiles/boxes/photocropbox.cpp @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "messenger.h" #include "mainwidget.h" #include "photocropbox.h" -#include "fileuploader.h" +#include "storage/file_upload.h" #include "ui/widgets/buttons.h" #include "styles/style_boxes.h" diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp index 708ddff8a7..9f57aff83a 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.cpp +++ b/Telegram/SourceFiles/boxes/send_files_box.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/send_files_box.h" #include "lang.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "mainwidget.h" #include "history/history_media_types.h" #include "core/file_utilities.h" diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h index b90c6bdd14..65d9e4831e 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.h +++ b/Telegram/SourceFiles/boxes/send_files_box.h @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "boxes/abstractbox.h" -#include "localimageloader.h" +#include "storage/localimageloader.h" namespace Ui { class Checkbox; diff --git a/Telegram/SourceFiles/boxes/sessionsbox.cpp b/Telegram/SourceFiles/boxes/sessionsbox.cpp index 69c01b8eab..af5dae3c13 100644 --- a/Telegram/SourceFiles/boxes/sessionsbox.cpp +++ b/Telegram/SourceFiles/boxes/sessionsbox.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/sessionsbox.h" #include "lang.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "mainwidget.h" #include "mainwindow.h" #include "countries.h" diff --git a/Telegram/SourceFiles/boxes/sharebox.cpp b/Telegram/SourceFiles/boxes/sharebox.cpp index c597b5f700..0525c114da 100644 --- a/Telegram/SourceFiles/boxes/sharebox.cpp +++ b/Telegram/SourceFiles/boxes/sharebox.cpp @@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "mainwidget.h" #include "core/qthelp_url.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "boxes/confirmbox.h" #include "apiwrap.h" #include "ui/toast/toast.h" diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp index 7ad33998a1..f91f55c79a 100644 --- a/Telegram/SourceFiles/boxes/stickers_box.cpp +++ b/Telegram/SourceFiles/boxes/stickers_box.cpp @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/confirmbox.h" #include "boxes/stickersetbox.h" #include "apiwrap.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "dialogs/dialogs_layout.h" #include "styles/style_boxes.h" #include "styles/style_stickers.h" diff --git a/Telegram/SourceFiles/boxes/stickersetbox.cpp b/Telegram/SourceFiles/boxes/stickersetbox.cpp index 3fee1f23e1..62986e0326 100644 --- a/Telegram/SourceFiles/boxes/stickersetbox.cpp +++ b/Telegram/SourceFiles/boxes/stickersetbox.cpp @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "stickers/stickers.h" #include "boxes/confirmbox.h" #include "apiwrap.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "dialogs/dialogs_layout.h" #include "styles/style_boxes.h" #include "styles/style_stickers.h" diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp index cdf3bbf5da..8aa6c749df 100644 --- a/Telegram/SourceFiles/core/click_handler_types.cpp +++ b/Telegram/SourceFiles/core/click_handler_types.cpp @@ -21,11 +21,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/click_handler_types.h" #include "lang.h" -#include "pspecific.h" +#include "platform/platform_specific.h" #include "boxes/confirmbox.h" #include "core/qthelp_regex.h" #include "core/qthelp_url.h" -#include "localstorage.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 1c6f2588ce..c3d9360f18 100644 --- a/Telegram/SourceFiles/core/file_utilities.cpp +++ b/Telegram/SourceFiles/core/file_utilities.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/file_utilities.h" #include "mainwindow.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "platform/platform_file_utilities.h" #include "core/task_queue.h" diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp index b6d7f26347..3869cb97a7 100644 --- a/Telegram/SourceFiles/core/utils.cpp +++ b/Telegram/SourceFiles/core/utils.cpp @@ -34,7 +34,7 @@ extern "C" { } #include "application.h" -#include "pspecific.h" +#include "platform/platform_specific.h" uint64 _SharedMemoryLocation[4] = { 0x00, 0x01, 0x02, 0x03 }; diff --git a/Telegram/SourceFiles/data/data_drafts.cpp b/Telegram/SourceFiles/data/data_drafts.cpp index debd1192ce..919ac6eecb 100644 --- a/Telegram/SourceFiles/data/data_drafts.cpp +++ b/Telegram/SourceFiles/data/data_drafts.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/input_fields.h" #include "historywidget.h" #include "mainwidget.h" -#include "localstorage.h" +#include "storage/localstorage.h" namespace Data { namespace { diff --git a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp index 5d45e66ec7..ea22ca44f5 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "data/data_drafts.h" #include "dialogs/dialogs_list.h" #include "styles/style_dialogs.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "lang.h" namespace Dialogs { diff --git a/Telegram/SourceFiles/dialogswidget.cpp b/Telegram/SourceFiles/dialogswidget.cpp index 4cf68528b7..83615bd040 100644 --- a/Telegram/SourceFiles/dialogswidget.cpp +++ b/Telegram/SourceFiles/dialogswidget.cpp @@ -37,7 +37,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/contactsbox.h" #include "boxes/confirmbox.h" #include "boxes/aboutbox.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "apiwrap.h" #include "ui/widgets/dropdown_menu.h" #include "ui/widgets/input_fields.h" diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index d293e64e9d..c28f6fd211 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "apiwrap.h" #include "mainwidget.h" #include "mainwindow.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "window/top_bar_widget.h" #include "observer_peer.h" #include "auth_session.h" diff --git a/Telegram/SourceFiles/history/field_autocomplete.cpp b/Telegram/SourceFiles/history/field_autocomplete.cpp index 57468cb6c2..6582a990b2 100644 --- a/Telegram/SourceFiles/history/field_autocomplete.cpp +++ b/Telegram/SourceFiles/history/field_autocomplete.cpp @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "apiwrap.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "ui/widgets/scroll_area.h" #include "styles/style_history.h" #include "styles/style_widgets.h" diff --git a/Telegram/SourceFiles/history/history_drag_area.cpp b/Telegram/SourceFiles/history/history_drag_area.cpp index 8d858e7eb5..f630763622 100644 --- a/Telegram/SourceFiles/history/history_drag_area.cpp +++ b/Telegram/SourceFiles/history/history_drag_area.cpp @@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "inline_bots/inline_bot_layout_item.h" #include "dialogs/dialogs_layout.h" #include "historywidget.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "lang.h" #include "mainwindow.h" #include "apiwrap.h" diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index 0ed05d925c..98a48d9062 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_dialogs.h" #include "styles/style_history.h" #include "ui/effects/ripple_animation.h" -#include "fileuploader.h" +#include "storage/file_upload.h" #include "auth_session.h" namespace { diff --git a/Telegram/SourceFiles/history/history_location_manager.cpp b/Telegram/SourceFiles/history/history_location_manager.cpp index 057eff8e69..cf811714a3 100644 --- a/Telegram/SourceFiles/history/history_location_manager.cpp +++ b/Telegram/SourceFiles/history/history_location_manager.cpp @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwidget.h" #include "lang.h" -#include "pspecific.h" +#include "platform/platform_specific.h" namespace { diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp index 6679f49d6d..c7d1c5b7b8 100644 --- a/Telegram/SourceFiles/history/history_media_types.cpp +++ b/Telegram/SourceFiles/history/history_media_types.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "mainwidget.h" #include "mainwindow.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "media/media_audio.h" #include "media/media_clip_reader.h" #include "media/player/media_player_instance.h" diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 44d35f55d7..bd9acc29ac 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -49,10 +49,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "passcodewidget.h" #include "mainwindow.h" -#include "fileuploader.h" +#include "storage/file_upload.h" #include "media/media_audio.h" #include "media/media_audio_capture.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "apiwrap.h" #include "window/top_bar_widget.h" #include "window/themes/window_theme.h" diff --git a/Telegram/SourceFiles/historywidget.h b/Telegram/SourceFiles/historywidget.h index 93bdd6983e..2b6743942e 100644 --- a/Telegram/SourceFiles/historywidget.h +++ b/Telegram/SourceFiles/historywidget.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "localimageloader.h" +#include "storage/localimageloader.h" #include "ui/widgets/tooltip.h" #include "ui/widgets/input_fields.h" #include "ui/widgets/scroll_area.h" diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp index a08c52b433..90ebf7b843 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp @@ -29,7 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "media/media_clip_reader.h" #include "media/player/media_player_instance.h" #include "history/history_location_manager.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "mainwidget.h" #include "lang.h" diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp index 585a381aea..d1a003c9c7 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/click_handler_types.h" #include "inline_bots/inline_bot_result.h" #include "inline_bots/inline_bot_layout_internal.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "mainwidget.h" namespace InlineBots { diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp index 50eac4532a..692508c33b 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "inline_bots/inline_bot_layout_item.h" #include "inline_bots/inline_bot_send_data.h" -#include "mtproto/file_download.h" +#include "storage/file_download.h" #include "core/file_utilities.h" #include "mainwidget.h" diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp index 8b6b1ae59d..bb6d437bff 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "inline_bots/inline_bot_send_data.h" #include "inline_bots/inline_bot_result.h" -#include "localstorage.h" +#include "storage/localstorage.h" namespace InlineBots { namespace internal { diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp index 292f38d898..74b1e2559e 100644 --- a/Telegram/SourceFiles/intro/introwidget.cpp +++ b/Telegram/SourceFiles/intro/introwidget.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "intro/introwidget.h" #include "lang.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "langloaderplain.h" #include "intro/introstart.h" #include "intro/introphone.h" diff --git a/Telegram/SourceFiles/layout.cpp b/Telegram/SourceFiles/layout.cpp index b224615787..03776da174 100644 --- a/Telegram/SourceFiles/layout.cpp +++ b/Telegram/SourceFiles/layout.cpp @@ -23,13 +23,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "mainwidget.h" #include "application.h" -#include "fileuploader.h" +#include "storage/file_upload.h" #include "mainwindow.h" #include "core/file_utilities.h" #include "boxes/addcontactbox.h" #include "boxes/confirmbox.h" #include "media/media_audio.h" -#include "localstorage.h" +#include "storage/localstorage.h" TextParseOptions _textNameOptions = { 0, // flags diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index c1ac5e7c71..0efbba5bed 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include -#include "pspecific.h" +#include "platform/platform_specific.h" #include "mtproto/connection.h" #ifndef TDESKTOP_DISABLE_CRASH_REPORTS diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp index ac05c0cf1d..6cd942ecc5 100644 --- a/Telegram/SourceFiles/main.cpp +++ b/Telegram/SourceFiles/main.cpp @@ -19,9 +19,8 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "application.h" -#include "pspecific.h" - -#include "localstorage.h" +#include "platform/platform_specific.h" +#include "storage/localstorage.h" int main(int argc, char *argv[]) { #ifndef Q_OS_MAC // Retina display support is working fine, others are not. diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index e1e5b3a81c..ff7daaf38f 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -37,7 +37,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "overviewwidget.h" #include "lang.h" #include "boxes/addcontactbox.h" -#include "fileuploader.h" +#include "storage/file_upload.h" #include "messenger.h" #include "application.h" #include "mainwindow.h" @@ -48,7 +48,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/downloadpathbox.h" #include "boxes/confirmphonebox.h" #include "boxes/sharebox.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "shortcuts.h" #include "media/media_audio.h" #include "media/player/media_player_panel.h" diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index 1fffa02270..f95bf62f0b 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "localimageloader.h" +#include "storage/localimageloader.h" #include "history/history_common.h" #include "core/single_timer.h" diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index 417696482f..a5798ff27a 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -31,7 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "shortcuts.h" #include "messenger.h" #include "application.h" -#include "pspecific.h" +#include "platform/platform_specific.h" #include "passcodewidget.h" #include "intro/introwidget.h" #include "mainwidget.h" @@ -42,7 +42,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "observer_peer.h" #include "autoupdater.h" #include "mediaview.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "apiwrap.h" #include "settings/settings_widget.h" #include "platform/platform_notifications_manager.h" diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h index c68059665f..7d36a99c23 100644 --- a/Telegram/SourceFiles/mainwindow.h +++ b/Telegram/SourceFiles/mainwindow.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "pspecific.h" +#include "platform/platform_specific.h" #include "platform/platform_main_window.h" #include "core/single_timer.h" diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index d9f35c1ab9..b7ad0efa59 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -20,15 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "messenger.h" -#include "localstorage.h" -#include "pspecific.h" +#include "storage/localstorage.h" +#include "platform/platform_specific.h" #include "mainwindow.h" #include "application.h" #include "shortcuts.h" #include "auth_session.h" #include "langloaderplain.h" #include "observer_peer.h" -#include "fileuploader.h" +#include "storage/file_upload.h" #include "mainwidget.h" #include "mtproto/dc_options.h" #include "mtproto/mtp_instance.h" @@ -37,7 +37,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/themes/window_theme.h" #include "history/history_location_manager.h" #include "ui/widgets/tooltip.h" -#include "serialize/serialize_common.h" +#include "storage/serialize_common.h" namespace { diff --git a/Telegram/SourceFiles/mtproto/dcenter.cpp b/Telegram/SourceFiles/mtproto/dcenter.cpp index 4cbefb1ece..dfa91ddf51 100644 --- a/Telegram/SourceFiles/mtproto/dcenter.cpp +++ b/Telegram/SourceFiles/mtproto/dcenter.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/facade.h" #include "mtproto/dc_options.h" #include "mtproto/mtp_instance.h" -#include "localstorage.h" +#include "storage/localstorage.h" namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/facade.cpp b/Telegram/SourceFiles/mtproto/facade.cpp index 780659f463..98de185c72 100644 --- a/Telegram/SourceFiles/mtproto/facade.cpp +++ b/Telegram/SourceFiles/mtproto/facade.cpp @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "mtproto/facade.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "messenger.h" namespace MTP { diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.cpp b/Telegram/SourceFiles/mtproto/mtp_instance.cpp index bdf8868eba..37760afb87 100644 --- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp +++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/mtp_instance.h" #include "mtproto/dc_options.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "auth_session.h" #include "messenger.h" #include "mtproto/connection.h" diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp index ef2aed3db8..c65aff81d7 100644 --- a/Telegram/SourceFiles/overview/overview_layout.cpp +++ b/Telegram/SourceFiles/overview/overview_layout.cpp @@ -28,11 +28,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang.h" #include "mainwidget.h" #include "application.h" -#include "fileuploader.h" +#include "storage/file_upload.h" #include "mainwindow.h" #include "media/media_audio.h" #include "media/player/media_player_instance.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "history/history_media_types.h" #include "ui/effects/round_checkbox.h" diff --git a/Telegram/SourceFiles/passcodewidget.cpp b/Telegram/SourceFiles/passcodewidget.cpp index 598606ba1a..50d185018c 100644 --- a/Telegram/SourceFiles/passcodewidget.cpp +++ b/Telegram/SourceFiles/passcodewidget.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "passcodewidget.h" #include "lang.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "mainwindow.h" #include "messenger.h" #include "ui/text/text.h" diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp index a77d1db043..f23c78cd2c 100644 --- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/linux/linux_libs.h" #include "platform/linux/linux_gdk_helper.h" #include "mainwindow.h" -#include "localstorage.h" +#include "storage/localstorage.h" QStringList qt_make_filter_list(const QString &filter); diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp index 16fcd08290..7e380d289a 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "application.h" #include "lang.h" -#include "localstorage.h" +#include "storage/localstorage.h" namespace Platform { namespace { diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index a1b0348d1a..551b53865a 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -15,7 +15,7 @@ GNU General Public License for more details. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "pspecific.h" +#include "platform/linux/platform_specific_linux.h" #include "platform/linux/linux_libs.h" #include "lang.h" @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwidget.h" #include "mainwindow.h" #include "platform/linux/file_utilities_linux.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include #include diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h index 8cc2656899..064a85c9cd 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.h +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "platform/platform_main_window.h" -#include "pspecific_mac_p.h" +#include "platform/mac/specific_mac_p.h" namespace Platform { diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 977228028c..37fa98cdb0 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwidget.h" #include "application.h" #include "historywidget.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "window/notifications_manager_default.h" #include "platform/platform_notifications_manager.h" #include "boxes/contactsbox.h" diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm index b0744424a6..7b2fd9ca30 100644 --- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm +++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "platform/mac/notifications_manager_mac.h" -#include "pspecific.h" +#include "platform/platform_specific.h" #include "platform/mac/mac_utilities.h" #include "styles/style_window.h" diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.cpp b/Telegram/SourceFiles/platform/mac/specific_mac.cpp index acbadf45e2..45cd8763df 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac.cpp +++ b/Telegram/SourceFiles/platform/mac/specific_mac.cpp @@ -15,14 +15,14 @@ GNU General Public License for more details. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "pspecific.h" +#include "platform/mac/specific_mac.h" #include "lang.h" #include "application.h" #include "mainwidget.h" #include "historywidget.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "passcodewidget.h" #include "mainwindow.h" #include "history/history_location_manager.h" diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h index 79a051ac7d..3804c688c6 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac.h +++ b/Telegram/SourceFiles/platform/mac/specific_mac.h @@ -17,7 +17,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "pspecific_mac_p.h" +#include "platform/mac/specific_mac_p.h" inline QString psServerPrefix() { #ifndef OS_MAC_STORE diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm index 688e64a6cc..e176727e5e 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm @@ -15,12 +15,12 @@ GNU General Public License for more details. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "pspecific_mac_p.h" +#include "platform/mac/specific_mac_p.h" #include "mainwindow.h" #include "mainwidget.h" #include "messenger.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "media/player/media_player_instance.h" #include "media/media_audio.h" #include "platform/mac/mac_utilities.h" diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h index 46eacc00c1..fad961c4e1 100644 --- a/Telegram/SourceFiles/platform/platform_specific.h +++ b/Telegram/SourceFiles/platform/platform_specific.h @@ -21,11 +21,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #ifdef Q_OS_MAC -#include "pspecific_mac.h" +#include "platform/mac/specific_mac.h" #elif defined Q_OS_LINUX // Q_OS_MAC -#include "pspecific_linux.h" +#include "platform/linux/specific_linux.h" #elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX -#include "pspecific_win.h" +#include "platform/win/specific_win.h" #endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN namespace Platform { diff --git a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp index 04309e62cc..a8922e562f 100644 --- a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp +++ b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/win/file_utilities_win.h" #include "mainwindow.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "platform/win/windows_dlls.h" #include "lang.h" diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp index 905434ef6c..69a43d5b2b 100644 --- a/Telegram/SourceFiles/platform/win/main_window_win.cpp +++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp @@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "application.h" #include "lang.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "ui/widgets/popup_menu.h" #include "window/themes/window_theme.h" diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp index cd94ea8afc..c6c93f25fb 100644 --- a/Telegram/SourceFiles/platform/win/specific_win.cpp +++ b/Telegram/SourceFiles/platform/win/specific_win.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 "pspecific.h" +#include "platform/win/specific_win.h" #include "platform/win/main_window_win.h" #include "platform/win/notifications_manager_win.h" @@ -29,7 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "mainwidget.h" #include "history/history_location_manager.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "passcodewidget.h" #include "core/task_queue.h" diff --git a/Telegram/SourceFiles/profile/profile_userpic_button.cpp b/Telegram/SourceFiles/profile/profile_userpic_button.cpp index 5e9ee733ff..e046a0ac74 100644 --- a/Telegram/SourceFiles/profile/profile_userpic_button.cpp +++ b/Telegram/SourceFiles/profile/profile_userpic_button.cpp @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_profile.h" #include "observer_peer.h" -#include "mtproto/file_download.h" +#include "storage/file_download.h" namespace Profile { diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp index 0e0da91b6a..602c349064 100644 --- a/Telegram/SourceFiles/settings.cpp +++ b/Telegram/SourceFiles/settings.cpp @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "settings.h" -#include "pspecific.h" +#include "platform/platform_specific.h" #include "lang.h" bool gRtl = false; diff --git a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp index 18b61c3eef..83f90bd14d 100644 --- a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp @@ -29,7 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "ui/widgets/buttons.h" #include "ui/effects/widget_slide_wrap.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "window/themes/window_theme.h" namespace Settings { diff --git a/Telegram/SourceFiles/settings/settings_background_widget.cpp b/Telegram/SourceFiles/settings/settings_background_widget.cpp index 1f3876f521..75bb1e4585 100644 --- a/Telegram/SourceFiles/settings/settings_background_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_background_widget.cpp @@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/widget_slide_wrap.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "mainwindow.h" #include "window/themes/window_theme.h" #include "window/themes/window_theme_editor.h" diff --git a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp index fb657585ff..84dd4d5406 100644 --- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" #include "ui/widgets/labels.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "mainwidget.h" #include "mainwindow.h" #include "boxes/emojibox.h" diff --git a/Telegram/SourceFiles/settings/settings_general_widget.cpp b/Telegram/SourceFiles/settings/settings_general_widget.cpp index f7c792fe4d..a8055b4e9e 100644 --- a/Telegram/SourceFiles/settings/settings_general_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_general_widget.cpp @@ -25,8 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/widget_slide_wrap.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" -#include "localstorage.h" -#include "pspecific.h" +#include "storage/localstorage.h" +#include "platform/platform_specific.h" #include "mainwindow.h" #include "application.h" #include "boxes/languagebox.h" diff --git a/Telegram/SourceFiles/settings/settings_layer.cpp b/Telegram/SourceFiles/settings/settings_layer.cpp index 6488087fc9..0871076d7b 100644 --- a/Telegram/SourceFiles/settings/settings_layer.cpp +++ b/Telegram/SourceFiles/settings/settings_layer.cpp @@ -30,7 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/buttons.h" #include "mainwindow.h" #include "mainwidget.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "boxes/confirmbox.h" #include "application.h" #include "core/file_utilities.h" diff --git a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp b/Telegram/SourceFiles/settings/settings_notifications_widget.cpp index 89d794c5b8..20e97211fc 100644 --- a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_notifications_widget.cpp @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_settings.h" #include "lang.h" -#include "localstorage.h" +#include "storage/localstorage.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_privacy_widget.cpp b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp index fe02a659e0..80f3a803a0 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp @@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/sessionsbox.h" #include "boxes/passcodebox.h" #include "boxes/autolockbox.h" -#include "pspecific.h" +#include "platform/platform_specific.h" namespace Settings { diff --git a/Telegram/SourceFiles/settings/settings_scale_widget.cpp b/Telegram/SourceFiles/settings/settings_scale_widget.cpp index 9adbbeda60..b4975e6727 100644 --- a/Telegram/SourceFiles/settings/settings_scale_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_scale_widget.cpp @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_settings.h" #include "ui/widgets/checkbox.h" #include "lang.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "mainwindow.h" #include "boxes/confirmbox.h" #include "application.h" diff --git a/Telegram/SourceFiles/settings/settings_widget.cpp b/Telegram/SourceFiles/settings/settings_widget.cpp index 72d2a673db..34b80e569b 100644 --- a/Telegram/SourceFiles/settings/settings_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_widget.cpp @@ -30,7 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/buttons.h" #include "mainwindow.h" #include "mainwidget.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "boxes/confirmbox.h" #include "lang.h" #include "messenger.h" diff --git a/Telegram/SourceFiles/shortcuts.cpp b/Telegram/SourceFiles/shortcuts.cpp index 8c7ec3f15e..5d2ddcf2ed 100644 --- a/Telegram/SourceFiles/shortcuts.cpp +++ b/Telegram/SourceFiles/shortcuts.cpp @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "passcodewidget.h" #include "mainwidget.h" #include "media/player/media_player_instance.h" -#include "pspecific.h" +#include "platform/platform_specific.h" #include "core/parse_helper.h" namespace ShortcutCommands { diff --git a/Telegram/SourceFiles/stickers/emoji_pan.cpp b/Telegram/SourceFiles/stickers/emoji_pan.cpp index 5f87e7c92b..8e3d4b6f33 100644 --- a/Telegram/SourceFiles/stickers/emoji_pan.cpp +++ b/Telegram/SourceFiles/stickers/emoji_pan.cpp @@ -32,7 +32,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "dialogs/dialogs_layout.h" #include "stickers/stickers.h" #include "historywidget.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "lang.h" #include "mainwindow.h" #include "apiwrap.h" diff --git a/Telegram/SourceFiles/stickers/stickers.cpp b/Telegram/SourceFiles/stickers/stickers.cpp index 407e49dafc..bbabbce0a9 100644 --- a/Telegram/SourceFiles/stickers/stickers.cpp +++ b/Telegram/SourceFiles/stickers/stickers.cpp @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/confirmbox.h" #include "lang.h" #include "apiwrap.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "mainwidget.h" #include "mainwindow.h" #include "ui/toast/toast.h" diff --git a/Telegram/SourceFiles/storage/file_download.cpp b/Telegram/SourceFiles/storage/file_download.cpp index 42d9da5a08..11f9c4d0ff 100644 --- a/Telegram/SourceFiles/storage/file_download.cpp +++ b/Telegram/SourceFiles/storage/file_download.cpp @@ -18,12 +18,12 @@ 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 "mtproto/file_download.h" +#include "storage/file_download.h" #include "mainwidget.h" #include "mainwindow.h" #include "messenger.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "platform/platform_file_utilities.h" namespace { diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp index f23e9e2252..2bae6ea26f 100644 --- a/Telegram/SourceFiles/storage/file_upload.cpp +++ b/Telegram/SourceFiles/storage/file_upload.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 "fileuploader.h" +#include "storage/file_upload.h" FileUploader::FileUploader() : sentSize(0) { memset(sentSizes, 0, sizeof(sentSizes)); diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h index a8af4401a4..7ff4a30574 100644 --- a/Telegram/SourceFiles/storage/file_upload.h +++ b/Telegram/SourceFiles/storage/file_upload.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "localimageloader.h" +#include "storage/localimageloader.h" class FileUploader : public QObject, public RPCSender { Q_OBJECT diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp index f7661b4e26..5dd6a150ac 100644 --- a/Telegram/SourceFiles/storage/localimageloader.cpp +++ b/Telegram/SourceFiles/storage/localimageloader.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 "localimageloader.h" +#include "storage/localimageloader.h" #include "core/file_utilities.h" #include "media/media_audio.h" diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp index 386b61d248..054eb228ec 100644 --- a/Telegram/SourceFiles/storage/localstorage.cpp +++ b/Telegram/SourceFiles/storage/localstorage.cpp @@ -18,12 +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 "localstorage.h" +#include "storage/localstorage.h" -#include - -#include "serialize/serialize_document.h" -#include "serialize/serialize_common.h" +#include "storage/serialize_document.h" +#include "storage/serialize_common.h" #include "data/data_drafts.h" #include "window/themes/window_theme.h" #include "observer_peer.h" @@ -38,6 +36,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "apiwrap.h" #include "auth_session.h" +#include + namespace Local { namespace { diff --git a/Telegram/SourceFiles/storage/serialize_common.cpp b/Telegram/SourceFiles/storage/serialize_common.cpp index c0d012aeb9..0401953dfb 100644 --- a/Telegram/SourceFiles/storage/serialize_common.cpp +++ b/Telegram/SourceFiles/storage/serialize_common.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 "serialize/serialize_common.h" +#include "storage/serialize_common.h" namespace Serialize { diff --git a/Telegram/SourceFiles/storage/serialize_document.cpp b/Telegram/SourceFiles/storage/serialize_document.cpp index ba4f9abf1d..54de06d585 100644 --- a/Telegram/SourceFiles/storage/serialize_document.cpp +++ b/Telegram/SourceFiles/storage/serialize_document.cpp @@ -18,9 +18,9 @@ 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 "serialize/serialize_document.h" +#include "storage/serialize_document.h" -#include "serialize/serialize_common.h" +#include "storage/serialize_common.h" namespace { diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp index a34c58ed4c..f007faff08 100644 --- a/Telegram/SourceFiles/structs.cpp +++ b/Telegram/SourceFiles/structs.cpp @@ -25,13 +25,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "observer_peer.h" #include "mainwidget.h" #include "application.h" -#include "fileuploader.h" +#include "storage/file_upload.h" #include "mainwindow.h" #include "core/file_utilities.h" #include "apiwrap.h" #include "boxes/confirmbox.h" #include "media/media_audio.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "history/history_media_types.h" #include "styles/style_history.h" #include "window/themes/window_theme.h" diff --git a/Telegram/SourceFiles/ui/images.cpp b/Telegram/SourceFiles/ui/images.cpp index 529cc93dba..e43a27be1e 100644 --- a/Telegram/SourceFiles/ui/images.cpp +++ b/Telegram/SourceFiles/ui/images.cpp @@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/images.h" #include "mainwidget.h" -#include "localstorage.h" -#include "pspecific.h" +#include "storage/localstorage.h" +#include "platform/platform_specific.h" #include "messenger.h" namespace Images { diff --git a/Telegram/SourceFiles/ui/images.h b/Telegram/SourceFiles/ui/images.h index 99b198fece..85234b4040 100644 --- a/Telegram/SourceFiles/ui/images.h +++ b/Telegram/SourceFiles/ui/images.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "mtproto/file_download.h" +#include "storage/file_download.h" enum class ImageRoundRadius { None, diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp index fb2b84e2de..0188d70c26 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -25,7 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/click_handler_types.h" #include "ui/text/text_block.h" #include "lang.h" -#include "pspecific.h" +#include "platform/platform_specific.h" #include "boxes/confirmbox.h" #include "mainwindow.h" diff --git a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp index d797ae7970..24ccce5c5f 100644 --- a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp +++ b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp @@ -18,7 +18,7 @@ #include "ui/widgets/popup_menu.h" #include "ui/widgets/shadow.h" -#include "pspecific.h" +#include "platform/platform_specific.h" #include "application.h" #include "mainwindow.h" #include "lang.h" diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp index 23d86a97ff..dd9bc57b55 100644 --- a/Telegram/SourceFiles/window/main_window.cpp +++ b/Telegram/SourceFiles/window/main_window.cpp @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "window/main_window.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "styles/style_window.h" #include "platform/platform_window_title.h" #include "window/themes/window_theme.h" diff --git a/Telegram/SourceFiles/window/notifications_utilities.cpp b/Telegram/SourceFiles/window/notifications_utilities.cpp index 9953a9acaa..739efde86c 100644 --- a/Telegram/SourceFiles/window/notifications_utilities.cpp +++ b/Telegram/SourceFiles/window/notifications_utilities.cpp @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "window/notifications_utilities.h" -#include "pspecific.h" +#include "platform/platform_specific.h" #include "mainwindow.h" #include "styles/style_window.h" diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp index a27a291bbb..3aae3df571 100644 --- a/Telegram/SourceFiles/window/themes/window_theme.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme.cpp @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/themes/window_theme.h" #include "mainwidget.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "core/parse_helper.h" #include "core/zlib_help.h" #include "styles/style_widgets.h" diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp index 22cb58d192..c652707cdc 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/themes/window_theme.h" #include "window/themes/window_theme_editor_block.h" #include "mainwindow.h" -#include "localstorage.h" +#include "storage/localstorage.h" #include "boxes/confirmbox.h" #include "styles/style_window.h" #include "styles/style_settings.h"