[Core] Moved the rkEvent structure to the pf namespace

Author: paul-manias

include/parasol/modules/core.h

@@ -1611,7 +1611,7 @@ struct OpenInfo {
 #define FDF_SYNONYM    FD_SYNONYM
 
 #define FDF_UNSIGNED    FD_UNSIGNED
-#define FDF_FUNCTION    FD_FUNCTION           // sizeof(struct rkFunction) - use FDF_FUNCTIONPTR for sizeof(APTR)
+#define FDF_FUNCTION    FD_FUNCTION           // sizeof(FUNCTION) - use FDF_FUNCTIONPTR for sizeof(APTR)
 #define FDF_FUNCTIONPTR (FD_FUNCTION|FD_POINTER)
 #define FDF_STRUCT      FD_STRUCT
 #define FDF_RESOURCE    FD_RESOURCE
@@ -4419,22 +4419,22 @@ class objCompressedStream : public Object {
 #include <pthread.h>
 #endif
 
-#ifdef __system__
-
-struct ActionMessage {
-   OBJECTID ObjectID;  // The object that is to receive the action
-   LONG  Time;
-   AC ActionID;        // ID of the action or method to execute
-   bool SendArgs;
+namespace pf {
 
-   // Action arguments follow this structure in a buffer
-};
+#ifdef __system__
+   struct ActionMessage {
+      OBJECTID ObjectID;  // The object that is to receive the action
+      LONG  Time;
+      AC ActionID;        // ID of the action or method to execute
+      bool SendArgs;
 
+      // Action arguments follow this structure in a buffer
+   };
 #endif
 
 // Event support
 
-struct rkEvent {
+struct Event {
    EVENTID EventID;
    // Data follows
 };
@@ -4505,6 +4505,8 @@ struct evHotplug {
    char Vendor[40];      // Name of vendor
 };
 
+} // namespace
+
 namespace fl {
 
 // Read endian values from files and objects.

src/core/defs/core.fdl

@@ -681,7 +681,7 @@ struct OpenInfo {
 #define FDF_SYNONYM    FD_SYNONYM
 
 #define FDF_UNSIGNED    FD_UNSIGNED
-#define FDF_FUNCTION    FD_FUNCTION           // sizeof(struct rkFunction) - use FDF_FUNCTIONPTR for sizeof(APTR)
+#define FDF_FUNCTION    FD_FUNCTION           // sizeof(FUNCTION) - use FDF_FUNCTIONPTR for sizeof(APTR)
 #define FDF_FUNCTIONPTR (FD_FUNCTION|FD_POINTER)
 #define FDF_STRUCT      FD_STRUCT
 #define FDF_RESOURCE    FD_RESOURCE
@@ -2270,22 +2270,22 @@ inline ERR Call(const FUNCTION &Function, ERR &Result) noexcept {
 #include <pthread.h>
 #endif
 
-#ifdef __system__
-
-struct ActionMessage {
-   OBJECTID ObjectID;  // The object that is to receive the action
-   LONG  Time;
-   AC ActionID;        // ID of the action or method to execute
-   bool SendArgs;
+namespace pf {
 
-   // Action arguments follow this structure in a buffer
-};
+#ifdef __system__
+   struct ActionMessage {
+      OBJECTID ObjectID;  // The object that is to receive the action
+      LONG  Time;
+      AC ActionID;        // ID of the action or method to execute
+      bool SendArgs;
 
+      // Action arguments follow this structure in a buffer
+   };
 #endif
 
 // Event support
 
-struct rkEvent {
+struct Event {
    EVENTID EventID;
    // Data follows
 };
@@ -2356,6 +2356,8 @@ struct evHotplug {
    char Vendor[40];      // Name of vendor
 };
 
+} // namespace
+
 namespace fl {
 
 // Read endian values from files and objects.

src/core/lib_events.cpp

@@ -99,14 +99,14 @@ ERR BroadcastEvent(APTR Event, LONG EventSize)
 {
    pf::Log log(__FUNCTION__);
 
-   if ((!Event) or ((size_t)EventSize < sizeof(rkEvent))) return ERR::NullArgs;
+   if ((!Event) or ((size_t)EventSize < sizeof(pf::Event))) return ERR::NullArgs;
 
-   LONG groupmask = 1<<((((rkEvent *)Event)->EventID>>56) & 0xff);
+   LONG groupmask = 1<<((((pf::Event *)Event)->EventID>>56) & 0xff);
 
    if (glEventMask & groupmask) {
       log.trace("Broadcasting event $%.8x%.8x",
-         (ULONG)(((rkEvent *)Event)->EventID>>32 & 0xffffffff),
-         (ULONG)(((rkEvent *)Event)->EventID));
+         (ULONG)(((pf::Event *)Event)->EventID>>32 & 0xffffffff),
+         (ULONG)(((pf::Event *)Event)->EventID));
       SendMessage(MSGID_EVENT, MSF::NIL, Event, EventSize);
    }
 
@@ -294,9 +294,9 @@ ERR msg_event(APTR Custom, LONG MsgID, LONG MsgType, APTR Message, LONG MsgSize)
 {
    pf::Log log(__FUNCTION__);
 
-   if ((!Message) or ((size_t)MsgSize < sizeof(rkEvent))) return ERR::Okay;
+   if ((!Message) or ((size_t)MsgSize < sizeof(pf::Event))) return ERR::Okay;
 
-   rkEvent *eventmsg = (rkEvent *)Message;
+   pf::Event *eventmsg = (pf::Event *)Message;
 
    log.msg(VLF::DETAIL|VLF::BRANCH, "Event $%.8x%8x has been received.", (LONG)((eventmsg->EventID>>32)& 0xffffffff),
       (LONG)(eventmsg->EventID & 0xffffffff));

src/fluid/fluid_functions.cpp

@@ -261,7 +261,7 @@ int fcmd_catch(lua_State *Lua)
 // Where Args is a named array containing the event parameters.  If the event is not known to Fluid, then no Args will
 // be provided.
 
-static void receive_event(rkEvent *Info, LONG InfoSize, APTR CallbackMeta)
+static void receive_event(pf::Event *Info, LONG InfoSize, APTR CallbackMeta)
 {
    auto Script = (objScript *)CurrentContext();
    auto prv = (prvFluid *)Script->ChildPrivate;