From 47aabf244b4c870f3e36bfb005fb8203ccb072d8 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Tue, 28 Mar 2023 01:30:09 +0200
Subject: [PATCH] Remove redundant tier1 files

These files are no longer necessary.
---
 r5dev/client/cdll_engine_int.cpp      |  1 -
 r5dev/core/init.cpp                   |  1 -
 r5dev/engine/client/cl_rcon.cpp       |  1 -
 r5dev/engine/server/sv_rcon.cpp       |  1 -
 r5dev/squirrel/sqvm.cpp               |  1 -
 r5dev/tier1/IConVar.cpp               | 20 --------------------
 r5dev/tier1/IConVar.h                 |  1 -
 r5dev/tier1/cvar.cpp                  |  1 -
 r5dev/tier1/cvar.h                    |  1 -
 r5dev/vgui/vgui_fpspanel.h            |  1 -
 r5dev/vproj/clientsdk.vcxproj         |  2 --
 r5dev/vproj/clientsdk.vcxproj.filters |  6 ------
 r5dev/vproj/dedicated.vcxproj         |  2 --
 r5dev/vproj/dedicated.vcxproj.filters |  6 ------
 r5dev/vproj/gamesdk.vcxproj           |  2 --
 r5dev/vproj/gamesdk.vcxproj.filters   |  6 ------
 r5dev/vstdlib/callback.cpp            |  1 -
 r5dev/vstdlib/callback.h              |  1 -
 18 files changed, 55 deletions(-)
 delete mode 100644 r5dev/tier1/IConVar.cpp
 delete mode 100644 r5dev/tier1/IConVar.h

diff --git a/r5dev/client/cdll_engine_int.cpp b/r5dev/client/cdll_engine_int.cpp
index 37574940..f604cf52 100644
--- a/r5dev/client/cdll_engine_int.cpp
+++ b/r5dev/client/cdll_engine_int.cpp
@@ -7,7 +7,6 @@
 /*****************************************************************************/
 #include "tier1/cvar.h"
 #include "tier0/commandline.h"
-#include "tier1/IConVar.h"
 #include "client/vengineclient_impl.h"
 #include "client/cdll_engine_int.h"
 #include "engine/net_chan.h"
diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp
index 8e955f89..03040059 100644
--- a/r5dev/core/init.cpp
+++ b/r5dev/core/init.cpp
@@ -16,7 +16,6 @@
 #include "tier0/commandline.h"
 #include "tier0/platform_internal.h"
 #include "tier1/cmd.h"
-#include "tier1/IConVar.h"
 #include "tier1/cvar.h"
 #include "vpc/IAppSystem.h"
 #include "vpc/keyvalues.h"
diff --git a/r5dev/engine/client/cl_rcon.cpp b/r5dev/engine/client/cl_rcon.cpp
index 80f8f0c7..52b0f6f9 100644
--- a/r5dev/engine/client/cl_rcon.cpp
+++ b/r5dev/engine/client/cl_rcon.cpp
@@ -5,7 +5,6 @@
 //===========================================================================//
 
 #include "core/stdafx.h"
-#include "tier1/IConVar.h"
 #include "tier1/cmd.h"
 #include "tier1/cvar.h"
 #include "protoc/sv_rcon.pb.h"
diff --git a/r5dev/engine/server/sv_rcon.cpp b/r5dev/engine/server/sv_rcon.cpp
index c10117b3..c961ad40 100644
--- a/r5dev/engine/server/sv_rcon.cpp
+++ b/r5dev/engine/server/sv_rcon.cpp
@@ -7,7 +7,6 @@
 #include "core/stdafx.h"
 #include "tier1/cmd.h"
 #include "tier1/cvar.h"
-#include "tier1/IConVar.h"
 #include "tier1/NetAdr.h"
 #include "tier2/socketcreator.h"
 #include "engine/net.h"
diff --git a/r5dev/squirrel/sqvm.cpp b/r5dev/squirrel/sqvm.cpp
index 48f777d0..b8a11cc6 100644
--- a/r5dev/squirrel/sqvm.cpp
+++ b/r5dev/squirrel/sqvm.cpp
@@ -9,7 +9,6 @@
 #include "tier0/platform_internal.h"
 #include "tier0/commandline.h"
 #include "tier1/cvar.h"
-#include "tier1/IConVar.h"
 #ifndef CLIENT_DLL
 #include "engine/server/sv_rcon.h"
 #endif // CLIENT_DLL
