1 files changed, 19 insertions, 39 deletions
diff --git a/source/blender/compositor/intern/COM_Socket.h b/source/blender/compositor/intern/COM_Socket.h
index 8ad7a5c7fde..7c5c2198a16 100644
--- a/source/blender/compositor/intern/COM_Socket.h
+++ b/source/blender/compositor/intern/COM_Socket.h
@@ -34,35 +34,29 @@ class SocketConnection;
 class NodeBase;
 
 /**
-  * @brief Base class for InputSocket and OutputSocket.
-  *
-  * A socket are the points on an node where the user can make a connection between.
-  * Sockets are always part of a node or an operation.
-  *
-  * @see InputSocket
-  * @see OutputSocket
-  * @see SocketConnection - a connection between an InputSocket and an OutputSocket
-  * @ingroup Model
-  */
+ * @brief Base class for InputSocket and OutputSocket.
+ *
+ * A socket are the points on an node where the user can make a connection between.
+ * Sockets are always part of a node or an operation.
+ *
+ * @see InputSocket
+ * @see OutputSocket
+ * @see SocketConnection - a connection between an InputSocket and an OutputSocket
+ * @ingroup Model
+ */
 class Socket {
 private:
 	/**
-	  * Reference to the node where this Socket belongs to
-	  */
+	 * Reference to the node where this Socket belongs to
+	 */
 	NodeBase *node;
 	
 	/**
-	  * the datatype of this socket. Is used for automatically data transformation.
-	  * @section data-conversion
-	  */
+	 * the datatype of this socket. Is used for automatically data transformation.
+	 * @section data-conversion
+	 */
 	DataType datatype;
 	
-	/**
-	  * the actual data type during execution. This can be different than the field datatype, based on the conversion rules of the node
-	  * @section data-conversion
-	  */
-	DataType actualType;
-	
 	bNodeSocket *editorSocket;
 public:
 	Socket(DataType datatype);
@@ -71,28 +65,14 @@ public:
 	void setNode(NodeBase *node);
 	NodeBase *getNode() const;
 	
-	/**
-	  * @brief get the actual data type
-	  *
-	  * @note The actual data type can differ from the data type this socket expects.
-	  * @return actual DataType
-	  */
-	DataType getActualDataType() const;
-	
-	/**
-	  * @brief set the actual data type
-	  * @param actualType the new actual type
-	  */
-	void setActualDataType(DataType actualType);
-	
+
 	const virtual int isConnected() const;
 	int isInputSocket() const;
 	int isOutputSocket() const;
 	virtual void determineResolution(int resolution[], unsigned int preferredResolution[]) {}
-	virtual void determineActualDataType() {}
-	
-	void setEditorSocket(bNodeSocket *editorSocket) {this->editorSocket = editorSocket;}
-	bNodeSocket *getbNodeSocket() const {return this->editorSocket;}
+
+	void setEditorSocket(bNodeSocket *editorSocket) { this->editorSocket = editorSocket; }
+	bNodeSocket *getbNodeSocket() const { return this->editorSocket; }
 	
 };