livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-1841 : Use instance instead of getInstance on LLClipboard singleton.

master
Merov Linden 2012-03-01 21:35:05 -08:00
parent 24789f11cc
commit f0a1b43f22
14 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llclipboard.h
View File

@ -42,7 +42,7 @@ typedef boost::function<void ()> cleanup_callback_t;
// Class LLClipboard
//
// This class is used to cut/copy/paste text strings and inventory items around
// the world. Use LLClipboard::getInstance()->method() to use its methods.
// the world. Use LLClipboard::instance().method() to use its methods.
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
class LLClipboard : public LLSingleton<LLClipboard>

12
indra/llui/lllineeditor.cpp
View File

@ -1047,7 +1047,7 @@ void LLLineEditor::cut()
// Prepare for possible rollback
LLLineEditorRollback rollback( this );
LLClipboard::getInstance()->copyToClipboard( mText.getWString(), left_pos, length );
LLClipboard::instance().copyToClipboard( mText.getWString(), left_pos, length );
deleteSelection();
// Validate new string and rollback the if needed.
@ -1078,13 +1078,13 @@ void LLLineEditor::copy()
{
S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
S32 length = llabs( mSelectionStart - mSelectionEnd );
LLClipboard::getInstance()->copyToClipboard( mText.getWString(), left_pos, length );
LLClipboard::instance().copyToClipboard( mText.getWString(), left_pos, length );
}
}
BOOL LLLineEditor::canPaste() const
{
return !mReadOnly && LLClipboard::getInstance()->isTextAvailable();
return !mReadOnly && LLClipboard::instance().isTextAvailable();
}
void LLLineEditor::paste()
@ -1115,7 +1115,7 @@ void LLLineEditor::pasteHelper(bool is_primary)
if (can_paste_it)
{
LLWString paste;
LLClipboard::getInstance()->pasteFromClipboard(paste, is_primary);
LLClipboard::instance().pasteFromClipboard(paste, is_primary);
if (!paste.empty())
{
@ -1202,13 +1202,13 @@ void LLLineEditor::copyPrimary()
{
S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
S32 length = llabs( mSelectionStart - mSelectionEnd );
LLClipboard::getInstance()->copyToClipboard( mText.getWString(), left_pos, length, true);
LLClipboard::instance().copyToClipboard( mText.getWString(), left_pos, length, true);
}
}
BOOL LLLineEditor::canPastePrimary() const
{
return !mReadOnly && LLClipboard::getInstance()->isTextAvailable(true);
return !mReadOnly && LLClipboard::instance().isTextAvailable(true);
}
void LLLineEditor::updatePrimary()

2
indra/llui/llscrolllistctrl.cpp
View File

@ -2504,7 +2504,7 @@ void LLScrollListCtrl::copy()
{
buffer += (*itor)->getContentsCSV() + "\n";
}
LLClipboard::getInstance()->copyToClipboard(utf8str_to_wstring(buffer), 0, buffer.length());
LLClipboard::instance().copyToClipboard(utf8str_to_wstring(buffer), 0, buffer.length());
}
// virtual

12
indra/llui/lltexteditor.cpp
View File

@ -1332,7 +1332,7 @@ void LLTextEditor::cut()
}
S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
S32 length = llabs( mSelectionStart - mSelectionEnd );
LLClipboard::getInstance()->copyToClipboard( getWText(), left_pos, length);
LLClipboard::instance().copyToClipboard( getWText(), left_pos, length);
deleteSelection( FALSE );
onKeyStroke();
@ -1352,12 +1352,12 @@ void LLTextEditor::copy()
}
S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
S32 length = llabs( mSelectionStart - mSelectionEnd );
LLClipboard::getInstance()->copyToClipboard(getWText(), left_pos, length);
LLClipboard::instance().copyToClipboard(getWText(), left_pos, length);
}
BOOL LLTextEditor::canPaste() const
{
return !mReadOnly && LLClipboard::getInstance()->isTextAvailable();
return !mReadOnly && LLClipboard::instance().isTextAvailable();
}
// paste from clipboard
@ -1394,7 +1394,7 @@ void LLTextEditor::pasteHelper(bool is_primary)
}
LLWString paste;
LLClipboard::getInstance()->pasteFromClipboard(paste, is_primary);
LLClipboard::instance().pasteFromClipboard(paste, is_primary);
if (paste.empty())
{
@ -1467,12 +1467,12 @@ void LLTextEditor::copyPrimary()
}
S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
S32 length = llabs( mSelectionStart - mSelectionEnd );
LLClipboard::getInstance()->copyToClipboard(getWText(), left_pos, length, true);
LLClipboard::instance().copyToClipboard(getWText(), left_pos, length, true);
}
BOOL LLTextEditor::canPastePrimary() const
{
return !mReadOnly && LLClipboard::getInstance()->isTextAvailable(true);
return !mReadOnly && LLClipboard::instance().isTextAvailable(true);
}
void LLTextEditor::updatePrimary()

