Move some functions from misc.h to algorithm.h.

tdlib · Jan 1, 2021 · 82f0386 · 82f0386
1 parent 0951292
commit 82f0386
Show file tree

Hide file tree

Showing 60 changed files with 248 additions and 185 deletions.
diff --git a/td/mtproto/SessionConnection.cpp b/td/mtproto/SessionConnection.cpp
@@ -13,12 +13,12 @@
 #include "td/mtproto/Transport.h"
 #include "td/mtproto/utils.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/as.h"
 #include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/Gzip.h"
 #include "td/utils/logging.h"
-#include "td/utils/misc.h"
 #include "td/utils/Random.h"
 #include "td/utils/ScopeGuard.h"
 #include "td/utils/Time.h"

diff --git a/td/telegram/AnimationsManager.cpp b/td/telegram/AnimationsManager.cpp
@@ -29,6 +29,7 @@
 
 #include "td/db/SqliteKeyValueAsync.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/Random.h"

diff --git a/td/telegram/BackgroundManager.cpp b/td/telegram/BackgroundManager.cpp
@@ -27,6 +27,7 @@
 
 #include "td/db/SqliteKeyValueAsync.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/format.h"

diff --git a/td/telegram/CallActor.cpp b/td/telegram/CallActor.cpp
@@ -22,13 +22,13 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/UpdatesManager.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/as.h"
 #include "td/utils/bits.h"
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/crypto.h"
 #include "td/utils/logging.h"
-#include "td/utils/misc.h"
 #include "td/utils/Random.h"
 
 #include <tuple>

diff --git a/td/telegram/Client.cpp b/td/telegram/Client.cpp
@@ -12,6 +12,7 @@
 #include "td/actor/actor.h"
 #include "td/actor/ConcurrentScheduler.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/common.h"
 #include "td/utils/crypto.h"
 #include "td/utils/ExitGuard.h"

diff --git a/td/telegram/ConfigManager.cpp b/td/telegram/ConfigManager.cpp
@@ -39,6 +39,7 @@
 
 #include "td/actor/actor.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
@@ -47,6 +47,7 @@
 #include "td/db/SqliteKeyValue.h"
 #include "td/db/SqliteKeyValueAsync.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/buffer.h"
 #include "td/utils/format.h"

diff --git a/td/telegram/CountryInfoManager.cpp b/td/telegram/CountryInfoManager.cpp
@@ -11,6 +11,7 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/telegram_api.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/buffer.h"
 #include "td/utils/Gzip.h"

diff --git a/td/telegram/DialogFilter.cpp b/td/telegram/DialogFilter.cpp
@@ -9,9 +9,9 @@
 #include "td/telegram/DialogId.h"
 #include "td/telegram/misc.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
-#include "td/utils/misc.h"
 
 #include <unordered_set>
 

diff --git a/td/telegram/Document.cpp b/td/telegram/Document.cpp
@@ -14,7 +14,7 @@
 #include "td/telegram/VideoNotesManager.h"
 #include "td/telegram/VideosManager.h"
 