diff --git a/r5dev/tier1/IConVar.cpp b/r5dev/tier1/IConVar.cpp
deleted file mode 100644
index 9225a7b3..00000000
--- a/r5dev/tier1/IConVar.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//=============================================================================//
-//
-// Purpose: Console Variables
-//
-//=============================================================================//
-
-#include "core/stdafx.h"
-#include "tier0/tslist.h"
-#include "tier0/memstd.h"
-#include "tier1/IConVar.h"
-#include "tier1/cvar.h"
-#include "tier1/utlvector.h"
-#include "mathlib/fbits.h"
-#include "vstdlib/callback.h"
-#include "public/const.h"
-#include "public/iconvar.h"
-#include "public/iconcommand.h"
-
-
-///////////////////////////////////////////////////////////////////////////////
diff --git a/r5dev/tier1/IConVar.h b/r5dev/tier1/IConVar.h
deleted file mode 100644
index 6f70f09b..00000000
--- a/r5dev/tier1/IConVar.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/r5dev/tier1/cvar.cpp b/r5dev/tier1/cvar.cpp
index a13623bd..e3c0333d 100644
--- a/r5dev/tier1/cvar.cpp
+++ b/r5dev/tier1/cvar.cpp
@@ -1,7 +1,6 @@
 #include "core/stdafx.h"
 #include "tier1/utlrbtree.h"
 #include "tier1/cvar.h"
-#include "tier1/IConVar.h"
 #include "public/const.h"
 #include "engine/sys_dll2.h"
 #include "filesystem/filesystem.h"
diff --git a/r5dev/tier1/cvar.h b/r5dev/tier1/cvar.h
index fc41bf00..ade257db 100644
--- a/r5dev/tier1/cvar.h
+++ b/r5dev/tier1/cvar.h
@@ -12,7 +12,6 @@
 #ifndef CVAR_H
 #define CVAR_H
 
-#include "tier1/IConVar.h"
 #include "vstdlib/concommandhash.h"
 
 //-------------------------------------------------------------------------
diff --git a/r5dev/vgui/vgui_fpspanel.h b/r5dev/vgui/vgui_fpspanel.h
index 59ee505d..550c7ecc 100644
--- a/r5dev/vgui/vgui_fpspanel.h
+++ b/r5dev/vgui/vgui_fpspanel.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "tier1/IConVar.h"
 
 /* ==== CFPSPANEL ======================================================================================================================================================= */
 inline CMemory p_CFPSPanel_Paint;
diff --git a/r5dev/vproj/clientsdk.vcxproj b/r5dev/vproj/clientsdk.vcxproj
index 518133ab..884a6c63 100644
--- a/r5dev/vproj/clientsdk.vcxproj
+++ b/r5dev/vproj/clientsdk.vcxproj
@@ -148,7 +148,6 @@
     <ClCompile Include="..\tier1\cmd.cpp" />
     <ClCompile Include="..\tier1\cvar.cpp" />
     <ClCompile Include="..\tier1\generichash.cpp" />
-    <ClCompile Include="..\tier1\IConVar.cpp" />
     <ClCompile Include="..\tier1\NetAdr.cpp" />
     <ClCompile Include="..\tier1\NetKey.cpp" />
     <ClCompile Include="..\tier1\splitstring.cpp" />
@@ -491,7 +490,6 @@
     <ClInclude Include="..\tier1\cmd.h" />
     <ClInclude Include="..\tier1\cvar.h" />
     <ClInclude Include="..\tier1\generichash.h" />
-    <ClInclude Include="..\tier1\IConVar.h" />
     <ClInclude Include="..\tier1\mempool.h" />
     <ClInclude Include="..\tier1\NetAdr.h" />
     <ClInclude Include="..\tier1\NetKey.h" />
diff --git a/r5dev/vproj/clientsdk.vcxproj.filters b/r5dev/vproj/clientsdk.vcxproj.filters
index 144dbda1..267363fa 100644
--- a/r5dev/vproj/clientsdk.vcxproj.filters
+++ b/r5dev/vproj/clientsdk.vcxproj.filters
@@ -423,9 +423,6 @@
     <ClCompile Include="..\filesystem\basefilesystem.cpp">
       <Filter>sdk\filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\tier1\IConVar.cpp">
-      <Filter>sdk\tier1</Filter>
-    </ClCompile>
     <ClCompile Include="..\tier1\cmd.cpp">
       <Filter>sdk\tier1</Filter>
     </ClCompile>
@@ -1079,9 +1076,6 @@
     <ClInclude Include="..\filesystem\basefilesystem.h">
       <Filter>sdk\filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\tier1\IConVar.h">
-      <Filter>sdk\tier1</Filter>
-    </ClInclude>
     <ClInclude Include="..\tier1\cmd.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj
index 16122c31..3885cf65 100644
--- a/r5dev/vproj/dedicated.vcxproj
+++ b/r5dev/vproj/dedicated.vcxproj
@@ -472,7 +472,6 @@
     <ClInclude Include="..\tier1\cmd.h" />
     <ClInclude Include="..\tier1\cvar.h" />
     <ClInclude Include="..\tier1\generichash.h" />