10
indra/newview/llfavoritesbar.cpp
View File

@ -1118,7 +1118,7 @@ BOOL LLFavoritesBarCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
}
void copy_slurl_to_clipboard_cb(std::string& slurl)
{
LLClipboard::getInstance()->copyToClipboard(utf8str_to_wstring(slurl),0,slurl.size());
LLClipboard::instance().copyToClipboard(utf8str_to_wstring(slurl),0,slurl.size());
LLSD args;
args["SLURL"] = slurl;
@ -1187,7 +1187,7 @@ void LLFavoritesBarCtrl::doToSelected(const LLSD& userdata)
}
else if (action == "copy")
{
LLClipboard::getInstance()->copyToClipboard(mSelectedItemID, LLAssetType::AT_LANDMARK);
LLClipboard::instance().copyToClipboard(mSelectedItemID, LLAssetType::AT_LANDMARK);
}
else if (action == "paste")
{
@ -1211,13 +1211,13 @@ void LLFavoritesBarCtrl::doToSelected(const LLSD& userdata)
BOOL LLFavoritesBarCtrl::isClipboardPasteable() const
{
if (!LLClipboard::getInstance()->hasContents())
if (!LLClipboard::instance().hasContents())
{
return FALSE;
}
LLDynamicArray<LLUUID> objects;
LLClipboard::getInstance()->pasteFromClipboard(objects);
LLClipboard::instance().pasteFromClipboard(objects);
S32 count = objects.count();
for(S32 i = 0; i < count; i++)
{
@ -1246,7 +1246,7 @@ void LLFavoritesBarCtrl::pastFromClipboard() const
{
LLInventoryItem* item = NULL;
LLDynamicArray<LLUUID> objects;
LLClipboard::getInstance()->pasteFromClipboard(objects);
LLClipboard::instance().pasteFromClipboard(objects);
S32 count = objects.count();
LLUUID parent_id(mFavoriteFolderId);
for(S32 i = 0; i < count; i++)

14
indra/newview/llfloatergesture.cpp
View File

@ -397,11 +397,11 @@ bool LLFloaterGesture::isActionEnabled(const LLSD& command)
std::string command_name = command.asString();
if("paste" == command_name)
{
if(!LLClipboard::getInstance()->hasContents())
if(!LLClipboard::instance().hasContents())
return false;
LLDynamicArray<LLUUID> ids;
LLClipboard::getInstance()->pasteFromClipboard(ids);
LLClipboard::instance().pasteFromClipboard(ids);
for(LLDynamicArray<LLUUID>::iterator it = ids.begin(); it != ids.end(); it++)
{
LLInventoryItem* item = gInventory.getItem(*it);
@ -502,20 +502,20 @@ void LLFloaterGesture::onCopyPasteAction(const LLSD& command)
uuid_vec_t ids;
getSelectedIds(ids);
// Make sure the clipboard is empty
LLClipboard::getInstance()->reset();
LLClipboard::instance().reset();
for(uuid_vec_t::iterator it = ids.begin(); it != ids.end(); it++)
{
LLInventoryItem* item = gInventory.getItem(*it);
if(item && item->getInventoryType() == LLInventoryType::IT_GESTURE)
{
LLClipboard::getInstance()->addToClipboard(item->getUUID(),LLAssetType::AT_GESTURE);
LLClipboard::instance().addToClipboard(item->getUUID(),LLAssetType::AT_GESTURE);
}
}
}
else if ("paste" == command_name)
{
LLDynamicArray<LLUUID> ids;
LLClipboard::getInstance()->pasteFromClipboard(ids);
LLClipboard::instance().pasteFromClipboard(ids);
if(ids.empty() || !gInventory.isCategoryComplete(mGestureFolderID))
return;
LLInventoryCategory* gesture_dir = gInventory.getCategory(mGestureFolderID);
@ -535,11 +535,11 @@ void LLFloaterGesture::onCopyPasteAction(const LLSD& command)
gesture_dir->getUUID(), getString("copy_name", string_args), cb);
}
}
LLClipboard::getInstance()->reset();
LLClipboard::instance().reset();
}
else if ("copy_uuid" == command_name)
{
LLClipboard::getInstance()->copyToClipboard(mGestureList->getCurrentID(),LLAssetType::AT_GESTURE);
LLClipboard::instance().copyToClipboard(mGestureList->getCurrentID(),LLAssetType::AT_GESTURE);
}
}

10
indra/newview/llfolderview.cpp
View File

@ -1018,12 +1018,12 @@ bool isDescendantOfASelectedItem(LLFolderViewItem* item, const std::vector<LLFol
void LLFolderView::removeCutItems()
{
// There's no item in "cut" mode on the clipboard -> exit
if (!LLClipboard::getInstance()->isCutMode())
if (!LLClipboard::instance().isCutMode())
return;
// Get the list of clipboard item uuids and iterate through them
LLDynamicArray<LLUUID> objects;
LLClipboard::getInstance()->pasteFromClipboard(objects);
LLClipboard::instance().pasteFromClipboard(objects);
for (LLDynamicArray<LLUUID>::const_iterator iter = objects.begin();
iter != objects.end();
++iter)
@ -1323,7 +1323,7 @@ BOOL LLFolderView::canCopy() const
void LLFolderView::copy()
{
// *NOTE: total hack to clear the inventory clipboard
LLClipboard::getInstance()->reset();
LLClipboard::instance().reset();
S32 count = mSelectedItems.size();
if(getVisible() && getEnabled() && (count > 0))
{
@ -1364,7 +1364,7 @@ BOOL LLFolderView::canCut() const
void LLFolderView::cut()
{
// clear the inventory clipboard
LLClipboard::getInstance()->reset();
LLClipboard::instance().reset();
S32 count = mSelectedItems.size();
if(getVisible() && getEnabled() && (count > 0))
{
@ -2141,7 +2141,7 @@ bool LLFolderView::doToSelected(LLInventoryModel* model, const LLSD& userdata)
if (("copy" == action) || ("cut" == action))
{
// Clear the clipboard before we start adding things on it
LLClipboard::getInstance()->reset();
LLClipboard::instance().reset();
}
static const std::string change_folder_string = "change_folder_type_";

32
indra/newview/llinventorybridge.cpp
View File

@ -220,8 +220,8 @@ BOOL LLInvFVBridge::cutToClipboard() const
const LLInventoryObject* obj = gInventory.getObject(mUUID);
if (obj && isItemMovable() && isItemRemovable())
{
LLClipboard::getInstance()->setCutMode(true, boost::bind(LLFolderView::removeCutItems));
return LLClipboard::getInstance()->addToClipboard(mUUID);
LLClipboard::instance().setCutMode(true, boost::bind(LLFolderView::removeCutItems));
return LLClipboard::instance().addToClipboard(mUUID);
}
return FALSE;
}
@ -231,7 +231,7 @@ BOOL LLInvFVBridge::copyToClipboard() const
const LLInventoryObject* obj = gInventory.getObject(mUUID);
if (obj && isItemCopyable())
{
return LLClipboard::getInstance()->addToClipboard(mUUID);
return LLClipboard::instance().addToClipboard(mUUID);
}
return FALSE;
}
@ -419,7 +419,7 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
BOOL LLInvFVBridge::isClipboardPasteable() const
{
if (!LLClipboard::getInstance()->hasContents() || !isAgentInventory())
if (!LLClipboard::instance().hasContents() || !isAgentInventory())
{
return FALSE;
}
@ -430,7 +430,7 @@ BOOL LLInvFVBridge::isClipboardPasteable() const
}
LLDynamicArray<LLUUID> objects;
LLClipboard::getInstance()->pasteFromClipboard(objects);
LLClipboard::instance().pasteFromClipboard(objects);
S32 count = objects.count();
for(S32 i = 0; i < count; i++)
{
@ -457,7 +457,7 @@ BOOL LLInvFVBridge::isClipboardPasteable() const
BOOL LLInvFVBridge::isClipboardPasteableAsLink() const
{
if (!LLClipboard::getInstance()->hasContents() || !isAgentInventory())
if (!LLClipboard::instance().hasContents() || !isAgentInventory())
{
return FALSE;
}
@ -468,7 +468,7 @@ BOOL LLInvFVBridge::isClipboardPasteableAsLink() const
}
LLDynamicArray<LLUUID> objects;
LLClipboard::getInstance()->pasteFromClipboard(objects);
LLClipboard::instance().pasteFromClipboard(objects);
S32 count = objects.count();
for(S32 i = 0; i < count; i++)
{
@ -643,7 +643,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
{
items.push_back(std::string("Paste"));
}
if ((!LLClipboard::getInstance()->isCutMode() && !isClipboardPasteable()) || ((flags & FIRST_SELECTED_ITEM) == 0))
if ((!LLClipboard::instance().isCutMode() && !isClipboardPasteable()) || ((flags & FIRST_SELECTED_ITEM) == 0))
{
disabled_items.push_back(std::string("Paste"));
}
@ -1833,7 +1833,7 @@ BOOL LLFolderBridge::isClipboardPasteable() const
}
LLDynamicArray<LLUUID> objects;
LLClipboard::getInstance()->pasteFromClipboard(objects);
LLClipboard::instance().pasteFromClipboard(objects);
const LLViewerInventoryCategory *current_cat = getCategory();
// Search for the direct descendent of current Friends subfolder among all pasted items,
@ -1871,7 +1871,7 @@ BOOL LLFolderBridge::isClipboardPasteableAsLink() const
const BOOL is_in_friend_folder = LLFriendCardsManager::instance().isCategoryInFriendFolder( current_cat );
const LLUUID &current_cat_id = current_cat->getUUID();
LLDynamicArray<LLUUID> objects;
LLClipboard::getInstance()->pasteFromClipboard(objects);
LLClipboard::instance().pasteFromClipboard(objects);
S32 count = objects.count();
for(S32 i = 0; i < count; i++)
{
@ -2910,7 +2910,7 @@ bool LLFolderBridge::removeItemResponse(const LLSD& notification, const LLSD& re
void LLFolderBridge::pasteFromClipboard()
{
LLInventoryModel* model = getInventoryModel();
if (model && (isClipboardPasteable() || LLClipboard::getInstance()->isCutMode()))
if (model && (isClipboardPasteable() || LLClipboard::instance().isCutMode()))
{
const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT, false);
const LLUUID &outbox_id = model->findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false);
@ -2920,7 +2920,7 @@ void LLFolderBridge::pasteFromClipboard()
const BOOL move_is_into_outbox = model->isObjectDescendentOf(mUUID, outbox_id);
LLDynamicArray<LLUUID> objects;
LLClipboard::getInstance()->pasteFromClipboard(objects);
LLClipboard::instance().pasteFromClipboard(objects);
if (move_is_into_outbox)
{
@ -2980,7 +2980,7 @@ void LLFolderBridge::pasteFromClipboard()
dropToOutfit(item, move_is_into_current_outfit);
}
}
else if (LLClipboard::getInstance()->isCutMode())
else if (LLClipboard::instance().isCutMode())
{
// Do a move to "paste" a "cut"
// move_inventory_item() is not enough, as we have to update inventory locally too
@ -3029,7 +3029,7 @@ void LLFolderBridge::pasteFromClipboard()
}
}
// Change mode to paste for next paste
LLClipboard::getInstance()->setCutMode(false);
LLClipboard::instance().setCutMode(false);
}
}
@ -3054,7 +3054,7 @@ void LLFolderBridge::pasteLinkFromClipboard()
const LLUUID parent_id(mUUID);
LLDynamicArray<LLUUID> objects;
LLClipboard::getInstance()->pasteFromClipboard(objects);
LLClipboard::instance().pasteFromClipboard(objects);
for (LLDynamicArray<LLUUID>::const_iterator iter = objects.begin();
iter != objects.end();
++iter)
@ -3093,7 +3093,7 @@ void LLFolderBridge::pasteLinkFromClipboard()
}
}
// Change mode to paste for next paste
LLClipboard::getInstance()->setCutMode(false);
LLClipboard::instance().setCutMode(false);
}
}

