IMP: Doing a cleanup and finishing the first version of ZKA.

Signed-off-by: Amlal <amlal@el-mahrouss-logic.com>

8 files changed, 22 insertions, 23 deletions

diff --git a/dev/zka/KernelKit/DriveMgr.h b/dev/zka/KernelKit/DriveMgr.h
index 850217cb..db857a3c 100644
--- a/dev/zka/KernelKit/DriveMgr.h
+++ b/dev/zka/KernelKit/DriveMgr.h
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#ifndef __INC_DRIVE_MANAGER_HXX__
-#define __INC_DRIVE_MANAGER_HXX__
+#ifndef __INC_DRIVE_MANAGER_H__
+#define __INC_DRIVE_MANAGER_H__
 
 #include <KernelKit/UserProcessScheduler.h>
 #include <CompilerKit/CompilerKit.h>
@@ -152,4 +152,4 @@ namespace Kernel
 	DriveTrait io_construct_main_drive(void) noexcept;
 } // namespace Kernel
 
-#endif /* ifndef __INC_DRIVE_MANAGER_HXX__ */
+#endif /* ifndef __INC_DRIVE_MANAGER_H__ */
diff --git a/dev/zka/KernelKit/FileMgr.h b/dev/zka/KernelKit/FileMgr.h
index cdda89e7..af302a64 100644
--- a/dev/zka/KernelKit/FileMgr.h
+++ b/dev/zka/KernelKit/FileMgr.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#ifdef __FSKIT_USE_NEFS__
+#ifdef __FSKIT_INCLUDES_NEFS__
 #include <FSKit/NeFS.h>
-#endif // __FSKIT_USE_NEFS__
+#endif // __FSKIT_INCLUDES_NEFS__
 
 #include <CompilerKit/CompilerKit.h>
 #include <HintKit/CompilerHint.h>
@@ -135,7 +135,7 @@ namespace Kernel
 		virtual bool  Rewind(_Input NodePtr node) = 0;
 	};
 
-#ifdef __FSKIT_USE_NEFS__
+#ifdef __FSKIT_INCLUDES_NEFS__
 	/**
 	 * @brief Based of IFilesystemMgr, takes care of managing NeFS
 	 * disks.
@@ -184,7 +184,7 @@ namespace Kernel
 		NeFSParser* fImpl{nullptr};
 	};
 
-#endif // ifdef __FSKIT_USE_NEFS__
+#endif // ifdef __FSKIT_INCLUDES_NEFS__
 
 	/**
 	 * Usable FileStream
diff --git a/dev/zka/KernelKit/IPEFDLLObject.h b/dev/zka/KernelKit/IPEFDLLObject.h
index 8c0703ed..49d3519a 100644
--- a/dev/zka/KernelKit/IPEFDLLObject.h
+++ b/dev/zka/KernelKit/IPEFDLLObject.h
@@ -7,8 +7,8 @@
  *      ========================================================
  */
 
-#ifndef __KERNELKIT_SHARED_OBJECT_HXX__
-#define __KERNELKIT_SHARED_OBJECT_HXX__
+#ifndef __KERNELKIT_SHARED_OBJECT_H__
+#define __KERNELKIT_SHARED_OBJECT_H__
 
 #include <KernelKit/PEF.h>
 #include <NewKit/Defines.h>
@@ -103,4 +103,4 @@ namespace Kernel
 	EXTERN_C Void rtl_fini_dll(UserProcess* header, IDLL lib, Bool* successful);
 } // namespace Kernel
 
-#endif /* ifndef __KERNELKIT_SHARED_OBJECT_HXX__ */
+#endif /* ifndef __KERNELKIT_SHARED_OBJECT_H__ */
diff --git a/dev/zka/KernelKit/PE.h b/dev/zka/KernelKit/PE.h
index b077f251..186f7e9f 100644
--- a/dev/zka/KernelKit/PE.h
+++ b/dev/zka/KernelKit/PE.h
@@ -11,8 +11,8 @@
 
 ------------------------------------------- */
 
-#ifndef __KERNELKIT_INC_PE_HXX__
-#define __KERNELKIT_INC_PE_HXX__
+#ifndef __KERNELKIT_INC_PE_H__
+#define __KERNELKIT_INC_PE_H__
 
 #include <NewKit/Defines.h>
 
