зеркало из https://github.com/mozilla/gecko-dev.git
Renaming {SetTransferable(), GetTransferable()} to {SetData(), GetData()} per our clipboard meeting this morning.
This commit is contained in:
Родитель
ef38161f23
Коммит
9ca74801dc
|
@ -34,25 +34,23 @@ class nsIClipboard : public nsISupports {
|
|||
public:
|
||||
|
||||
/**
|
||||
* Set the transferable object onto the clipboard,
|
||||
* it is used to get and set the data from the native clipboard
|
||||
* Given a transferable, set the data on the native clipboard
|
||||
*
|
||||
* @param aTransferable The transferable
|
||||
* @param anOwner The owner of the transferable
|
||||
* @result NS_Ok if no errors
|
||||
*/
|
||||
|
||||
NS_IMETHOD SetTransferable(nsITransferable * aTransferable, nsIClipboardOwner * anOwner) = 0;
|
||||
NS_IMETHOD SetData(nsITransferable * aTransferable, nsIClipboardOwner * anOwner) = 0;
|
||||
|
||||
/**
|
||||
* Gets the transferable object from the clipboard,
|
||||
* it is used to get and set the data from the native clipboard
|
||||
* Given a transferable, get the clipboard data.
|
||||
*
|
||||
* @param aTransferable The transferable
|
||||
* @result NS_Ok if no errors
|
||||
*/
|
||||
|
||||
NS_IMETHOD GetTransferable(nsITransferable ** aTransferable) = 0;
|
||||
NS_IMETHOD GetData(nsITransferable ** aTransferable) = 0;
|
||||
|
||||
/**
|
||||
* Gets the data from the clipboard and put it into the transferable object
|
||||
|
|
|
@ -105,7 +105,7 @@ nsresult nsClipboard::QueryInterface(const nsIID& aIID, void** aInstancePtr)
|
|||
* Sets the transferable object
|
||||
*
|
||||
*/
|
||||
NS_IMETHODIMP nsClipboard::SetTransferable(nsITransferable * aTransferable, nsIClipboardOwner * anOwner)
|
||||
NS_IMETHODIMP nsClipboard::SetData(nsITransferable * aTransferable, nsIClipboardOwner * anOwner)
|
||||
{
|
||||
if (aTransferable == mTransferable && anOwner == mClipboardOwner) {
|
||||
return NS_OK;
|
||||
|
@ -130,7 +130,7 @@ NS_IMETHODIMP nsClipboard::SetTransferable(nsITransferable * aTransferable, nsIC
|
|||
* Gets the transferable object
|
||||
*
|
||||
*/
|
||||
NS_IMETHODIMP nsClipboard::GetTransferable(nsITransferable ** aTransferable)
|
||||
NS_IMETHODIMP nsClipboard::GetData(nsITransferable ** aTransferable)
|
||||
{
|
||||
*aTransferable = mTransferable;
|
||||
if (nsnull != mTransferable) {
|
||||
|
|
|
@ -43,8 +43,8 @@ public:
|
|||
|
||||
|
||||
// nsIClipboard
|
||||
NS_IMETHOD SetTransferable(nsITransferable * aTransferable, nsIClipboardOwner * anOwner);
|
||||
NS_IMETHOD GetTransferable(nsITransferable ** aTransferable);
|
||||
NS_IMETHOD SetData(nsITransferable * aTransferable, nsIClipboardOwner * anOwner);
|
||||
NS_IMETHOD GetData(nsITransferable ** aTransferable);
|
||||
|
||||
NS_IMETHOD GetClipboard();
|
||||
NS_IMETHOD SetClipboard();
|
||||
|
|
Загрузка…
Ссылка в новой задаче