Resolve conflicts with master

1 files changed, 12 insertions, 1 deletions

diff --git a/include/IOSOperator.h b/include/IOSOperator.h
index b195aed..6e5768a 100644
--- a/include/IOSOperator.h
+++ b/include/IOSOperator.h
@@ -26,12 +26,23 @@ public:
 	}

 

 	//! Copies text to the clipboard

+	//! \param text: text in utf-8

 	virtual void copyToClipboard(const c8* text) const = 0;

 

+	//! Copies text to the primary selection

+	//! This is a no-op on some platforms.

+	//! \param text: text in utf-8

+	virtual void copyToPrimarySelection(const c8* text) const = 0;

+

 	//! Get text from the clipboard

-	/** \return Returns 0 if no string is in there. */

+	//! \return Returns 0 if no string is in there, otherwise an utf-8 string.

 	virtual const c8* getTextFromClipboard() const = 0;

 

+	//! Get text from the primary selection

+	//! This is a no-op on some platforms.

+	//! \return Returns 0 if no string is in there, otherwise an utf-8 string.

+	virtual const c8* getTextFromPrimarySelection() const = 0;

+

 	//! Get the total and available system RAM

 	/** \param totalBytes: will contain the total system memory in Kilobytes (1024 B)

 	\param availableBytes: will contain the available memory in Kilobytes (1024 B)