From 1fad6a680d7ab7480260ef07efb8ac9321ae86ea Mon Sep 17 00:00:00 2001 From: ZiRee Date: Wed, 8 Feb 2012 14:39:02 +0100 Subject: [PATCH] Move getInstance() to instance() --- indra/newview/llfloaternearbychat.cpp | 2 +- indra/newview/llgesturemgr.cpp | 2 +- indra/newview/llnearbychatbarlistener.cpp | 2 +- indra/newview/llnearbychatcontrol.cpp | 2 +- indra/newview/llviewergesture.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/newview/llfloaternearbychat.cpp b/indra/newview/llfloaternearbychat.cpp index 4c6004064f..8662c47e65 100644 --- a/indra/newview/llfloaternearbychat.cpp +++ b/indra/newview/llfloaternearbychat.cpp @@ -524,7 +524,7 @@ BOOL LLFloaterNearbyChat::handleKeyHere( KEY key, MASK mask ) if (handled == TRUE) { - LLNearbyChat::getInstance()->sendChat(mInputEditor->getConvertedText(),type); + LLNearbyChat::instance().sendChat(mInputEditor->getConvertedText(),type); } return handled; diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp index 6d6c7ec99b..02143ec36a 100644 --- a/indra/newview/llgesturemgr.cpp +++ b/indra/newview/llgesturemgr.cpp @@ -1012,7 +1012,7 @@ void LLGestureMgr::runStep(LLMultiGesture* gesture, LLGestureStep* step) // Remove floating chat bar // LLNearbyChatBar::getInstance()->sendChatFromViewer(chat_text, CHAT_TYPE_NORMAL, animate); - LLNearbyChat::getInstance()->sendChatFromViewer(chat_text, CHAT_TYPE_NORMAL, animate); + LLNearbyChat::instance().sendChatFromViewer(chat_text, CHAT_TYPE_NORMAL, animate); // gesture->mCurrentStep++; diff --git a/indra/newview/llnearbychatbarlistener.cpp b/indra/newview/llnearbychatbarlistener.cpp index 892a0b7e3c..2249aa594d 100644 --- a/indra/newview/llnearbychatbarlistener.cpp +++ b/indra/newview/llnearbychatbarlistener.cpp @@ -104,7 +104,7 @@ void LLNearbyChatBarListener::sendChat(LLSD const & chat_data) const // Send it as if it was typed in // Remove floating chat bar // mChatbar.sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0)); - LLNearbyChat::getInstance()->sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0)); + LLNearbyChat::instance().sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0)); // } diff --git a/indra/newview/llnearbychatcontrol.cpp b/indra/newview/llnearbychatcontrol.cpp index 2d26fe2400..82951deaa4 100644 --- a/indra/newview/llnearbychatcontrol.cpp +++ b/indra/newview/llnearbychatcontrol.cpp @@ -100,7 +100,7 @@ LLNearbyChatControl::LLNearbyChatControl(const LLNearbyChatControl::Params& p) : LLLineEditor(p) { setKeystrokeCallback(onKeystroke,this); - LLNearbyChat::getInstance()->registerChatBar(this); + LLNearbyChat::instance().registerChatBar(this); setEnableLineHistory(TRUE); setIgnoreArrowKeys( FALSE ); diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp index 94b31ba408..1c20b778ee 100644 --- a/indra/newview/llviewergesture.cpp +++ b/indra/newview/llviewergesture.cpp @@ -135,7 +135,7 @@ void LLViewerGesture::doTrigger( BOOL send_chat ) // with the gesture animation. // Remove floating chat bar // LLNearbyChatBar::getInstance()->sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE); - LLNearbyChat::getInstance()->sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE); + LLNearbyChat::instance().sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE); } }