-    <ClInclude Include="..\tier1\IConVar.h" />
     <ClInclude Include="..\tier1\mempool.h" />
     <ClInclude Include="..\tier1\NetAdr.h" />
     <ClInclude Include="..\tier1\NetKey.h" />
@@ -628,7 +627,6 @@
     <ClCompile Include="..\tier1\cmd.cpp" />
     <ClCompile Include="..\tier1\cvar.cpp" />
     <ClCompile Include="..\tier1\generichash.cpp" />
-    <ClCompile Include="..\tier1\IConVar.cpp" />
     <ClCompile Include="..\tier1\NetAdr.cpp" />
     <ClCompile Include="..\tier1\NetKey.cpp" />
     <ClCompile Include="..\tier1\splitstring.cpp" />
diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters
index c5f0ac7b..50cb241c 100644
--- a/r5dev/vproj/dedicated.vcxproj.filters
+++ b/r5dev/vproj/dedicated.vcxproj.filters
@@ -516,9 +516,6 @@
     <ClInclude Include="..\tier1\cmd.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
-    <ClInclude Include="..\tier1\IConVar.h">
-      <Filter>sdk\tier1</Filter>
-    </ClInclude>
     <ClInclude Include="..\tier1\cvar.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
@@ -1265,9 +1262,6 @@
     <ClCompile Include="..\filesystem\basefilesystem.cpp">
       <Filter>sdk\filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\tier1\IConVar.cpp">
-      <Filter>sdk\tier1</Filter>
-    </ClCompile>
     <ClCompile Include="..\tier1\cmd.cpp">
       <Filter>sdk\tier1</Filter>
     </ClCompile>
diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj
index f473df49..e9f041a2 100644
--- a/r5dev/vproj/gamesdk.vcxproj
+++ b/r5dev/vproj/gamesdk.vcxproj
@@ -167,7 +167,6 @@
     <ClCompile Include="..\tier1\cmd.cpp" />
     <ClCompile Include="..\tier1\cvar.cpp" />
     <ClCompile Include="..\tier1\generichash.cpp" />
-    <ClCompile Include="..\tier1\IConVar.cpp" />
     <ClCompile Include="..\tier1\NetAdr.cpp" />
     <ClCompile Include="..\tier1\NetKey.cpp" />
     <ClCompile Include="..\tier1\splitstring.cpp" />
@@ -545,7 +544,6 @@
     <ClInclude Include="..\tier1\cmd.h" />
     <ClInclude Include="..\tier1\cvar.h" />
     <ClInclude Include="..\tier1\generichash.h" />
-    <ClInclude Include="..\tier1\IConVar.h" />
     <ClInclude Include="..\tier1\mempool.h" />
     <ClInclude Include="..\tier1\NetAdr.h" />
     <ClInclude Include="..\tier1\NetKey.h" />
diff --git a/r5dev/vproj/gamesdk.vcxproj.filters b/r5dev/vproj/gamesdk.vcxproj.filters
index 76693320..def7282b 100644
--- a/r5dev/vproj/gamesdk.vcxproj.filters
+++ b/r5dev/vproj/gamesdk.vcxproj.filters
@@ -447,9 +447,6 @@
     <ClCompile Include="..\filesystem\basefilesystem.cpp">
       <Filter>sdk\filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\tier1\IConVar.cpp">
-      <Filter>sdk\tier1</Filter>
-    </ClCompile>
     <ClCompile Include="..\tier1\cmd.cpp">
       <Filter>sdk\tier1</Filter>
     </ClCompile>
@@ -1169,9 +1166,6 @@
     <ClInclude Include="..\tier1\cmd.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
-    <ClInclude Include="..\tier1\IConVar.h">
-      <Filter>sdk\tier1</Filter>
-    </ClInclude>
     <ClInclude Include="..\tier1\cvar.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp
index 62fe8c21..67628bc9 100644
--- a/r5dev/vstdlib/callback.cpp
+++ b/r5dev/vstdlib/callback.cpp
@@ -9,7 +9,6 @@
 #include "windows/id3dx.h"
 #include "tier0/fasttimer.h"
 #include "tier1/cvar.h"
-#include "tier1/IConVar.h"
 #ifndef CLIENT_DLL
 #include "engine/server/sv_rcon.h"
 #endif // !CLIENT_DLL
diff --git a/r5dev/vstdlib/callback.h b/r5dev/vstdlib/callback.h
index 1acb5dc4..cac06aa8 100644
--- a/r5dev/vstdlib/callback.h
+++ b/r5dev/vstdlib/callback.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "tier1/IConVar.h"
 
 inline CMemory p_SetupGamemode;
 inline auto SetupGamemode = p_SetupGamemode.RCast<bool(*)(const char* pszPlayList)>();