-#include "td/utils/misc.h"
+#include "td/utils/algorithm.h"
 
 namespace td {
 

diff --git a/td/telegram/FileReferenceManager.cpp b/td/telegram/FileReferenceManager.cpp
@@ -17,6 +17,7 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/WebPagesManager.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"

diff --git a/td/telegram/GroupCallManager.cpp b/td/telegram/GroupCallManager.cpp
@@ -18,6 +18,7 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/UpdatesManager.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
 #include "td/utils/JsonBuilder.h"
 #include "td/utils/logging.h"

diff --git a/td/telegram/InlineQueriesManager.cpp b/td/telegram/InlineQueriesManager.cpp
@@ -40,6 +40,7 @@
 
 #include "td/telegram/net/DcId.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/buffer.h"
 #include "td/utils/HttpUrl.h"

diff --git a/td/telegram/JsonValue.cpp b/td/telegram/JsonValue.cpp
@@ -8,6 +8,7 @@
 
 #include "td/telegram/misc.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/JsonBuilder.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"

diff --git a/td/telegram/LanguagePackManager.cpp b/td/telegram/LanguagePackManager.cpp
@@ -22,6 +22,7 @@
 #include "td/db/SqliteDb.h"
 #include "td/db/SqliteKeyValue.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/ExitGuard.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"

diff --git a/td/telegram/Logging.cpp b/td/telegram/Logging.cpp
@@ -29,6 +29,7 @@
 
 #include "td/actor/actor.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/ExitGuard.h"
 #include "td/utils/FileLog.h"
 #include "td/utils/logging.h"

diff --git a/td/telegram/MessageContent.cpp b/td/telegram/MessageContent.cpp
@@ -71,6 +71,7 @@
 #include "td/actor/MultiPromise.h"
 #include "td/actor/PromiseFuture.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/format.h"
 #include "td/utils/HttpUrl.h"
 #include "td/utils/logging.h"

diff --git a/td/telegram/MessageEntity.cpp b/td/telegram/MessageEntity.cpp
@@ -10,6 +10,7 @@
 #include "td/telegram/misc.h"
 #include "td/telegram/SecretChatActor.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"

diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp
@@ -10,6 +10,7 @@
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/ServerMessageId.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
@@ -61,6 +61,7 @@
 #include "td/db/SqliteKeyValue.h"
 #include "td/db/SqliteKeyValueAsync.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/format.h"
 #include "td/utils/misc.h"
 #include "td/utils/Random.h"

diff --git a/td/telegram/NotificationManager.cpp b/td/telegram/NotificationManager.cpp
@@ -41,6 +41,7 @@
 
 #include "td/actor/SleepActor.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/as.h"
 #include "td/utils/base64.h"
 #include "td/utils/buffer.h"

diff --git a/td/telegram/Payments.cpp b/td/telegram/Payments.cpp
@@ -16,12 +16,12 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/UpdatesManager.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/JsonBuilder.h"
 #include "td/utils/logging.h"
-#include "td/utils/misc.h"
 #include "td/utils/Status.h"
 
 namespace td {

diff --git a/td/telegram/Photo.cpp b/td/telegram/Photo.cpp
@@ -14,6 +14,7 @@
 #include "td/telegram/files/FileManager.h"
 #include "td/telegram/net/DcId.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/common.h"
 #include "td/utils/format.h"

diff --git a/td/telegram/PollManager.cpp b/td/telegram/PollManager.cpp
@@ -31,6 +31,7 @@
 #include "td/db/SqliteKeyValue.h"
 #include "td/db/SqliteKeyValueAsync.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"

diff --git a/td/telegram/PollManager.hpp b/td/telegram/PollManager.hpp
@@ -9,8 +9,8 @@
 #include "td/telegram/PollManager.h"
 #include "td/telegram/Version.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/common.h"
-#include "td/utils/misc.h"
 #include "td/utils/tl_helpers.h"
 
 namespace td {

diff --git a/td/telegram/PrivacyManager.cpp b/td/telegram/PrivacyManager.cpp
@@ -19,8 +19,8 @@
 #include "td/telegram/net/NetQueryDispatcher.h"
 #include "td/telegram/Td.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/logging.h"
-#include "td/utils/misc.h"
 
 #include <algorithm>
 #include <iterator>

diff --git a/td/telegram/RestrictionReason.cpp b/td/telegram/RestrictionReason.cpp
@@ -9,6 +9,7 @@
 #include "td/telegram/ConfigShared.h"
 #include "td/telegram/Global.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/common.h"
 #include "td/utils/misc.h"
 

diff --git a/td/telegram/SecureManager.cpp b/td/telegram/SecureManager.cpp
@@ -17,6 +17,7 @@
 #include "td/telegram/PasswordManager.h"
 #include "td/telegram/Td.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"

diff --git a/td/telegram/SecureValue.cpp b/td/telegram/SecureValue.cpp
@@ -20,6 +20,7 @@
 #include "td/telegram/telegram_api.h"
 #include "td/telegram/telegram_api.hpp"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/buffer.h"
 #include "td/utils/crypto.h"

diff --git a/td/telegram/SetWithPosition.h b/td/telegram/SetWithPosition.h
@@ -6,8 +6,8 @@
 //
 #pragma once
 
+#include "td/utils/algorithm.h"
 #include "td/utils/common.h"
-#include "td/utils/misc.h"
 
 #include <algorithm>
 #include <set>

diff --git a/td/telegram/StateManager.cpp b/td/telegram/StateManager.cpp
@@ -9,8 +9,8 @@
 #include "td/actor/PromiseFuture.h"
 #include "td/actor/SleepActor.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/logging.h"
-#include "td/utils/misc.h"
 #include "td/utils/Time.h"
 
 namespace td {

diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp
@@ -41,6 +41,7 @@
 #include "td/db/SqliteKeyValue.h"
 #include "td/db/SqliteKeyValueAsync.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"

diff --git a/td/telegram/StorageManager.cpp b/td/telegram/StorageManager.cpp
@@ -16,6 +16,7 @@
 
 #include "td/db/SqliteDb.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/port/Clocks.h"

diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
@@ -116,6 +116,7 @@
 #include "td/mtproto/RSA.h"
 #include "td/mtproto/TransportType.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
 #include "td/utils/filesystem.h"
 #include "td/utils/format.h"

diff --git a/td/telegram/TopDialogManager.cpp b/td/telegram/TopDialogManager.cpp
@@ -20,6 +20,7 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/port/Clocks.h"

diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp
@@ -47,6 +47,7 @@
 
 #include "td/actor/MultiPromise.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"

diff --git a/td/telegram/WebPageBlock.cpp b/td/telegram/WebPageBlock.cpp
@@ -28,6 +28,7 @@
 #include "td/telegram/VoiceNotesManager.hpp"
 #include "td/telegram/WebPageId.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"

diff --git a/td/telegram/WebPagesManager.cpp b/td/telegram/WebPagesManager.cpp
@@ -38,6 +38,7 @@
 #include "td/db/SqliteKeyValue.h"
 #include "td/db/SqliteKeyValueAsync.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/format.h"

diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
@@ -17,6 +17,7 @@
 #include "td/telegram/Td.h"  // for VERBOSITY_NAME(td_requests)
 #include "td/telegram/td_api_json.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
@@ -1078,7 +1079,7 @@ class CliClient final : public Actor {
   }
 
   td_api::object_ptr<td_api::userPrivacySettingRules> get_user_privacy_setting_rules(Slice allow, Slice ids) const {
-    td::vector<td_api::object_ptr<td_api::UserPrivacySettingRule>> rules;
+    vector<td_api::object_ptr<td_api::UserPrivacySettingRule>> rules;
     if (allow == "c" || allow == "contacts") {
       rules.push_back(td_api::make_object<td_api::userPrivacySettingRuleAllowContacts>());
     } else if (allow == "users") {

diff --git a/td/telegram/files/FileGcWorker.cpp b/td/telegram/files/FileGcWorker.cpp
@@ -11,6 +11,7 @@
 #include "td/telegram/files/FileType.h"
 #include "td/telegram/Global.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"

diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp
@@ -24,6 +24,7 @@
 
 #include "td/actor/SleepActor.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/crypto.h"
 #include "td/utils/filesystem.h"

diff --git a/td/telegram/misc.cpp b/td/telegram/misc.cpp
@@ -6,6 +6,7 @@
 //
 #include "td/telegram/misc.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/common.h"
 #include "td/utils/HttpUrl.h"
 #include "td/utils/logging.h"

diff --git a/td/telegram/net/AuthDataShared.cpp b/td/telegram/net/AuthDataShared.cpp
@@ -9,9 +9,9 @@
 #include "td/telegram/Global.h"
 #include "td/telegram/TdDb.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
-#include "td/utils/misc.h"
 #include "td/utils/port/RwMutex.h"
 #include "td/utils/tl_helpers.h"
 

diff --git a/td/telegram/net/ConnectionCreator.cpp b/td/telegram/net/ConnectionCreator.cpp
@@ -28,6 +28,7 @@
 #include "td/net/Socks5.h"
 #include "td/net/TransparentProxy.h"
 
+#include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"