summaryrefslogtreecommitdiffstats
path: root/src/libs/engine/events
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/engine/events')
-rw-r--r--src/libs/engine/events/DestroyEvent.h4
-rw-r--r--src/libs/engine/events/RenameEvent.cpp2
-rw-r--r--src/libs/engine/events/RenameEvent.h6
-rw-r--r--src/libs/engine/events/RequestMetadataEvent.cpp2
-rw-r--r--src/libs/engine/events/RequestMetadataEvent.h4
-rw-r--r--src/libs/engine/events/SetMetadataEvent.cpp2
-rw-r--r--src/libs/engine/events/SetMetadataEvent.h6
7 files changed, 13 insertions, 13 deletions
diff --git a/src/libs/engine/events/DestroyEvent.h b/src/libs/engine/events/DestroyEvent.h
index 8ad5deba..a0008ea6 100644
--- a/src/libs/engine/events/DestroyEvent.h
+++ b/src/libs/engine/events/DestroyEvent.h
@@ -29,7 +29,7 @@ template<typename T> class TreeNode;
namespace Om {
-class OmObject;
+class GraphObject;
class Patch;
class Node;
class Plugin;
@@ -56,7 +56,7 @@ private:
Path m_path;
Node* m_node;
ListNode<Node*>* m_patch_listnode;
- TreeNode<OmObject*>* m_store_treenode;
+ TreeNode<GraphObject*>* m_store_treenode;
Array<Node*>* m_process_order; // Patch's new process order
DisconnectNodeEvent* m_disconnect_event;
DisconnectPortEvent* m_parent_disconnect_event; // used for input/output nodes
diff --git a/src/libs/engine/events/RenameEvent.cpp b/src/libs/engine/events/RenameEvent.cpp
index f1b74c59..98125fa4 100644
--- a/src/libs/engine/events/RenameEvent.cpp
+++ b/src/libs/engine/events/RenameEvent.cpp
@@ -65,7 +65,7 @@ RenameEvent::pre_process()
return;
}
- OmObject* obj = om->object_store()->find(m_old_path);
+ GraphObject* obj = om->object_store()->find(m_old_path);
if (obj == NULL) {
m_error = OBJECT_NOT_FOUND;
diff --git a/src/libs/engine/events/RenameEvent.h b/src/libs/engine/events/RenameEvent.h
index c1c9fe91..2fd0840e 100644
--- a/src/libs/engine/events/RenameEvent.h
+++ b/src/libs/engine/events/RenameEvent.h
@@ -27,7 +27,7 @@ template<typename T> class ListNode;
namespace Om {
-class OmObject;
+class GraphObject;
class Patch;
class Node;
class Plugin;
@@ -35,7 +35,7 @@ class DisconnectNodeEvent;
class DisconnectPortEvent;
-/** An event to change the name of an OmObject.
+/** An event to change the name of an GraphObject.
*
* \ingroup engine
*/
@@ -56,7 +56,7 @@ private:
string m_name;
Path m_new_path;
Patch* m_parent_patch;
- TreeNode<OmObject*>* m_store_treenode;
+ TreeNode<GraphObject*>* m_store_treenode;
ErrorType m_error;
};
diff --git a/src/libs/engine/events/RequestMetadataEvent.cpp b/src/libs/engine/events/RequestMetadataEvent.cpp
index 10e1007c..79185b8a 100644
--- a/src/libs/engine/events/RequestMetadataEvent.cpp
+++ b/src/libs/engine/events/RequestMetadataEvent.cpp
@@ -19,7 +19,7 @@
#include "Responder.h"
#include "Om.h"
#include "OmApp.h"
-#include "OmObject.h"
+#include "GraphObject.h"
#include "ObjectStore.h"
#include "interface/ClientInterface.h"
#include "ClientBroadcaster.h"
diff --git a/src/libs/engine/events/RequestMetadataEvent.h b/src/libs/engine/events/RequestMetadataEvent.h
index e4243eb3..e8450210 100644
--- a/src/libs/engine/events/RequestMetadataEvent.h
+++ b/src/libs/engine/events/RequestMetadataEvent.h
@@ -24,7 +24,7 @@ using std::string;
namespace Om {
-class OmObject;
+class GraphObject;
namespace Shared {
class ClientInterface;
} using Shared::ClientInterface;
@@ -46,7 +46,7 @@ private:
string m_path;
string m_key;
string m_value;
- OmObject* m_object;
+ GraphObject* m_object;
CountedPtr<ClientInterface> m_client;
};
diff --git a/src/libs/engine/events/SetMetadataEvent.cpp b/src/libs/engine/events/SetMetadataEvent.cpp
index 614f7ca9..905c377c 100644
--- a/src/libs/engine/events/SetMetadataEvent.cpp
+++ b/src/libs/engine/events/SetMetadataEvent.cpp
@@ -20,7 +20,7 @@
#include "Om.h"
#include "OmApp.h"
#include "ClientBroadcaster.h"
-#include "OmObject.h"
+#include "GraphObject.h"
#include "ObjectStore.h"
using std::string;
diff --git a/src/libs/engine/events/SetMetadataEvent.h b/src/libs/engine/events/SetMetadataEvent.h
index ef471033..6e98158f 100644
--- a/src/libs/engine/events/SetMetadataEvent.h
+++ b/src/libs/engine/events/SetMetadataEvent.h
@@ -24,10 +24,10 @@ using std::string;
namespace Om {
-class OmObject;
+class GraphObject;
-/** An event to set a piece of metadata for an OmObject.
+/** An event to set a piece of metadata for an GraphObject.
*
* \ingroup engine
*/
@@ -44,7 +44,7 @@ private:
string m_path;
string m_key;
string m_value;
- OmObject* m_object;
+ GraphObject* m_object;
};