@@ -140,4 +140,4 @@ enum
 	cPEResourceId = 0xFFaadd00,
 };
 
-#endif /* ifndef __KERNELKIT_INC_PE_HXX__ */
+#endif /* ifndef __KERNELKIT_INC_PE_H__ */
diff --git a/dev/zka/KernelKit/PEF.h b/dev/zka/KernelKit/PEF.h
index 15f9c5e2..5c010503 100644
--- a/dev/zka/KernelKit/PEF.h
+++ b/dev/zka/KernelKit/PEF.h
@@ -11,8 +11,8 @@
 
 ------------------------------------------- */
 
-#ifndef __KERNELKIT_INC_PEF_HXX__
-#define __KERNELKIT_INC_PEF_HXX__
+#ifndef __KERNELKIT_INC_PEF_H__
+#define __KERNELKIT_INC_PEF_H__
 
 #include <CompilerKit/CompilerKit.h>
 #include <KernelKit/LoaderInterface.h>
@@ -113,4 +113,4 @@ namespace Kernel
 #define kPefForkKind	kPefMagic
 #define kPefForkKindFAT kPefMagicFat
 
-#endif /* ifndef __KERNELKIT_INC_PEF_HXX__ */
+#endif /* ifndef __KERNELKIT_INC_PEF_H__ */
diff --git a/dev/zka/KernelKit/PEFCodeMgr.h b/dev/zka/KernelKit/PEFCodeMgr.h
index 8ad9eb01..01b4c6bd 100644
--- a/dev/zka/KernelKit/PEFCodeMgr.h
+++ b/dev/zka/KernelKit/PEFCodeMgr.h
@@ -46,11 +46,11 @@ namespace Kernel
 		bool IsLoaded() noexcept;
 
 	private:
-#ifdef __FSKIT_USE_NEFS__
+#ifdef __FSKIT_INCLUDES_NEFS__
 		OwnPtr<FileStream<Char, NeFileSystemMgr>> fFile;
 #else
 		OwnPtr<FileStream<Char>> fFile;
-#endif // __FSKIT_USE_NEFS__
+#endif // __FSKIT_INCLUDES_NEFS__
 
 		Ref<StringView> fPath;
 		VoidPtr			fCachedBlob;
diff --git a/dev/zka/KernelKit/UserProcessScheduler.h b/dev/zka/KernelKit/UserProcessScheduler.h
index 5faafc0b..b2300ddf 100644
--- a/dev/zka/KernelKit/UserProcessScheduler.h
+++ b/dev/zka/KernelKit/UserProcessScheduler.h
@@ -99,7 +99,7 @@ namespace Kernel
 
 	// end of operator overloading.
 
-	enum ProcessSubsystemEnum : Int32
+	enum class ProcessSubsystem: Int32
 	{
 		kProcessSubsystemSecurity = 100,
 		kProcessSubsystemApplication,
@@ -109,7 +109,6 @@ namespace Kernel
 		kProcessSubsystemCount	 = 4,
 	};
 
-	using ProcessSubsystem = ProcessSubsystemEnum;
 	using ProcessTime	   = UInt64;
 	using PID			   = Int64;
 
diff --git a/dev/zka/KernelKit/XCOFF.h b/dev/zka/KernelKit/XCOFF.h
index a7cf3aff..3961f085 100644
--- a/dev/zka/KernelKit/XCOFF.h
+++ b/dev/zka/KernelKit/XCOFF.h
@@ -11,8 +11,8 @@
 
 ------------------------------------------- */
 
-#ifndef __INC_XCOFF_HXX__
-#define __INC_XCOFF_HXX__
+#ifndef INC_XOCFF_H
+#define INC_XOCFF_H
 
 #include <NewKit/Defines.h>
 
@@ -48,4 +48,4 @@ typedef struct XCoffForkHeader
 	Kernel::Char fCodeSignFork[cForkNameLen];
 } XCoffForkHeader;
 
-#endif // ifndef __INC_XCOFF_HXX__
+#endif // ifndef INC_XOCFF_H