From 87ba85eaabbfd5fd7ad8ca8136f4783b1d932264 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Wed, 24 Apr 2013 09:35:38 -0700
Subject: =?UTF-8?q?=C3=AF=C2=BB=C2=BFdiff=20-r=2059c7bed66dfd=20indra/llco?=
=?UTF-8?q?mmon/lleventapi.h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
indra/llui/llconsole.h | 2 +-
indra/llui/llfloater.h | 2 +-
indra/llui/lllayoutstack.h | 2 +-
indra/llui/llnotifications.cpp | 4 ++--
indra/llui/llnotifications.h | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'indra/llui')
diff --git a/indra/llui/llconsole.h b/indra/llui/llconsole.h
index b264aeb7eb..5ff05698b0 100644
--- a/indra/llui/llconsole.h
+++ b/indra/llui/llconsole.h
@@ -34,7 +34,7 @@
class LLSD;
-class LLConsole : public LLFixedBuffer, public LLUICtrl, public INSTANCE_TRACKER(LLConsole)
+class LLConsole : public LLFixedBuffer, public LLUICtrl, public LLInstanceTracker<LLConsole>
{
public:
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index f28ceb0ce4..99d1d2614d 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -116,7 +116,7 @@ struct LLCoordFloater : LLCoord<LL_COORD_FLOATER>
};
-class LLFloater : public LLPanel, public INSTANCE_TRACKER(LLFloater)
+class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater>
{
friend class LLFloaterView;
friend class LLFloaterReg;
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index a8b5466242..8e330278af 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -35,7 +35,7 @@
class LLLayoutPanel;
-class LLLayoutStack : public LLView, public INSTANCE_TRACKER(LLLayoutStack)
+class LLLayoutStack : public LLView, public LLInstanceTracker<LLLayoutStack>
{
public:
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 8bafbd53d8..1789f003b9 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -1121,7 +1121,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
LLNotificationChannel::LLNotificationChannel(const Params& p)
: LLNotificationChannelBase(p.filter()),
- LLInstanceTracker<LLNotificationChannel, InstanceTrackType_LLNotificationContext, std::string>(p.name.isProvided() ? p.name : LLUUID::generateNewID().asString()),
+ LLInstanceTracker<LLNotificationChannel, std::string>(p.name.isProvided() ? p.name : LLUUID::generateNewID().asString()),
mName(p.name.isProvided() ? p.name : LLUUID::generateNewID().asString())
{
BOOST_FOREACH(const std::string& source, p.sources)
@@ -1135,7 +1135,7 @@ LLNotificationChannel::LLNotificationChannel(const std::string& name,
const std::string& parent,
LLNotificationFilter filter)
: LLNotificationChannelBase(filter),
- LLInstanceTracker<LLNotificationChannel, InstanceTrackType_LLNotificationContext, std::string>(name),
+ LLInstanceTracker<LLNotificationChannel, std::string>(name),
mName(name)
{
// bind to notification broadcast
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 2561125aa5..cd3728305e 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -135,11 +135,11 @@ typedef LLFunctorRegistration<LLNotificationResponder> LLNotificationFunctorRegi
// context data that can be looked up via a notification's payload by the display logic
// derive from this class to implement specific contexts
-class LLNotificationContext : public INSTANCE_TRACKER_KEYED(LLNotificationContext, LLUUID)
+class LLNotificationContext : public LLInstanceTracker<LLNotificationContext, LLUUID>
{
public:
- LLNotificationContext() : INSTANCE_TRACKER_KEYED(LLNotificationContext, LLUUID)(LLUUID::generateNewID())
+ LLNotificationContext() : LLInstanceTracker<LLNotificationContext, LLUUID>(LLUUID::generateNewID())
{
}
@@ -815,7 +815,7 @@ typedef boost::intrusive_ptr<LLNotificationChannel> LLNotificationChannelPtr;
class LLNotificationChannel :
boost::noncopyable,
public LLNotificationChannelBase,
- public LLInstanceTracker<LLNotificationChannel, InstanceTrackType_LLNotificationContext, std::string>
+ public LLInstanceTracker<LLNotificationChannel, std::string>
{
LOG_CLASS(LLNotificationChannel);
--
cgit v1.2.3