4
indra/newview/llinventoryfilter.cpp
View File

@ -322,13 +322,13 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLInventoryItem* item) cons
// is on the clipboard must be filtered out if the clipboard is in the "cut" mode.
bool LLInventoryFilter::checkAgainstClipboard(const LLUUID& object_id) const
{
if (LLClipboard::getInstance()->isCutMode())
if (LLClipboard::instance().isCutMode())
{
LLUUID current_id = object_id;
LLInventoryObject *current_object = gInventory.getObject(object_id);
while (current_id.notNull() && current_object)
{
if (LLClipboard::getInstance()->isOnClipboard(current_id))
if (LLClipboard::instance().isOnClipboard(current_id))
{
return false;
}

8
indra/newview/llinventorypanel.cpp
View File

@ -249,7 +249,7 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
}
// keep track of the clipboard state so that we avoid filtering too much
mClipboardState = LLClipboard::getInstance()->getState();
mClipboardState = LLClipboard::instance().getState();
// Initialize base class params.
LLPanel::initFromParams(params);
@ -283,10 +283,10 @@ void LLInventoryPanel::draw()
mFolderRoot->updateSelection();
// Nudge the filter if the clipboard state changed
if (mClipboardState != LLClipboard::getInstance()->getState())
if (mClipboardState != LLClipboard::instance().getState())
{
mClipboardState = LLClipboard::getInstance()->getState();
getFilter()->setModified(LLClipboard::getInstance()->isCutMode() ? LLInventoryFilter::FILTER_MORE_RESTRICTIVE : LLInventoryFilter::FILTER_LESS_RESTRICTIVE);
mClipboardState = LLClipboard::instance().getState();
getFilter()->setModified(LLClipboard::instance().isCutMode() ? LLInventoryFilter::FILTER_MORE_RESTRICTIVE : LLInventoryFilter::FILTER_LESS_RESTRICTIVE);
}
LLPanel::draw();

2
indra/newview/llpanelteleporthistory.cpp
View File

@ -358,7 +358,7 @@ void LLTeleportHistoryPanel::ContextMenu::onInfo()
//static
void LLTeleportHistoryPanel::ContextMenu::gotSLURLCallback(const std::string& slurl)
{
LLClipboard::getInstance()->copyToClipboard(utf8str_to_wstring(slurl),0,slurl.size());
LLClipboard::instance().copyToClipboard(utf8str_to_wstring(slurl),0,slurl.size());
}
void LLTeleportHistoryPanel::ContextMenu::onCopyToClipboard()

2
indra/newview/llpaneltopinfobar.cpp
View File

@ -467,7 +467,7 @@ void LLPanelTopInfoBar::onContextMenuItemClicked(const LLSD::String& item)
LLAgentUI::buildSLURL(slurl, false);
LLUIString location_str(slurl.getSLURLString());
LLClipboard::getInstance()->copyToClipboard(location_str,0,location_str.length());
LLClipboard::instance().copyToClipboard(location_str,0,location_str.length());
}
}

2
indra/newview/llpanelwearing.cpp
View File

@ -302,6 +302,6 @@ void LLPanelWearing::copyToClipboard()
}
}
LLClipboard::getInstance()->copyToClipboard(utf8str_to_wstring(text),0,text.size());
LLClipboard::instance().copyToClipboard(utf8str_to_wstring(text),0,text.size());
}
// EOF

2
indra/newview/llurllineeditorctrl.cpp
View File

@ -89,5 +89,5 @@ void LLURLLineEditor::copyEscapedURLToClipboard()
else // human-readable location
text_to_copy = utf8str_to_wstring(unescaped_text);
LLClipboard::getInstance()->copyToClipboard(text_to_copy, 0, text_to_copy.size());
LLClipboard::instance().copyToClipboard(text_to_copy, 0, text_to_copy.size());
}