From 6b81b8629e67d82a7620e48781ded73b6e6126ea Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Sun, 5 May 2013 17:45:35 -0700
Subject: Spring cleaning: removed unused .cpp and.h files, and cleaned up
 header dependencies

---
 indra/llui/llnotifications.h |  5 +++--
 indra/llui/llui.h            |  4 ++--
 indra/llui/lluiimage.h       |  2 --
 indra/llui/llxuiparser.cpp   |  2 ++
 indra/llui/llxuiparser.h     | 12 +++---------
 5 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index d7534c416d..76c6877440 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -96,7 +96,8 @@
 #include "llfunctorregistry.h"
 #include "llpointer.h"
 #include "llinitparam.h"
-#include "llnotificationslistener.h"
+#include "llinstancetracker.h"
+//#include "llnotificationslistener.h"
 #include "llnotificationptr.h"
 
 class LLAvatarName;
@@ -966,7 +967,7 @@ private:
 
 	bool mIgnoreAllNotifications;
 
-    boost::scoped_ptr<LLNotificationsListener> mListener;
+    boost::scoped_ptr<class LLNotificationsListener> mListener;
 };
 
 /**
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index dfb9fa60c9..69490d8668 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -31,15 +31,14 @@
 
 #include "llpointer.h"		// LLPointer<>
 #include "llrect.h"
-#include "llcontrol.h"
 #include "llcoord.h"
+#include "llcontrol.h"
 #include "llglslshader.h"
 #include "llinitparam.h"
 #include "llregistry.h"
 #include "lluicolor.h"
 #include "lluicolortable.h"
 #include <boost/signals2.hpp>
-#include "lllazyvalue.h"
 #include "llframetimer.h"
 #include <limits>
 
@@ -59,6 +58,7 @@ class LLWindow;
 class LLView;
 class LLHelp;
 class LLRenderTarget;
+class LLControlGroup;
 
 // UI colors
 extern const LLColor4 UI_VERTEX_COLOR;
diff --git a/indra/llui/lluiimage.h b/indra/llui/lluiimage.h
index f07e8fa746..f9c191e65f 100644
--- a/indra/llui/lluiimage.h
+++ b/indra/llui/lluiimage.h
@@ -30,9 +30,7 @@
 #include "v4color.h"
 #include "llpointer.h"
 #include "llrefcount.h"
-#include "llrefcount.h"
 #include "llrect.h"
-#include <boost/function.hpp>
 #include <boost/signals2.hpp>
 #include "llinitparam.h"
 #include "lltexture.h"
diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp
index 903f10ce10..0291843758 100644
--- a/indra/llui/llxuiparser.cpp
+++ b/indra/llui/llxuiparser.cpp
@@ -338,6 +338,8 @@ LLXSDWriter::LLXSDWriter()
 	registerInspectFunc<LLSD>(boost::bind(&LLXSDWriter::writeAttribute, this, "xs:string", _1, _2, _3, _4));
 }
 
+LLXSDWriter::~LLXSDWriter() {}
+
 void LLXSDWriter::writeXSD(const std::string& type_name, LLXMLNodePtr node, const LLInitParam::BaseBlock& block, const std::string& xml_namespace)
 {
 	Schema schema(xml_namespace);
diff --git a/indra/llui/llxuiparser.h b/indra/llui/llxuiparser.h
index 8d0276a8ad..e6bb552623 100644
--- a/indra/llui/llxuiparser.h
+++ b/indra/llui/llxuiparser.h
@@ -29,21 +29,15 @@
 
 #include "llinitparam.h"
 #include "llregistry.h"
-#include "llpointer.h"
+#include "llxmlnode.h"
 
 #include <boost/function.hpp>
 #include <iosfwd>
 #include <stack>
 #include <set>
 
-
-
 class LLView;
 
-
-typedef LLPointer<class LLXMLNode> LLXMLNodePtr;
-
-
 // lookup widget type by name
 class LLWidgetTypeRegistry
 :	public LLRegistrySingleton<std::string, const std::type_info*, LLWidgetTypeRegistry>
@@ -59,8 +53,6 @@ class LLChildRegistryRegistry
 : public LLRegistrySingleton<const std::type_info*, widget_registry_t, LLChildRegistryRegistry>
 {};
 
-
-
 class LLXSDWriter : public LLInitParam::Parser
 {
 	LOG_CLASS(LLXSDWriter);
@@ -70,6 +62,7 @@ public:
 	/*virtual*/ std::string getCurrentElementName() { return LLStringUtil::null; }
 
 	LLXSDWriter();
+	~LLXSDWriter();
 
 protected:
 	void writeAttribute(const std::string& type, const Parser::name_stack_t&, S32 min_count, S32 max_count, const std::vector<std::string>* possible_values);
@@ -124,6 +117,7 @@ public:
 	}
 
 private:
+	LLXUIParser(const LLXUIParser& other); // no-copy
 	void writeXUIImpl(LLXMLNodePtr node, 
 		const LLInitParam::BaseBlock& block, 
 		const LLInitParam::predicate_rule_t rules, 
-- 
cgit v1.2.3