From 83d845ad3287f7c9fec34997964f9a31e256a237 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 28 Feb 2018 04:11:29 +0300
Subject: [PATCH] Move .Net classes to Telegram::Td namespace.

GitOrigin-RevId: 31d5cf030c30d7a1f58099decdcec265dbf6be0a
---
 CMakeLists.txt                 |  2 +-
 td/generate/CMakeLists.txt     |  2 +-
 td/generate/tl_writer_dotnet.h | 14 ++++++++------
 td/telegram/ClientDotNet.cpp   |  6 ++++--
 td/telegram/LogDotNet.cpp      |  6 ++++--
 td/tl/tl_dotnet_object.h       |  7 +++++--
 6 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e906abb3..5a7fa940 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,7 +281,7 @@ set(TL_C_SCHEME_SOURCE
 
 set_source_files_properties(${TL_DOTNET_AUTO} PROPERTIES GENERATED TRUE)
 set(TL_DOTNET_SCHEME_SOURCE
-  ${TL_TD_DOTNET_AUTO}
+  ${TL_DOTNET_AUTO}
   td/tl/tl_dotnet_object.h
 )
 
diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
index 359728b2..0652ea8f 100644
--- a/td/generate/CMakeLists.txt
+++ b/td/generate/CMakeLists.txt
@@ -37,7 +37,7 @@ set(TL_C_AUTO
   PARENT_SCOPE
 )
 
-set(TL_TD_DOTNET_AUTO
+set(TL_DOTNET_AUTO
   ${CMAKE_CURRENT_SOURCE_DIR}/auto/td/telegram/TdDotNetApi.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/auto/td/telegram/TdDotNetApi.h
   PARENT_SCOPE
diff --git a/td/generate/tl_writer_dotnet.h b/td/generate/tl_writer_dotnet.h
index 23611f0c..d46d17ed 100644
--- a/td/generate/tl_writer_dotnet.h
+++ b/td/generate/tl_writer_dotnet.h
@@ -180,10 +180,12 @@ class TlWriterDotNet : public TL_writer {
     return prefix_ +
            "#include \"td/utils/port/CxCli.h\"\n"
            "#include \"td/tl/tl_dotnet_object.h\"\n\n"
-           "namespace TdWindows {\n";
+           "namespace Telegram {\n"
+           "namespace Td {\n";
   }
   std::string gen_output_end() const override {
-    return "}\n";
+    return "}\n"
+           "}\n";
   }
 
   std::string gen_forward_class_declaration(const std::string &class_name, bool is_proxy) const override {
@@ -221,7 +223,7 @@ class TlWriterDotNet : public TL_writer {
       fixed_field_name += "Value";
     }
     if (type_name.substr(0, field_name.size()) == field_name) {
-      auto fixed_type_name = "::TdWindows::" + type_name;
+      auto fixed_type_name = "::Telegram::Td::" + type_name;
       std::stringstream ss;
       ss << "private:\n";
       ss << "  " << fixed_type_name << " " << fixed_field_name << "Private;\n";
@@ -248,14 +250,14 @@ class TlWriterDotNet : public TL_writer {
     ss << "\n";
     if (storer_type) {
       ss << (is_header_ ? "  virtual " : "") << "String^ " << (is_header_ ? "" : gen_class_name(class_name) + "::")
-         << "ToString()" << (is_header_ ? " override;" : " {\n  return ::TdWindows::ToString(this);\n}") << "\n";
+         << "ToString()" << (is_header_ ? " override;" : " {\n  return ::Telegram::Td::ToString(this);\n}") << "\n";
     } else {
       ss << (is_header_ ? "  virtual " : "") << "NativeObject^ "
          << (is_header_ ? "" : gen_class_name(class_name) + "::") << "ToUnmanaged()";
       if (is_header_) {
         ss << ";\n";
       } else {
-        ss << "{\n  return REF_NEW NativeObject(::TdWindows::ToUnmanaged(this).release());\n}\n";
+        ss << "{\n  return REF_NEW NativeObject(::Telegram::Td::ToUnmanaged(this).release());\n}\n";
       }
     }
     return ss.str();
@@ -280,7 +282,7 @@ class TlWriterDotNet : public TL_writer {
     if (field_type.substr(0, 5) == "Array") {
       ss << "CXCONST ";
     } else if (field_type.substr(0, 6) != "String" && to_upper(field_type[0]) == field_type[0]) {
-      field_type = "::TdWindows::" + field_type;
+      field_type = "::Telegram::Td::" + field_type;
     }
     ss << field_type << " " << to_camelCase(a.name);
     return ss.str();
diff --git a/td/telegram/ClientDotNet.cpp b/td/telegram/ClientDotNet.cpp
index d3d26b07..ef73203d 100644
--- a/td/telegram/ClientDotNet.cpp
+++ b/td/telegram/ClientDotNet.cpp
@@ -10,7 +10,8 @@
 
 #include "td/utils/port/CxCli.h"
 
-namespace TdWindows {
+namespace Telegram {
+namespace Td {
 
 using namespace CxCli;
 
@@ -93,4 +94,5 @@ private:
   }
 };
 
-}  // namespace TdWindows
+}  // namespace Td
+}  // namespace Telegram
diff --git a/td/telegram/LogDotNet.cpp b/td/telegram/LogDotNet.cpp
index 1ab05ca5..c267c8f2 100644
--- a/td/telegram/LogDotNet.cpp
+++ b/td/telegram/LogDotNet.cpp
@@ -8,7 +8,8 @@
 
 #include "td/utils/port/CxCli.h"
 
-namespace TdWindows {
+namespace Telegram {
+namespace Td {
 
 using namespace CxCli;
 
@@ -27,4 +28,5 @@ public:
   }
 };
 
-}  // namespace TdWindows
+}  // namespace Td
+}  // namespace Telegram
diff --git a/td/tl/tl_dotnet_object.h b/td/tl/tl_dotnet_object.h
index 218d2d52..424383cc 100644
--- a/td/tl/tl_dotnet_object.h
+++ b/td/tl/tl_dotnet_object.h
@@ -12,7 +12,9 @@
 #include "td/telegram/td_api.h"
 #include "td/telegram/td_api.hpp"
 
-namespace TdWindows {
+namespace Telegram {
+namespace Td {
+
 using namespace CxCli;
 
 public ref class NativeObject sealed {
@@ -172,4 +174,5 @@ inline String^ ToString(BaseObject^ from) {
   return string_from_unmanaged(td::td_api::to_string(ToUnmanaged(from)->get_object_ptr()));
 }
 
-}  // namespace TdWindows
+}  // namespace Td
+}  // namespace Telegram