From 00a349656d04672a5592439e4cc82c8227aa3e25 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 27 Oct 2021 17:32:09 +0300 Subject: [PATCH] Unify td/telegram/include order. --- td/telegram/AudiosManager.cpp | 2 -- td/telegram/AudiosManager.h | 5 ++--- td/telegram/AuthManager.cpp | 3 --- td/telegram/AuthManager.hpp | 1 + td/telegram/BackgroundManager.cpp | 3 --- td/telegram/CallActor.cpp | 5 +---- td/telegram/CallManager.h | 1 - td/telegram/CallbackQueriesManager.h | 5 ++--- td/telegram/ClientActor.cpp | 2 -- td/telegram/ConfigManager.h | 1 - td/telegram/DialogId.h | 3 +-- td/telegram/DocumentsManager.h | 7 +++---- td/telegram/Game.cpp | 3 --- td/telegram/InlineQueriesManager.cpp | 10 +++------- td/telegram/LanguagePackManager.cpp | 4 ---- td/telegram/LanguagePackManager.h | 1 - td/telegram/Location.h | 3 +-- td/telegram/Log.cpp | 1 - td/telegram/MessagesManager.h | 5 ++--- td/telegram/PrivacyManager.cpp | 3 --- td/telegram/SecretChatActor.cpp | 6 ++---- td/telegram/SecureManager.h | 3 +-- td/telegram/SecureValue.cpp | 3 --- td/telegram/SecureValue.h | 5 ++--- td/telegram/TermsOfService.h | 5 ++--- td/telegram/UpdatesManager.cpp | 5 ++--- td/telegram/VideoNotesManager.h | 5 ++--- td/telegram/VideosManager.h | 5 ++--- td/telegram/VoiceNotesManager.h | 5 ++--- td/telegram/WebPagesManager.cpp | 3 +-- td/telegram/WebPagesManager.h | 5 ++--- td/telegram/files/FileDownloader.cpp | 2 -- td/telegram/files/FileDownloader.h | 3 +-- td/telegram/files/FileGenerateManager.cpp | 5 ++--- td/telegram/files/FileHashUploader.cpp | 3 +-- td/telegram/files/FileLocation.h | 3 +-- td/telegram/files/FileManager.cpp | 2 -- td/telegram/files/FileManager.h | 5 ++--- td/telegram/files/FileStats.cpp | 3 +-- td/telegram/files/FileUploader.cpp | 4 +--- td/telegram/net/ConnectionCreator.h | 3 +-- td/telegram/net/PublicRsaKeyWatchdog.h | 4 +--- td/telegram/net/Session.cpp | 3 +-- td/telegram/td_c_client.cpp | 1 - 44 files changed, 46 insertions(+), 113 deletions(-) diff --git a/td/telegram/AudiosManager.cpp b/td/telegram/AudiosManager.cpp index b9f13cee0..68b57098a 100644 --- a/td/telegram/AudiosManager.cpp +++ b/td/telegram/AudiosManager.cpp @@ -10,8 +10,6 @@ #include "td/telegram/files/FileManager.h" #include "td/telegram/secret_api.h" #include "td/telegram/Td.h" -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" #include "td/utils/logging.h" #include "td/utils/misc.h" diff --git a/td/telegram/AudiosManager.h b/td/telegram/AudiosManager.h index 84c34fa06..752132840 100644 --- a/td/telegram/AudiosManager.h +++ b/td/telegram/AudiosManager.h @@ -6,12 +6,11 @@ // #pragma once -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/files/FileId.h" #include "td/telegram/Photo.h" #include "td/telegram/SecretInputMedia.h" +#include "td/telegram/td_api.h" +#include "td/telegram/telegram_api.h" #include "td/utils/buffer.h" #include "td/utils/common.h" diff --git a/td/telegram/AuthManager.cpp b/td/telegram/AuthManager.cpp index e2a6f39e1..77b1ca269 100644 --- a/td/telegram/AuthManager.cpp +++ b/td/telegram/AuthManager.cpp @@ -6,9 +6,6 @@ // #include "td/telegram/AuthManager.h" -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/AuthManager.hpp" #include "td/telegram/ConfigManager.h" #include "td/telegram/ConfigShared.h" diff --git a/td/telegram/AuthManager.hpp b/td/telegram/AuthManager.hpp index cf0afc8f8..a531e68c5 100644 --- a/td/telegram/AuthManager.hpp +++ b/td/telegram/AuthManager.hpp @@ -7,6 +7,7 @@ #pragma once #include "td/telegram/AuthManager.h" + #include "td/telegram/logevent/LogEventHelper.h" #include "td/telegram/SendCodeHelper.hpp" #include "td/telegram/Version.h" diff --git a/td/telegram/BackgroundManager.cpp b/td/telegram/BackgroundManager.cpp index 1d1bf447a..b5e87c3a4 100644 --- a/td/telegram/BackgroundManager.cpp +++ b/td/telegram/BackgroundManager.cpp @@ -6,9 +6,6 @@ // #include "td/telegram/BackgroundManager.h" -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/AuthManager.h" #include "td/telegram/BackgroundType.hpp" #include "td/telegram/ConfigShared.h" diff --git a/td/telegram/CallActor.cpp b/td/telegram/CallActor.cpp index 225ac6605..d7e82d1a4 100644 --- a/td/telegram/CallActor.cpp +++ b/td/telegram/CallActor.cpp @@ -6,10 +6,6 @@ // #include "td/telegram/CallActor.h" -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" -#include "td/telegram/telegram_api.hpp" - #include "td/telegram/ConfigShared.h" #include "td/telegram/ContactsManager.h" #include "td/telegram/DhCache.h" @@ -20,6 +16,7 @@ #include "td/telegram/net/NetQueryDispatcher.h" #include "td/telegram/NotificationManager.h" #include "td/telegram/Td.h" +#include "td/telegram/telegram_api.hpp" #include "td/telegram/UpdatesManager.h" #include "td/utils/algorithm.h" diff --git a/td/telegram/CallManager.h b/td/telegram/CallManager.h index 85fb3f6b2..46b1a38bd 100644 --- a/td/telegram/CallManager.h +++ b/td/telegram/CallManager.h @@ -8,7 +8,6 @@ #include "td/telegram/CallActor.h" #include "td/telegram/CallId.h" - #include "td/telegram/td_api.h" #include "td/telegram/telegram_api.h" diff --git a/td/telegram/CallbackQueriesManager.h b/td/telegram/CallbackQueriesManager.h index 77a220883..6400b2070 100644 --- a/td/telegram/CallbackQueriesManager.h +++ b/td/telegram/CallbackQueriesManager.h @@ -6,12 +6,11 @@ // #pragma once -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/DialogId.h" #include "td/telegram/FullMessageId.h" #include "td/telegram/MessageId.h" +#include "td/telegram/td_api.h" +#include "td/telegram/telegram_api.h" #include "td/telegram/UserId.h" #include "td/actor/PromiseFuture.h" diff --git a/td/telegram/ClientActor.cpp b/td/telegram/ClientActor.cpp index a1b4a8d91..74740549d 100644 --- a/td/telegram/ClientActor.cpp +++ b/td/telegram/ClientActor.cpp @@ -6,8 +6,6 @@ // #include "td/telegram/ClientActor.h" -#include "td/telegram/td_api.h" - #include "td/telegram/net/NetQueryCounter.h" #include "td/telegram/net/NetQueryStats.h" #include "td/telegram/Td.h" diff --git a/td/telegram/ConfigManager.h b/td/telegram/ConfigManager.h index 6e868d415..ac4de3823 100644 --- a/td/telegram/ConfigManager.h +++ b/td/telegram/ConfigManager.h @@ -10,7 +10,6 @@ #include "td/telegram/net/DcOptions.h" #include "td/telegram/net/NetQuery.h" #include "td/telegram/SuggestedAction.h" - #include "td/telegram/td_api.h" #include "td/telegram/telegram_api.h" diff --git a/td/telegram/DialogId.h b/td/telegram/DialogId.h index 64f3cbfc5..afd593d08 100644 --- a/td/telegram/DialogId.h +++ b/td/telegram/DialogId.h @@ -6,11 +6,10 @@ // #pragma once -#include "td/telegram/telegram_api.h" - #include "td/telegram/ChannelId.h" #include "td/telegram/ChatId.h" #include "td/telegram/SecretChatId.h" +#include "td/telegram/telegram_api.h" #include "td/telegram/UserId.h" #include "td/utils/common.h" diff --git a/td/telegram/DocumentsManager.h b/td/telegram/DocumentsManager.h index 0b4ac96e1..7dfa01af7 100644 --- a/td/telegram/DocumentsManager.h +++ b/td/telegram/DocumentsManager.h @@ -6,16 +6,15 @@ // #pragma once -#include "td/telegram/secret_api.h" -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/DialogId.h" #include "td/telegram/Document.h" #include "td/telegram/EncryptedFile.h" #include "td/telegram/files/FileId.h" #include "td/telegram/Photo.h" +#include "td/telegram/secret_api.h" #include "td/telegram/SecretInputMedia.h" +#include "td/telegram/td_api.h" +#include "td/telegram/telegram_api.h" #include "td/utils/buffer.h" #include "td/utils/common.h" diff --git a/td/telegram/Game.cpp b/td/telegram/Game.cpp index ca3ce7469..84cff59c6 100644 --- a/td/telegram/Game.cpp +++ b/td/telegram/Game.cpp @@ -6,9 +6,6 @@ // #include "td/telegram/Game.h" -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/AnimationsManager.h" #include "td/telegram/ContactsManager.h" #include "td/telegram/Document.h" diff --git a/td/telegram/InlineQueriesManager.cpp b/td/telegram/InlineQueriesManager.cpp index f615bdc4e..905f2abcc 100644 --- a/td/telegram/InlineQueriesManager.cpp +++ b/td/telegram/InlineQueriesManager.cpp @@ -6,11 +6,6 @@ // #include "td/telegram/InlineQueriesManager.h" -#include "td/telegram/td_api.h" -#include "td/telegram/td_api.hpp" -#include "td/telegram/telegram_api.h" -#include "td/telegram/telegram_api.hpp" - #include "td/telegram/AccessRights.h" #include "td/telegram/AnimationsManager.h" #include "td/telegram/AudiosManager.h" @@ -30,19 +25,20 @@ #include "td/telegram/MessageEntity.h" #include "td/telegram/MessagesManager.h" #include "td/telegram/misc.h" +#include "td/telegram/net/DcId.h" #include "td/telegram/Payments.h" #include "td/telegram/Photo.h" #include "td/telegram/ReplyMarkup.h" #include "td/telegram/StickersManager.h" #include "td/telegram/Td.h" +#include "td/telegram/td_api.hpp" #include "td/telegram/TdDb.h" #include "td/telegram/TdParameters.h" +#include "td/telegram/telegram_api.hpp" #include "td/telegram/Venue.h" #include "td/telegram/VideosManager.h" #include "td/telegram/VoiceNotesManager.h" -#include "td/telegram/net/DcId.h" - #include "td/utils/algorithm.h" #include "td/utils/base64.h" #include "td/utils/buffer.h" diff --git a/td/telegram/LanguagePackManager.cpp b/td/telegram/LanguagePackManager.cpp index 32d3a66be..6c1ccdcad 100644 --- a/td/telegram/LanguagePackManager.cpp +++ b/td/telegram/LanguagePackManager.cpp @@ -12,11 +12,7 @@ #include "td/telegram/misc.h" #include "td/telegram/net/NetQueryDispatcher.h" #include "td/telegram/Td.h" - -#include "td/telegram/misc.h" -#include "td/telegram/td_api.h" #include "td/telegram/td_api.hpp" -#include "td/telegram/telegram_api.h" #include "td/db/DbKey.h" #include "td/db/SqliteDb.h" diff --git a/td/telegram/LanguagePackManager.h b/td/telegram/LanguagePackManager.h index 9fb45e49d..a6ca0927d 100644 --- a/td/telegram/LanguagePackManager.h +++ b/td/telegram/LanguagePackManager.h @@ -7,7 +7,6 @@ #pragma once #include "td/telegram/net/NetQuery.h" - #include "td/telegram/td_api.h" #include "td/telegram/telegram_api.h" diff --git a/td/telegram/Location.h b/td/telegram/Location.h index 04432130b..6f27d7e68 100644 --- a/td/telegram/Location.h +++ b/td/telegram/Location.h @@ -7,9 +7,8 @@ #pragma once #include "td/telegram/Global.h" -#include "td/telegram/SecretInputMedia.h" - #include "td/telegram/secret_api.h" +#include "td/telegram/SecretInputMedia.h" #include "td/telegram/td_api.h" #include "td/telegram/telegram_api.h" diff --git a/td/telegram/Log.cpp b/td/telegram/Log.cpp index 884ca5661..366fec9de 100644 --- a/td/telegram/Log.cpp +++ b/td/telegram/Log.cpp @@ -8,7 +8,6 @@ #include "td/telegram/Client.h" #include "td/telegram/Logging.h" - #include "td/telegram/td_api.h" #include "td/utils/common.h" diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h index c81f16405..3ce4089d7 100644 --- a/td/telegram/MessagesManager.h +++ b/td/telegram/MessagesManager.h @@ -48,14 +48,13 @@ #include "td/telegram/ReportReason.h" #include "td/telegram/RestrictionReason.h" #include "td/telegram/ScheduledServerMessageId.h" +#include "td/telegram/secret_api.h" #include "td/telegram/SecretChatId.h" #include "td/telegram/SecretInputMedia.h" #include "td/telegram/ServerMessageId.h" -#include "td/telegram/UserId.h" - -#include "td/telegram/secret_api.h" #include "td/telegram/td_api.h" #include "td/telegram/telegram_api.h" +#include "td/telegram/UserId.h" #include "td/actor/actor.h" #include "td/actor/MultiPromise.h" diff --git a/td/telegram/PrivacyManager.cpp b/td/telegram/PrivacyManager.cpp index 60c426c15..6355fba9d 100644 --- a/td/telegram/PrivacyManager.cpp +++ b/td/telegram/PrivacyManager.cpp @@ -6,9 +6,6 @@ // #include "td/telegram/PrivacyManager.h" -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/ChannelId.h" #include "td/telegram/ChatId.h" #include "td/telegram/ContactsManager.h" diff --git a/td/telegram/SecretChatActor.cpp b/td/telegram/SecretChatActor.cpp index adc4d6058..3f89aab37 100644 --- a/td/telegram/SecretChatActor.cpp +++ b/td/telegram/SecretChatActor.cpp @@ -8,12 +8,10 @@ #include "td/telegram/net/DcId.h" #include "td/telegram/net/NetQueryCreator.h" -#include "td/telegram/SecretChatId.h" -#include "td/telegram/ServerMessageId.h" -#include "td/telegram/UniqueId.h" - #include "td/telegram/secret_api.hpp" +#include "td/telegram/ServerMessageId.h" #include "td/telegram/telegram_api.hpp" +#include "td/telegram/UniqueId.h" #include "td/mtproto/PacketInfo.h" #include "td/mtproto/PacketStorer.h" diff --git a/td/telegram/SecureManager.h b/td/telegram/SecureManager.h index b26766fd9..4919cfcec 100644 --- a/td/telegram/SecureManager.h +++ b/td/telegram/SecureManager.h @@ -9,10 +9,9 @@ #include "td/telegram/net/NetQuery.h" #include "td/telegram/SecureStorage.h" #include "td/telegram/SecureValue.h" -#include "td/telegram/UserId.h" - #include "td/telegram/td_api.h" #include "td/telegram/telegram_api.h" +#include "td/telegram/UserId.h" #include "td/actor/actor.h" #include "td/actor/PromiseFuture.h" diff --git a/td/telegram/SecureValue.cpp b/td/telegram/SecureValue.cpp index ccc09867f..9cc8cc0b3 100644 --- a/td/telegram/SecureValue.cpp +++ b/td/telegram/SecureValue.cpp @@ -15,9 +15,6 @@ #include "td/telegram/misc.h" #include "td/telegram/net/DcId.h" #include "td/telegram/Payments.h" - -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" #include "td/telegram/telegram_api.hpp" #include "td/utils/algorithm.h" diff --git a/td/telegram/SecureValue.h b/td/telegram/SecureValue.h index ba8b38861..e177609e6 100644 --- a/td/telegram/SecureValue.h +++ b/td/telegram/SecureValue.h @@ -6,11 +6,10 @@ // #pragma once -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/files/FileId.h" #include "td/telegram/SecureStorage.h" +#include "td/telegram/td_api.h" +#include "td/telegram/telegram_api.h" #include "td/utils/common.h" #include "td/utils/optional.h" diff --git a/td/telegram/TermsOfService.h b/td/telegram/TermsOfService.h index 344c57e0a..07dff58e2 100644 --- a/td/telegram/TermsOfService.h +++ b/td/telegram/TermsOfService.h @@ -6,11 +6,10 @@ // #pragma once -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/MessageEntity.h" #include "td/telegram/MessageEntity.hpp" +#include "td/telegram/td_api.h" +#include "td/telegram/telegram_api.h" #include "td/actor/PromiseFuture.h" diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp index 31dbf68f0..f403ee835 100644 --- a/td/telegram/UpdatesManager.cpp +++ b/td/telegram/UpdatesManager.cpp @@ -6,9 +6,6 @@ // #include "td/telegram/UpdatesManager.h" -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.hpp" - #include "td/telegram/AnimationsManager.h" #include "td/telegram/AuthManager.h" #include "td/telegram/CallbackQueriesManager.h" @@ -46,7 +43,9 @@ #include "td/telegram/StickerSetId.h" #include "td/telegram/StickersManager.h" #include "td/telegram/Td.h" +#include "td/telegram/td_api.h" #include "td/telegram/TdDb.h" +#include "td/telegram/telegram_api.hpp" #include "td/telegram/ThemeManager.h" #include "td/telegram/WebPagesManager.h" diff --git a/td/telegram/VideoNotesManager.h b/td/telegram/VideoNotesManager.h index 5e1356e29..82bd2dac5 100644 --- a/td/telegram/VideoNotesManager.h +++ b/td/telegram/VideoNotesManager.h @@ -6,12 +6,11 @@ // #pragma once -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/files/FileId.h" #include "td/telegram/Photo.h" #include "td/telegram/SecretInputMedia.h" +#include "td/telegram/td_api.h" +#include "td/telegram/telegram_api.h" #include "td/utils/buffer.h" #include "td/utils/common.h" diff --git a/td/telegram/VideosManager.h b/td/telegram/VideosManager.h index b47c20d6f..5476dd3e8 100644 --- a/td/telegram/VideosManager.h +++ b/td/telegram/VideosManager.h @@ -6,12 +6,11 @@ // #pragma once -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/files/FileId.h" #include "td/telegram/Photo.h" #include "td/telegram/SecretInputMedia.h" +#include "td/telegram/td_api.h" +#include "td/telegram/telegram_api.h" #include "td/utils/buffer.h" #include "td/utils/common.h" diff --git a/td/telegram/VoiceNotesManager.h b/td/telegram/VoiceNotesManager.h index 21a920d33..0e54999d4 100644 --- a/td/telegram/VoiceNotesManager.h +++ b/td/telegram/VoiceNotesManager.h @@ -6,11 +6,10 @@ // #pragma once -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/files/FileId.h" #include "td/telegram/SecretInputMedia.h" +#include "td/telegram/td_api.h" +#include "td/telegram/telegram_api.h" #include "td/utils/common.h" diff --git a/td/telegram/WebPagesManager.cpp b/td/telegram/WebPagesManager.cpp index 90c8c453d..74ff295f4 100644 --- a/td/telegram/WebPagesManager.cpp +++ b/td/telegram/WebPagesManager.cpp @@ -6,8 +6,6 @@ // #include "td/telegram/WebPagesManager.h" -#include "td/telegram/secret_api.h" - #include "td/telegram/AnimationsManager.h" #include "td/telegram/AudiosManager.h" #include "td/telegram/AuthManager.h" @@ -23,6 +21,7 @@ #include "td/telegram/MessageEntity.h" #include "td/telegram/MessagesManager.h" #include "td/telegram/Photo.h" +#include "td/telegram/secret_api.h" #include "td/telegram/StickersManager.h" #include "td/telegram/Td.h" #include "td/telegram/TdDb.h" diff --git a/td/telegram/WebPagesManager.h b/td/telegram/WebPagesManager.h index bcfaea52f..0a1a8c902 100644 --- a/td/telegram/WebPagesManager.h +++ b/td/telegram/WebPagesManager.h @@ -6,14 +6,13 @@ // #pragma once -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/DialogId.h" #include "td/telegram/files/FileId.h" #include "td/telegram/files/FileSourceId.h" #include "td/telegram/FullMessageId.h" #include "td/telegram/SecretInputMedia.h" +#include "td/telegram/td_api.h" +#include "td/telegram/telegram_api.h" #include "td/telegram/WebPageId.h" #include "td/actor/actor.h" diff --git a/td/telegram/files/FileDownloader.cpp b/td/telegram/files/FileDownloader.cpp index 41e8ee766..ea0622056 100644 --- a/td/telegram/files/FileDownloader.cpp +++ b/td/telegram/files/FileDownloader.cpp @@ -6,8 +6,6 @@ // #include "td/telegram/files/FileDownloader.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/FileReferenceManager.h" #include "td/telegram/files/FileLoaderUtils.h" #include "td/telegram/files/FileType.h" diff --git a/td/telegram/files/FileDownloader.h b/td/telegram/files/FileDownloader.h index cb3f215e3..a38706ba0 100644 --- a/td/telegram/files/FileDownloader.h +++ b/td/telegram/files/FileDownloader.h @@ -6,13 +6,12 @@ // #pragma once -#include "td/telegram/telegram_api.h" - #include "td/telegram/files/FileEncryptionKey.h" #include "td/telegram/files/FileLoader.h" #include "td/telegram/files/FileLocation.h" #include "td/telegram/net/DcId.h" #include "td/telegram/net/NetQuery.h" +#include "td/telegram/telegram_api.h" #include "td/utils/common.h" #include "td/utils/port/FileFd.h" diff --git a/td/telegram/files/FileGenerateManager.cpp b/td/telegram/files/FileGenerateManager.cpp index 9845f0706..2d11c86a6 100644 --- a/td/telegram/files/FileGenerateManager.cpp +++ b/td/telegram/files/FileGenerateManager.cpp @@ -6,9 +6,6 @@ // #include "td/telegram/files/FileGenerateManager.h" -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/files/FileId.h" #include "td/telegram/files/FileLoaderUtils.h" #include "td/telegram/files/FileManager.h" @@ -17,6 +14,8 @@ #include "td/telegram/net/NetQuery.h" #include "td/telegram/net/NetQueryDispatcher.h" #include "td/telegram/Td.h" +#include "td/telegram/td_api.h" +#include "td/telegram/telegram_api.h" #include "td/utils/common.h" #include "td/utils/format.h" diff --git a/td/telegram/files/FileHashUploader.cpp b/td/telegram/files/FileHashUploader.cpp index 797f12160..86cdf3d98 100644 --- a/td/telegram/files/FileHashUploader.cpp +++ b/td/telegram/files/FileHashUploader.cpp @@ -6,12 +6,11 @@ // #include "td/telegram/files/FileHashUploader.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/files/FileType.h" #include "td/telegram/Global.h" #include "td/telegram/net/DcId.h" #include "td/telegram/net/NetQueryDispatcher.h" +#include "td/telegram/telegram_api.h" #include "td/utils/buffer.h" #include "td/utils/common.h" diff --git a/td/telegram/files/FileLocation.h b/td/telegram/files/FileLocation.h index b3fdd6737..9e4b9436f 100644 --- a/td/telegram/files/FileLocation.h +++ b/td/telegram/files/FileLocation.h @@ -6,12 +6,11 @@ // #pragma once -#include "td/telegram/telegram_api.h" - #include "td/telegram/files/FileBitmask.h" #include "td/telegram/files/FileType.h" #include "td/telegram/net/DcId.h" #include "td/telegram/PhotoSizeSource.h" +#include "td/telegram/telegram_api.h" #include "td/utils/base64.h" #include "td/utils/buffer.h" diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp index a2c461f99..bde54aa4d 100644 --- a/td/telegram/files/FileManager.cpp +++ b/td/telegram/files/FileManager.cpp @@ -6,8 +6,6 @@ // #include "td/telegram/files/FileManager.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/ConfigShared.h" #include "td/telegram/FileReferenceManager.h" #include "td/telegram/files/FileData.h" diff --git a/td/telegram/files/FileManager.h b/td/telegram/files/FileManager.h index 752ed7700..a7d4e925b 100644 --- a/td/telegram/files/FileManager.h +++ b/td/telegram/files/FileManager.h @@ -6,9 +6,6 @@ // #pragma once -#include "td/telegram/td_api.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/DialogId.h" #include "td/telegram/files/FileDbId.h" #include "td/telegram/files/FileEncryptionKey.h" @@ -20,6 +17,8 @@ #include "td/telegram/files/FileType.h" #include "td/telegram/Location.h" #include "td/telegram/PhotoSizeSource.h" +#include "td/telegram/td_api.h" +#include "td/telegram/telegram_api.h" #include "td/actor/actor.h" #include "td/actor/PromiseFuture.h" diff --git a/td/telegram/files/FileStats.cpp b/td/telegram/files/FileStats.cpp index 52b9d4bf7..9bdc512bc 100644 --- a/td/telegram/files/FileStats.cpp +++ b/td/telegram/files/FileStats.cpp @@ -6,9 +6,8 @@ // #include "td/telegram/files/FileStats.h" -#include "td/telegram/td_api.h" - #include "td/telegram/files/FileLoaderUtils.h" +#include "td/telegram/td_api.h" #include "td/utils/algorithm.h" #include "td/utils/common.h" diff --git a/td/telegram/files/FileUploader.cpp b/td/telegram/files/FileUploader.cpp index e7429cb54..7899011f9 100644 --- a/td/telegram/files/FileUploader.cpp +++ b/td/telegram/files/FileUploader.cpp @@ -6,14 +6,12 @@ // #include "td/telegram/files/FileUploader.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/files/FileLoaderUtils.h" - #include "td/telegram/Global.h" #include "td/telegram/net/DcId.h" #include "td/telegram/net/NetQueryDispatcher.h" #include "td/telegram/SecureStorage.h" +#include "td/telegram/telegram_api.h" #include "td/utils/buffer.h" #include "td/utils/common.h" diff --git a/td/telegram/net/ConnectionCreator.h b/td/telegram/net/ConnectionCreator.h index ba6934ebe..520c0708a 100644 --- a/td/telegram/net/ConnectionCreator.h +++ b/td/telegram/net/ConnectionCreator.h @@ -6,13 +6,12 @@ // #pragma once -#include "td/telegram/td_api.h" - #include "td/telegram/net/DcId.h" #include "td/telegram/net/DcOptions.h" #include "td/telegram/net/DcOptionsSet.h" #include "td/telegram/net/NetQuery.h" #include "td/telegram/net/Proxy.h" +#include "td/telegram/td_api.h" #include "td/mtproto/AuthData.h" #include "td/mtproto/ConnectionManager.h" diff --git a/td/telegram/net/PublicRsaKeyWatchdog.h b/td/telegram/net/PublicRsaKeyWatchdog.h index 73e4e9f14..b74022e76 100644 --- a/td/telegram/net/PublicRsaKeyWatchdog.h +++ b/td/telegram/net/PublicRsaKeyWatchdog.h @@ -6,12 +6,10 @@ // #pragma once -#include "td/telegram/net/PublicRsaKeyShared.h" - #include "td/telegram/net/NetActor.h" #include "td/telegram/net/NetQueryCreator.h" #include "td/telegram/net/NetQueryDispatcher.h" - +#include "td/telegram/net/PublicRsaKeyShared.h" #include "td/telegram/telegram_api.h" #include "td/actor/actor.h" diff --git a/td/telegram/net/Session.cpp b/td/telegram/net/Session.cpp index c7289d869..979d39468 100644 --- a/td/telegram/net/Session.cpp +++ b/td/telegram/net/Session.cpp @@ -6,8 +6,6 @@ // #include "td/telegram/net/Session.h" -#include "td/telegram/telegram_api.h" - #include "td/telegram/ConfigShared.h" #include "td/telegram/DhCache.h" #include "td/telegram/Global.h" @@ -18,6 +16,7 @@ #include "td/telegram/net/NetQueryDispatcher.h" #include "td/telegram/net/NetType.h" #include "td/telegram/StateManager.h" +#include "td/telegram/telegram_api.h" #include "td/telegram/UniqueId.h" #include "td/mtproto/DhCallback.h" diff --git a/td/telegram/td_c_client.cpp b/td/telegram/td_c_client.cpp index a2670dc3f..05116778a 100644 --- a/td/telegram/td_c_client.cpp +++ b/td/telegram/td_c_client.cpp @@ -8,7 +8,6 @@ #include "td/telegram/Client.h" #include "td/telegram/Log.h" - #include "td/telegram/td_tdc_api_inner.h" #include