diff options
Diffstat (limited to 'dev/Usr')
| -rw-r--r-- | dev/Usr/LibCF/Atom.h | 2 | ||||
| -rw-r--r-- | dev/Usr/LibCF/Foundation.cc (renamed from dev/Usr/LibCF/Core.cc) | 8 | ||||
| -rw-r--r-- | dev/Usr/LibCF/Foundation.h (renamed from dev/Usr/LibCF/Core.h) | 10 | ||||
| -rw-r--r-- | dev/Usr/LibCF/Object.h | 2 | ||||
| -rw-r--r-- | dev/Usr/LibCF/Property.h | 2 | ||||
| -rw-r--r-- | dev/Usr/LibCF/Ref.h | 6 | ||||
| -rw-r--r-- | dev/Usr/LibCF/String.h | 5 | ||||
| -rw-r--r-- | dev/Usr/LibFont/Font.h | 2 |
8 files changed, 25 insertions, 12 deletions
diff --git a/dev/Usr/LibCF/Atom.h b/dev/Usr/LibCF/Atom.h index dbb90c40..26b4f0cd 100644 --- a/dev/Usr/LibCF/Atom.h +++ b/dev/Usr/LibCF/Atom.h @@ -5,7 +5,7 @@ ------------------------------------------- */ #pragma once -#include <LibCF/Core.h> +#include <LibCF/Foundation.h> namespace LibCF { diff --git a/dev/Usr/LibCF/Core.cc b/dev/Usr/LibCF/Foundation.cc index 28306c56..cb11287f 100644 --- a/dev/Usr/LibCF/Core.cc +++ b/dev/Usr/LibCF/Foundation.cc @@ -4,7 +4,7 @@ ------------------------------------------- */ -#include <LibCF/Core.h> +#include <LibCF/Foundation.h> LibCF::CFRect::operator bool() { @@ -14,7 +14,7 @@ LibCF::CFRect::operator bool() /***********************************************************************************/ /// @brief returns true if size matches. /***********************************************************************************/ -BOOL LibCF::CFRect::sizeMatches(LibCF::CFRect& rect) noexcept +BOOL LibCF::CFRect::SizeMatches(LibCF::CFRect& rect) noexcept { return rect.height == height && rect.width == width; } @@ -22,7 +22,7 @@ BOOL LibCF::CFRect::sizeMatches(LibCF::CFRect& rect) noexcept /***********************************************************************************/ /// @brief returns true if position matches. /***********************************************************************************/ -BOOL LibCF::CFRect::positionMatches(LibCF::CFRect& rect) noexcept +BOOL LibCF::CFRect::PositionMatches(LibCF::CFRect& rect) noexcept { return rect.y == y && rect.x == x; } @@ -33,7 +33,7 @@ BOOL LibCF::CFRect::positionMatches(LibCF::CFRect& rect) noexcept /// @retval true if point is within this point. /// @retval the validations have failed, false otherwise true. /***********************************************************************************/ -BOOL LibCF::CFPoint::isWithin(LibCF::CFPoint& withinOf) +BOOL LibCF::CFPoint::IsWithin(LibCF::CFPoint& withinOf) { return x_1 >= withinOf.x_1 && x_2 <= (withinOf.x_2) && y_1 >= withinOf.y_1 && y_2 <= (withinOf.y_2); diff --git a/dev/Usr/LibCF/Core.h b/dev/Usr/LibCF/Foundation.h index acebe996..c0f8fe6c 100644 --- a/dev/Usr/LibCF/Core.h +++ b/dev/Usr/LibCF/Foundation.h @@ -3,6 +3,9 @@ Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. + FILE: Foundation.h + PURPOSE: Foundation header of the CF framework. + ------------------------------------------- */ #pragma once @@ -15,6 +18,7 @@ namespace LibCF class CFGUID; class CFProperty; class CFObject; + template <typename T> class CFRef; class CFFont; struct CFPoint; @@ -50,7 +54,7 @@ namespace LibCF /// @param point the current point to check. /// @retval true if point is within this point. /// @retval validations failed. - bool isWithin(CFPoint& point); + bool IsWithin(CFPoint& point); }; struct CFColor final @@ -68,7 +72,7 @@ namespace LibCF operator bool(); - BOOL sizeMatches(CFRect& rect) noexcept; - BOOL positionMatches(CFRect& rect) noexcept; + BOOL SizeMatches(CFRect& rect) noexcept; + BOOL PositionMatches(CFRect& rect) noexcept; }; } // namespace LibCF
\ No newline at end of file diff --git a/dev/Usr/LibCF/Object.h b/dev/Usr/LibCF/Object.h index 4899661e..1f8d185e 100644 --- a/dev/Usr/LibCF/Object.h +++ b/dev/Usr/LibCF/Object.h @@ -7,7 +7,7 @@ #pragma once -#include <LibCF/Core.h> +#include <LibCF/Foundation.h> #define CF_OBJECT : public LibCF::CFObject diff --git a/dev/Usr/LibCF/Property.h b/dev/Usr/LibCF/Property.h index 87927de9..51a60be7 100644 --- a/dev/Usr/LibCF/Property.h +++ b/dev/Usr/LibCF/Property.h @@ -26,7 +26,7 @@ namespace LibCF /// @brief User property class. /// @example /prop/foo or /prop/bar - class CFProperty + class CFProperty final CF_OBJECT { public: CFProperty(); diff --git a/dev/Usr/LibCF/Ref.h b/dev/Usr/LibCF/Ref.h index 46d8ac51..d170ffe8 100644 --- a/dev/Usr/LibCF/Ref.h +++ b/dev/Usr/LibCF/Ref.h @@ -9,11 +9,15 @@ #define _REF_H_ #include <LibSCI/SCI.h> +#include <LibCF/Object.h> namespace LibCF { template <typename T> - class CFRef final + class CFRef; + + template <typename T> + class CFRef final CF_OBJECT { public: CFRef() = default; diff --git a/dev/Usr/LibCF/String.h b/dev/Usr/LibCF/String.h index 457a999d..d87c2d2d 100644 --- a/dev/Usr/LibCF/String.h +++ b/dev/Usr/LibCF/String.h @@ -13,4 +13,9 @@ namespace LibCF { class CFString; + class CFString final CF_OBJECT + { + public: + + }; }
\ No newline at end of file diff --git a/dev/Usr/LibFont/Font.h b/dev/Usr/LibFont/Font.h index 48f2e530..73b3a285 100644 --- a/dev/Usr/LibFont/Font.h +++ b/dev/Usr/LibFont/Font.h @@ -6,7 +6,7 @@ #pragma once -#include <LibCF/Core.h> +#include <LibCF/Foundation.h> #define kCFFontExt ".ttf" |