3 files changed, 3 insertions, 183 deletions
diff --git a/dev/kernel/src/KString.cc b/dev/kernel/src/KString.cc
deleted file mode 100644
index f5732280..00000000
--- a/dev/kernel/src/KString.cc
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -------------------------------------------
-
-  Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
-
-------------------------------------------- */
-
-#include <NeKit/KString.h>
-#include <NeKit/Utils.h>
-
-/// @file KString.cc
-/// @brief Kernel String manipulation file.
-
-namespace Kernel {
-Char* KString::Data() {
-  return this->fData;
-}
-
-const Char* KString::CData() const {
-  return const_cast<const Char*>(this->fData);
-}
-
-Size KString::Length() const {
-  return this->fDataSz;
-}
-
-bool KString::operator==(const KString& rhs) const {
-  if (rhs.Length() != this->Length()) return false;
-
-  for (Size index = 0; index < this->Length(); ++index) {
-    if (rhs.fData[index] != this->fData[index]) return false;
-  }
-
-  return true;
-}
-
-bool KString::operator==(const Char* rhs) const {
-  if (rt_string_len(rhs) != this->Length()) return false;
-
-  for (Size index = 0; index < rt_string_len(rhs); ++index) {
-    if (rhs[index] != this->fData[index]) return false;
-  }
-
-  return true;
-}
-
-bool KString::operator!=(const KString& rhs) const {
-  if (rhs.Length() != this->Length()) return false;
-
-  for (Size index = 0; index < rhs.Length(); ++index) {
-    if (rhs.fData[index] == this->fData[index]) return false;
-  }
-
-  return true;
-}
-
-bool KString::operator!=(const Char* rhs) const {
-  if (rt_string_len(rhs) != this->Length()) return false;
-
-  for (Size index = 0; index < rt_string_len(rhs); ++index) {
-    if (rhs[index] == this->fData[index]) return false;
-  }
-
-  return true;
-}
-
-ErrorOr<KString> KStringBuilder::Construct(const Char* data) {
-  if (!data || *data == 0) return ErrorOr<KString>(new KString(0));
-
-  KString* view = new KString(rt_string_len(data));
-  (*view) += data;
-
-  return ErrorOr<KString>(*view);
-}
-
-const Char* KStringBuilder::FromBool(const Char* fmt, bool i) {
-  if (!fmt) return ("?");
-
-  const Char* boolean_expr = i ? "YES" : "NO";
-  Char*       ret          = (Char*) RTL_ALLOCA(rt_string_len(boolean_expr) + rt_string_len(fmt));
-
-  if (!ret) return ("?");
-
-  const auto fmt_len = rt_string_len(fmt);
-  const auto res_len = rt_string_len(boolean_expr);
-
-  for (Size idx = 0; idx < fmt_len; ++idx) {
-    if (fmt[idx] == '%') {
-      SizeT result_cnt = idx;
-
-      for (auto y_idx = idx; y_idx < res_len; ++y_idx) {
-        ret[result_cnt] = boolean_expr[y_idx];
-        ++result_cnt;
-      }
-
-      break;
-    }
-
-    ret[idx] = fmt[idx];
-  }
-
-  return ret;
-}
-
-bool KStringBuilder::Equals(const Char* lhs, const Char* rhs) {
-  if (rt_string_len(rhs) != rt_string_len(lhs)) return false;
-
-  for (Size index = 0; index < rt_string_len(rhs); ++index) {
-    if (rhs[index] != lhs[index]) return false;
-  }
-
-  return true;
-}
-
-/// @note This is unsafe!!!
-bool KStringBuilder::Equals(const Utf8Char* lhs, const Utf8Char* rhs) {
-  for (Size index = 0; index < urt_string_len(rhs); ++index) {
-    if (rhs[index] != lhs[index]) return false;
-  }
-
-  return true;
-}
-
-bool KStringBuilder::Equals(const WideChar* lhs, const WideChar* rhs) {
-  for (Size index = 0; rhs[index] != 0; ++index) {
-    if (rhs[index] != lhs[index]) return false;
-  }
-
-  return true;
-}
-
-const Char* KStringBuilder::Format(const Char* fmt, const Char* fmt2) {
-  if (!fmt || !fmt2) return ("?");
-
-  Char* ret = (Char*) RTL_ALLOCA(sizeof(char) * (rt_string_len(fmt2) + rt_string_len(fmt)));
-
-  if (!ret) return ("?");
-
-  const auto len = rt_string_len(fmt);
-
-  for (Size idx = 0; idx < len; ++idx) {
-    if (fmt[idx] == '%' && idx < rt_string_len(fmt) && fmt[idx] == 's') {
-      Size result_cnt = idx;
-
-      for (Size y_idx = 0; y_idx < rt_string_len(fmt2); ++y_idx) {
-        ret[result_cnt] = fmt2[y_idx];
-        ++result_cnt;
-      }
-    }
-
-    ret[idx] = fmt[idx];
-  }
-
-  return ret;
-}
-
-STATIC void rt_string_append(Char* lhs, const Char* rhs, Int32 cur) {
-  SizeT sz_rhs = rt_string_len(rhs);
-  SizeT rhs_i  = 0;
-
-  for (; rhs_i < sz_rhs; ++rhs_i) {
-    lhs[rhs_i + cur] = rhs[rhs_i];
-  }
-}
-
-KString& KString::operator+=(const Char* rhs) {
-  rt_string_append(this->fData, rhs, this->fCur);
-  this->fCur += rt_string_len(rhs);
-
-  return *this;
-}
-
-KString& KString::operator+=(const KString& rhs) {
-  if (rt_string_len(rhs.fData) > this->Length()) return *this;
-
-  rt_string_append(this->fData, const_cast<Char*>(rhs.fData), this->fCur);
-  this->fCur += rt_string_len(const_cast<Char*>(rhs.fData));
-
-  return *this;
-}
-}  // namespace Kernel
diff --git a/dev/kernel/src/Property.cc b/dev/kernel/src/Property.cc
index 62aa6ef2..581da501 100644
--- a/dev/kernel/src/Property.cc
+++ b/dev/kernel/src/Property.cc
@@ -21,14 +21,14 @@ Property::Property() = default;
 /// @brief Check if property's name equals to name.
 /// @param name string to check.
 /***********************************************************************************/
-Bool Property::StringEquals(KString& name) {
+Bool Property::StringEquals(BasicKString<>& name) {
   return this->fName && this->fName == name;
 }
 
 /***********************************************************************************/
 /// @brief Gets the key (name) of property.
 /***********************************************************************************/
-KString& Property::GetKey() {
+BasicKString<>& Property::GetKey() {
   return this->fName;
 }
 
diff --git a/dev/kernel/src/UtfUtils.cc b/dev/kernel/src/UtfUtils.cc
index a5c03b85..907632ad 100644
--- a/dev/kernel/src/UtfUtils.cc
+++ b/dev/kernel/src/UtfUtils.cc
@@ -27,7 +27,7 @@ Void urt_set_memory(const voidPtr src, UInt32 dst, Size len) {
   }
 }
 
-Int32 rt_string_cmp(const Utf8Char* src, const Utf8Char* cmp, Size size) {
+Int32 urt_string_cmp(const Utf8Char* src, const Utf8Char* cmp, Size size) {
   Int32 counter = 0;
 
   for (Size index = 0; index < size; ++index) {