From 554b38216233ed44d202ec107a26d4880231fcaa Mon Sep 17 00:00:00 2001
From: Jenny White <jennywhite359@gmail.com>
Date: Sun, 29 Apr 2018 19:06:42 +0300
Subject: [PATCH] in progress: cxx17 namespaces

---
 include/hacks/Aimbot.hpp         |  8 +-------
 include/hacks/Announcer.hpp      |  8 +-------
 include/hacks/AntiAim.hpp        | 10 ++--------
 include/hacks/AntiBackstab.hpp   | 11 ++++-------
 include/hacks/AntiCheat.hpp      | 10 ++--------
 include/hacks/AntiDisguise.hpp   |  8 +-------
 include/hacks/AutoBackstab.hpp   |  8 +-------
 include/hacks/AutoDeadringer.hpp |  9 ++-------
 include/hacks/AutoDetonator.hpp  |  9 ++-------
 9 files changed, 16 insertions(+), 65 deletions(-)

diff --git a/include/hacks/Aimbot.hpp b/include/hacks/Aimbot.hpp
index f5ddef05..5e9e903b 100755
--- a/include/hacks/Aimbot.hpp
+++ b/include/hacks/Aimbot.hpp
@@ -13,11 +13,7 @@
 class ConVar;
 class IClientEntity;
 
-namespace hacks
-{
-namespace shared
-{
-namespace aimbot
+namespace hacks::shared::aimbot
 {
 
 // Used to store aimbot data to prevent calculating it again
@@ -61,5 +57,3 @@ void DoSlowAim(Vector &inputAngle);
 bool UpdateAimkey();
 float EffectiveTargetingRange();
 }
-}
-}
diff --git a/include/hacks/Announcer.hpp b/include/hacks/Announcer.hpp
index 670c5c79..9763cae6 100644
--- a/include/hacks/Announcer.hpp
+++ b/include/hacks/Announcer.hpp
@@ -9,16 +9,10 @@
 
 #include "common.hpp"
 
-namespace hacks
-{
-namespace shared
-{
-namespace announcer
+namespace hacks::shared::announcer
 {
 
 void playsound(const std::string &);
 void init();
 void shutdown();
 }
-}
-}
diff --git a/include/hacks/AntiAim.hpp b/include/hacks/AntiAim.hpp
index fb14de2d..8c671e06 100755
--- a/include/hacks/AntiAim.hpp
+++ b/include/hacks/AntiAim.hpp
@@ -10,11 +10,7 @@
 class CatVar;
 class CUserCmd;
 
-namespace hacks
-{
-namespace shared
-{
-namespace antiaim
+namespace hacks::shared::antiaim
 {
 
 // TODO paste AA from AimTux
@@ -35,6 +31,4 @@ extern int safe_space;
 void SetSafeSpace(int safespace);
 bool ShouldAA(CUserCmd *cmd);
 void ProcessUserCmd(CUserCmd *cmd);
-}
-}
-}
+}
\ No newline at end of file
diff --git a/include/hacks/AntiBackstab.hpp b/include/hacks/AntiBackstab.hpp
index 91f8275a..21eaee94 100755
--- a/include/hacks/AntiBackstab.hpp
+++ b/include/hacks/AntiBackstab.hpp
@@ -7,15 +7,12 @@
 
 #pragma once
 
-namespace hacks
-{
-namespace tf2
-{
-namespace antibackstab
+namespace hacks::tf2::antibackstab
 {
+
 extern bool noaa;
+
 void CreateMove();
+
 void PaintTraverse();
 }
-}
-}
diff --git a/include/hacks/AntiCheat.hpp b/include/hacks/AntiCheat.hpp
index 95e42e26..2f2ffb84 100755
--- a/include/hacks/AntiCheat.hpp
+++ b/include/hacks/AntiCheat.hpp
@@ -13,11 +13,7 @@
 #include "ac/antiaim.hpp"
 #include "ac/bhop.hpp"
 
-namespace hacks
-{
-namespace shared
-{
-namespace anticheat
+namespace hacks::shared::anticheat
 {
 
 void Accuse(int eid, const std::string &hack, const std::string &details);
@@ -27,6 +23,4 @@ void CreateMove();
 
 void ResetPlayer(int index);
 void ResetEverything();
-}
-}
-}
+}
\ No newline at end of file
diff --git a/include/hacks/AntiDisguise.hpp b/include/hacks/AntiDisguise.hpp
index 5571a54d..2f1b774d 100755
--- a/include/hacks/AntiDisguise.hpp
+++ b/include/hacks/AntiDisguise.hpp
@@ -9,16 +9,10 @@
 
 #include "common.hpp"
 
-namespace hacks
-{
-namespace tf2
-{
-namespace antidisguise
+namespace hacks::tf2::antidisguise
 {
 
 extern CatVar enabled;
 
 void Draw();
 }
-}
-}
diff --git a/include/hacks/AutoBackstab.hpp b/include/hacks/AutoBackstab.hpp
index 9f5f6ec5..d777510f 100755
--- a/include/hacks/AutoBackstab.hpp
+++ b/include/hacks/AutoBackstab.hpp
@@ -7,15 +7,9 @@
 
 #pragma once
 
-namespace hacks
-{
-namespace tf2
-{
-namespace autobackstab
+namespace hacks::tf2::autobackstab
 {
 
 void CreateMove();
 const Vector GetWorldSpaceCenter(CachedEntity *ent);
 }
-}
-}
diff --git a/include/hacks/AutoDeadringer.hpp b/include/hacks/AutoDeadringer.hpp
index 4dc2bcef..317d11a2 100644
--- a/include/hacks/AutoDeadringer.hpp
+++ b/include/hacks/AutoDeadringer.hpp
@@ -6,13 +6,8 @@
  */
 
 #pragma once
-namespace hacks
-{
-namespace shared
-{
-namespace deadringer
+namespace hacks::shared::deadringer
 {
+
 void CreateMove();
 }
-}
-}
diff --git a/include/hacks/AutoDetonator.hpp b/include/hacks/AutoDetonator.hpp
index ab213202..9aa690f4 100755
--- a/include/hacks/AutoDetonator.hpp
+++ b/include/hacks/AutoDetonator.hpp
@@ -9,13 +9,8 @@
 
 #include "common.hpp"
 
-namespace hacks
-{
-namespace tf
-{
-namespace autodetonator
+namespace hacks::tf::autodetonator
 {
+
 void CreateMove();
 }
-}
-}