diff --git a/Telegram/SourceFiles/pspecific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp similarity index 100% rename from Telegram/SourceFiles/pspecific_linux.cpp rename to Telegram/SourceFiles/platform/linux/specific_linux.cpp diff --git a/Telegram/SourceFiles/pspecific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h similarity index 100% rename from Telegram/SourceFiles/pspecific_linux.h rename to Telegram/SourceFiles/platform/linux/specific_linux.h diff --git a/Telegram/SourceFiles/pspecific_mac.cpp b/Telegram/SourceFiles/platform/mac/specific_mac.cpp similarity index 100% rename from Telegram/SourceFiles/pspecific_mac.cpp rename to Telegram/SourceFiles/platform/mac/specific_mac.cpp diff --git a/Telegram/SourceFiles/pspecific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h similarity index 100% rename from Telegram/SourceFiles/pspecific_mac.h rename to Telegram/SourceFiles/platform/mac/specific_mac.h diff --git a/Telegram/SourceFiles/pspecific_mac_p.h b/Telegram/SourceFiles/platform/mac/specific_mac_p.h similarity index 100% rename from Telegram/SourceFiles/pspecific_mac_p.h rename to Telegram/SourceFiles/platform/mac/specific_mac_p.h diff --git a/Telegram/SourceFiles/pspecific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm similarity index 100% rename from Telegram/SourceFiles/pspecific_mac_p.mm rename to Telegram/SourceFiles/platform/mac/specific_mac_p.mm diff --git a/Telegram/SourceFiles/pspecific.h b/Telegram/SourceFiles/platform/platform_specific.h similarity index 100% rename from Telegram/SourceFiles/pspecific.h rename to Telegram/SourceFiles/platform/platform_specific.h diff --git a/Telegram/SourceFiles/pspecific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp similarity index 100% rename from Telegram/SourceFiles/pspecific_win.cpp rename to Telegram/SourceFiles/platform/win/specific_win.cpp diff --git a/Telegram/SourceFiles/pspecific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h similarity index 100% rename from Telegram/SourceFiles/pspecific_win.h rename to Telegram/SourceFiles/platform/win/specific_win.h diff --git a/Telegram/SourceFiles/mtproto/file_download.cpp b/Telegram/SourceFiles/storage/file_download.cpp similarity index 100% rename from Telegram/SourceFiles/mtproto/file_download.cpp rename to Telegram/SourceFiles/storage/file_download.cpp diff --git a/Telegram/SourceFiles/mtproto/file_download.h b/Telegram/SourceFiles/storage/file_download.h similarity index 100% rename from Telegram/SourceFiles/mtproto/file_download.h rename to Telegram/SourceFiles/storage/file_download.h diff --git a/Telegram/SourceFiles/fileuploader.cpp b/Telegram/SourceFiles/storage/file_upload.cpp similarity index 100% rename from Telegram/SourceFiles/fileuploader.cpp rename to Telegram/SourceFiles/storage/file_upload.cpp diff --git a/Telegram/SourceFiles/fileuploader.h b/Telegram/SourceFiles/storage/file_upload.h similarity index 100% rename from Telegram/SourceFiles/fileuploader.h rename to Telegram/SourceFiles/storage/file_upload.h diff --git a/Telegram/SourceFiles/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp similarity index 100% rename from Telegram/SourceFiles/localimageloader.cpp rename to Telegram/SourceFiles/storage/localimageloader.cpp diff --git a/Telegram/SourceFiles/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h similarity index 100% rename from Telegram/SourceFiles/localimageloader.h rename to Telegram/SourceFiles/storage/localimageloader.h diff --git a/Telegram/SourceFiles/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp similarity index 100% rename from Telegram/SourceFiles/localstorage.cpp rename to Telegram/SourceFiles/storage/localstorage.cpp diff --git a/Telegram/SourceFiles/localstorage.h b/Telegram/SourceFiles/storage/localstorage.h similarity index 100% rename from Telegram/SourceFiles/localstorage.h rename to Telegram/SourceFiles/storage/localstorage.h diff --git a/Telegram/SourceFiles/serialize/serialize_common.cpp b/Telegram/SourceFiles/storage/serialize_common.cpp similarity index 100% rename from Telegram/SourceFiles/serialize/serialize_common.cpp rename to Telegram/SourceFiles/storage/serialize_common.cpp diff --git a/Telegram/SourceFiles/serialize/serialize_common.h b/Telegram/SourceFiles/storage/serialize_common.h similarity index 100% rename from Telegram/SourceFiles/serialize/serialize_common.h rename to Telegram/SourceFiles/storage/serialize_common.h diff --git a/Telegram/SourceFiles/serialize/serialize_document.cpp b/Telegram/SourceFiles/storage/serialize_document.cpp similarity index 100% rename from Telegram/SourceFiles/serialize/serialize_document.cpp rename to Telegram/SourceFiles/storage/serialize_document.cpp diff --git a/Telegram/SourceFiles/serialize/serialize_document.h b/Telegram/SourceFiles/storage/serialize_document.h similarity index 100% rename from Telegram/SourceFiles/serialize/serialize_document.h rename to Telegram/SourceFiles/storage/serialize_document.h diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp index 4d0f64f3b3..bd9bc5e2c8 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -99,66 +99,6 @@ 'sources': [ '<@(qrc_files)', '<@(style_files)', - '<(src_loc)/main.cpp', - '<(src_loc)/stdafx.cpp', - '<(src_loc)/stdafx.h', - '<(src_loc)/apiwrap.cpp', - '<(src_loc)/apiwrap.h', - '<(src_loc)/app.cpp', - '<(src_loc)/app.h', - '<(src_loc)/application.cpp', - '<(src_loc)/application.h', - '<(src_loc)/auth_session.cpp', - '<(src_loc)/auth_session.h', - '<(src_loc)/autoupdater.cpp', - '<(src_loc)/autoupdater.h', - '<(src_loc)/config.h', - '<(src_loc)/countries.h', - '<(src_loc)/dialogswidget.cpp', - '<(src_loc)/dialogswidget.h', - '<(src_loc)/facades.cpp', - '<(src_loc)/facades.h', - '<(src_loc)/fileuploader.cpp', - '<(src_loc)/fileuploader.h', - '<(src_loc)/history.cpp', - '<(src_loc)/history.h', - '<(src_loc)/historywidget.cpp', - '<(src_loc)/historywidget.h', - '<(src_loc)/lang.cpp', - '<(src_loc)/lang.h', - '<(src_loc)/langloaderplain.cpp', - '<(src_loc)/langloaderplain.h', - '<(src_loc)/layerwidget.cpp', - '<(src_loc)/layerwidget.h', - '<(src_loc)/layout.cpp', - '<(src_loc)/layout.h', - '<(src_loc)/mediaview.cpp', - '<(src_loc)/mediaview.h', - '<(src_loc)/observer_peer.cpp', - '<(src_loc)/observer_peer.h', - '<(src_loc)/overviewwidget.cpp', - '<(src_loc)/overviewwidget.h', - '<(src_loc)/passcodewidget.cpp', - '<(src_loc)/passcodewidget.h', - '<(src_loc)/localimageloader.cpp', - '<(src_loc)/localimageloader.h', - '<(src_loc)/localstorage.cpp', - '<(src_loc)/localstorage.h', - '<(src_loc)/logs.cpp', - '<(src_loc)/logs.h', - '<(src_loc)/messenger.cpp', - '<(src_loc)/messenger.h', - '<(src_loc)/mainwidget.cpp', - '<(src_loc)/mainwidget.h', - '<(src_loc)/settings.cpp', - '<(src_loc)/settings.h', - '<(src_loc)/shortcuts.cpp', - '<(src_loc)/shortcuts.h', - '<(src_loc)/structs.cpp', - '<(src_loc)/structs.h', - '<(src_loc)/mainwindow.cpp', - '<(src_loc)/mainwindow.h', - '<(src_loc)/qt_static_plugins.cpp', '<(src_loc)/boxes/aboutbox.cpp', '<(src_loc)/boxes/aboutbox.h', '<(src_loc)/boxes/abstractbox.cpp', @@ -347,8 +287,6 @@ '<(src_loc)/mtproto/dc_options.h', '<(src_loc)/mtproto/facade.cpp', '<(src_loc)/mtproto/facade.h', - '<(src_loc)/mtproto/file_download.cpp', - '<(src_loc)/mtproto/file_download.h', '<(src_loc)/mtproto/mtp_instance.cpp', '<(src_loc)/mtproto/mtp_instance.h', '<(src_loc)/mtproto/rsa_public_key.cpp', @@ -361,15 +299,6 @@ '<(src_loc)/mtproto/session.h', '<(src_loc)/overview/overview_layout.cpp', '<(src_loc)/overview/overview_layout.h', - '<(src_loc)/pspecific.h', - '<(src_loc)/pspecific_win.cpp', - '<(src_loc)/pspecific_win.h', - '<(src_loc)/pspecific_mac.cpp', - '<(src_loc)/pspecific_mac.h', - '<(src_loc)/pspecific_mac_p.mm', - '<(src_loc)/pspecific_mac_p.h', - '<(src_loc)/pspecific_linux.cpp', - '<(src_loc)/pspecific_linux.h', '<(src_loc)/platform/linux/linux_desktop_environment.cpp', '<(src_loc)/platform/linux/linux_desktop_environment.h', '<(src_loc)/platform/linux/linux_gdk_helper.cpp', @@ -384,6 +313,8 @@ '<(src_loc)/platform/linux/main_window_linux.h', '<(src_loc)/platform/linux/notifications_manager_linux.cpp', '<(src_loc)/platform/linux/notifications_manager_linux.h', + '<(src_loc)/platform/linux/specific_linux.cpp', + '<(src_loc)/platform/linux/specific_linux.h', '<(src_loc)/platform/mac/file_utilities_mac.mm', '<(src_loc)/platform/mac/file_utilities_mac.h', '<(src_loc)/platform/mac/mac_utilities.mm', @@ -392,6 +323,10 @@ '<(src_loc)/platform/mac/main_window_mac.h', '<(src_loc)/platform/mac/notifications_manager_mac.mm', '<(src_loc)/platform/mac/notifications_manager_mac.h', + '<(src_loc)/platform/mac/specific_mac.cpp', + '<(src_loc)/platform/mac/specific_mac.h', + '<(src_loc)/platform/mac/specific_mac_p.mm', + '<(src_loc)/platform/mac/specific_mac_p.h', '<(src_loc)/platform/mac/window_title_mac.mm', '<(src_loc)/platform/mac/window_title_mac.h', '<(src_loc)/platform/win/audio_win.cpp', @@ -402,6 +337,8 @@ '<(src_loc)/platform/win/main_window_win.h', '<(src_loc)/platform/win/notifications_manager_win.cpp', '<(src_loc)/platform/win/notifications_manager_win.h', + '<(src_loc)/platform/win/specific_win.cpp', + '<(src_loc)/platform/win/specific_win.h', '<(src_loc)/platform/win/window_title_win.cpp', '<(src_loc)/platform/win/window_title_win.h', '<(src_loc)/platform/win/windows_app_user_model_id.cpp', @@ -414,6 +351,7 @@ '<(src_loc)/platform/platform_file_utilities.h', '<(src_loc)/platform/platform_main_window.h', '<(src_loc)/platform/platform_notifications_manager.h', + '<(src_loc)/platform/platform_specific.h', '<(src_loc)/platform/platform_window_title.h', '<(src_loc)/profile/profile_back_button.cpp', '<(src_loc)/profile/profile_back_button.h', @@ -451,10 +389,6 @@ '<(src_loc)/profile/profile_userpic_button.h', '<(src_loc)/profile/profile_widget.cpp', '<(src_loc)/profile/profile_widget.h', - '<(src_loc)/serialize/serialize_common.cpp', - '<(src_loc)/serialize/serialize_common.h', - '<(src_loc)/serialize/serialize_document.cpp', - '<(src_loc)/serialize/serialize_document.h', '<(src_loc)/settings/settings_advanced_widget.cpp', '<(src_loc)/settings/settings_advanced_widget.h', '<(src_loc)/settings/settings_background_widget.cpp', @@ -487,6 +421,18 @@ '<(src_loc)/stickers/emoji_pan.h', '<(src_loc)/stickers/stickers.cpp', '<(src_loc)/stickers/stickers.h', + '<(src_loc)/storage/file_download.cpp', + '<(src_loc)/storage/file_download.h', + '<(src_loc)/storage/file_upload.cpp', + '<(src_loc)/storage/file_upload.h', + '<(src_loc)/storage/localimageloader.cpp', + '<(src_loc)/storage/localimageloader.h', + '<(src_loc)/storage/localstorage.cpp', + '<(src_loc)/storage/localstorage.h', + '<(src_loc)/storage/serialize_common.cpp', + '<(src_loc)/storage/serialize_common.h', + '<(src_loc)/storage/serialize_document.cpp', + '<(src_loc)/storage/serialize_document.h', '<(src_loc)/ui/buttons/history_down_button.cpp', '<(src_loc)/ui/buttons/history_down_button.h', '<(src_loc)/ui/buttons/peer_avatar_button.cpp', @@ -601,6 +547,60 @@ '<(src_loc)/window/themes/window_theme_warning.cpp', '<(src_loc)/window/themes/window_theme_warning.h', '<(src_loc)/window/window_title.h', + '<(src_loc)/apiwrap.cpp', + '<(src_loc)/apiwrap.h', + '<(src_loc)/app.cpp', + '<(src_loc)/app.h', + '<(src_loc)/application.cpp', + '<(src_loc)/application.h', + '<(src_loc)/auth_session.cpp', + '<(src_loc)/auth_session.h', + '<(src_loc)/autoupdater.cpp', + '<(src_loc)/autoupdater.h', + '<(src_loc)/config.h', + '<(src_loc)/countries.h', + '<(src_loc)/dialogswidget.cpp', + '<(src_loc)/dialogswidget.h', + '<(src_loc)/facades.cpp', + '<(src_loc)/facades.h', + '<(src_loc)/history.cpp', + '<(src_loc)/history.h', + '<(src_loc)/historywidget.cpp', + '<(src_loc)/historywidget.h', + '<(src_loc)/lang.cpp', + '<(src_loc)/lang.h', + '<(src_loc)/langloaderplain.cpp', + '<(src_loc)/langloaderplain.h', + '<(src_loc)/layerwidget.cpp', + '<(src_loc)/layerwidget.h', + '<(src_loc)/layout.cpp', + '<(src_loc)/layout.h', + '<(src_loc)/logs.cpp', + '<(src_loc)/logs.h', + '<(src_loc)/main.cpp', + '<(src_loc)/mainwidget.cpp', + '<(src_loc)/mainwidget.h', + '<(src_loc)/mainwindow.cpp', + '<(src_loc)/mainwindow.h', + '<(src_loc)/mediaview.cpp', + '<(src_loc)/mediaview.h', + '<(src_loc)/messenger.cpp', + '<(src_loc)/messenger.h', + '<(src_loc)/observer_peer.cpp', + '<(src_loc)/observer_peer.h', + '<(src_loc)/overviewwidget.cpp', + '<(src_loc)/overviewwidget.h', + '<(src_loc)/passcodewidget.cpp', + '<(src_loc)/passcodewidget.h', + '<(src_loc)/qt_static_plugins.cpp', + '<(src_loc)/settings.cpp', + '<(src_loc)/settings.h', + '<(src_loc)/shortcuts.cpp', + '<(src_loc)/shortcuts.h', + '<(src_loc)/stdafx.cpp', + '<(src_loc)/stdafx.h', + '<(src_loc)/structs.cpp', + '<(src_loc)/structs.h', '<(sp_media_key_tap_loc)/SPMediaKeyTap.m', '<(sp_media_key_tap_loc)/SPMediaKeyTap.h', @@ -618,8 +618,6 @@ }], [ '"<(build_linux)" != "1"', { 'sources!': [ - '<(src_loc)/pspecific_linux.cpp', - '<(src_loc)/pspecific_linux.h', '<(src_loc)/platform/linux/linux_desktop_environment.cpp', '<(src_loc)/platform/linux/linux_desktop_environment.h', '<(src_loc)/platform/linux/linux_gdk_helper.cpp', @@ -634,14 +632,12 @@ '<(src_loc)/platform/linux/main_window_linux.h', '<(src_loc)/platform/linux/notifications_manager_linux.cpp', '<(src_loc)/platform/linux/notifications_manager_linux.h', + '<(src_loc)/platform/linux/specific_linux.cpp', + '<(src_loc)/platform/linux/specific_linux.h', ], }], [ '"<(build_mac)" != "1"', { 'sources!': [ - '<(src_loc)/pspecific_mac.cpp', - '<(src_loc)/pspecific_mac.h', - '<(src_loc)/pspecific_mac_p.mm', - '<(src_loc)/pspecific_mac_p.h', '<(src_loc)/platform/mac/file_utilities_mac.mm', '<(src_loc)/platform/mac/file_utilities_mac.h', '<(src_loc)/platform/mac/mac_utilities.mm', @@ -650,6 +646,10 @@ '<(src_loc)/platform/mac/main_window_mac.h', '<(src_loc)/platform/mac/notifications_manager_mac.mm', '<(src_loc)/platform/mac/notifications_manager_mac.h', + '<(src_loc)/platform/mac/specific_mac.cpp', + '<(src_loc)/platform/mac/specific_mac.h', + '<(src_loc)/platform/mac/specific_mac_p.mm', + '<(src_loc)/platform/mac/specific_mac_p.h', '<(src_loc)/platform/mac/window_title_mac.mm', '<(src_loc)/platform/mac/window_title_mac.h', '<(sp_media_key_tap_loc)/SPMediaKeyTap.m', @@ -669,8 +669,6 @@ '<(minizip_loc)/unzip.h', ], 'sources!': [ - '<(src_loc)/pspecific_win.cpp', - '<(src_loc)/pspecific_win.h', '<(src_loc)/platform/win/audio_win.cpp', '<(src_loc)/platform/win/audio_win.h', '<(src_loc)/platform/win/file_utilities_win.cpp', @@ -679,6 +677,8 @@ '<(src_loc)/platform/win/main_window_win.h', '<(src_loc)/platform/win/notifications_manager_win.cpp', '<(src_loc)/platform/win/notifications_manager_win.h', + '<(src_loc)/platform/win/specific_win.cpp', + '<(src_loc)/platform/win/specific_win.h', '<(src_loc)/platform/win/window_title_win.cpp', '<(src_loc)/platform/win/window_title_win.h', '<(src_loc)/platform/win/windows_app_user_model_id.cpp',