From 28afd75afb727264ee0e550b9bf7bbf8ce2e30c9 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 27 Feb 2013 14:34:56 +0100
Subject: [PATCH] Use consistent naming for Firestorm header file defines

---
 indra/newview/fscommon.h                  | 6 +++---
 indra/newview/fscontactsfloater.h         | 6 +++---
 indra/newview/fsfloaterprofile.h          | 6 +++---
 indra/newview/fsfloatersearch.h           | 6 +++---
 indra/newview/fsfloaterwsassetblacklist.h | 6 +++---
 indra/newview/fsgrouptitles.h             | 2 +-
 indra/newview/fsmoneytracker.h            | 2 +-
 indra/newview/fsnearbychatvoicemonitor.h  | 6 +++---
 indra/newview/fspanelclassified.h         | 7 ++++---
 indra/newview/fspanelprofile.h            | 6 +++---
 indra/newview/fspanelprofileclassifieds.h | 6 +++---
 indra/newview/fsradarlistctrl.h           | 6 +++---
 indra/newview/fsslurlcommand.h            | 2 +-
 13 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/indra/newview/fscommon.h b/indra/newview/fscommon.h
index 1e054c78ba..34821136aa 100644
--- a/indra/newview/fscommon.h
+++ b/indra/newview/fscommon.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef FS_FSCOMMON_H
-#define FS_FSCOMMON_H
+#ifndef FS_COMMON_H
+#define FS_COMMON_H
 
 #include "llchat.h"
 
@@ -49,4 +49,4 @@ namespace FSCommon
 	S32 secondsSinceEpochFromString(const std::string& format, const std::string& str);
 };
 
-#endif // FS_FSCOMMON_H
+#endif // FS_COMMON_H
diff --git a/indra/newview/fscontactsfloater.h b/indra/newview/fscontactsfloater.h
index acc3f81388..0a3e6dfba5 100644
--- a/indra/newview/fscontactsfloater.h
+++ b/indra/newview/fscontactsfloater.h
@@ -25,8 +25,8 @@
  */
  
  
-#ifndef LL_FSCONTACTSFLOATER_H
-#define LL_FSCONTACTSFLOATER_H
+#ifndef FS_CONTACTSFLOATER_H
+#define FS_CONTACTSFLOATER_H
 
 #include "llfloater.h"
 #include "lleventtimer.h"
@@ -140,4 +140,4 @@ private:
 };
 
 
-#endif // LL_FSCONTACTSFLOATER_H
+#endif // FS_CONTACTSFLOATER_H
diff --git a/indra/newview/fsfloaterprofile.h b/indra/newview/fsfloaterprofile.h
index 1c95d7bd80..5c013cced5 100644
--- a/indra/newview/fsfloaterprofile.h
+++ b/indra/newview/fsfloaterprofile.h
@@ -25,8 +25,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef FS_FSFLOATERPROFILE_H
-#define FS_FSFLOATERPROFILE_H
+#ifndef FS_FLOATERPROFILE_H
+#define FS_FLOATERPROFILE_H
 
 #include "llfloater.h"
 
@@ -63,4 +63,4 @@ private:
     LLUUID mAvatarId;
 };
 
-#endif // FS_FSFLOATERPROFILE_H
+#endif // FS_FLOATERPROFILE_H
diff --git a/indra/newview/fsfloatersearch.h b/indra/newview/fsfloatersearch.h
index 3ce8aa5ead..68d785eb39 100644
--- a/indra/newview/fsfloatersearch.h
+++ b/indra/newview/fsfloatersearch.h
@@ -25,8 +25,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef FS_FSFLOATERSEARCH_H
-#define FS_FSFLOATERSEARCH_H
+#ifndef FS_FLOATERSEARCH_H
+#define FS_FLOATERSEARCH_H
 
 #include "llfloater.h"
 #include "lliconctrl.h"
@@ -341,4 +341,4 @@ private:
 	LLSD			mCategoryPaths;
 };
 
-#endif // FS_FSFLOATERSEARCH_H
+#endif // FS_FLOATERSEARCH_H
diff --git a/indra/newview/fsfloaterwsassetblacklist.h b/indra/newview/fsfloaterwsassetblacklist.h
index 4a6c292f69..2897c1b001 100644
--- a/indra/newview/fsfloaterwsassetblacklist.h
+++ b/indra/newview/fsfloaterwsassetblacklist.h
@@ -25,8 +25,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef FS_FSFLOATERWSASSETBLACKLIST_H
-#define FS_FSFLOATERWSASSETBLACKLIST_H
+#ifndef FS_FLOATERWSASSETBLACKLIST_H
+#define FS_FLOATERWSASSETBLACKLIST_H
 
 #include "llfloater.h"
 #include "llassettype.h"
@@ -60,4 +60,4 @@ private:
 	LLScrollListCtrl* mResultList;
 };
 
-#endif // FS_FSFLOATERPROFILE_H
+#endif // FS_FLOATERWSASSETBLACKLIST_H
diff --git a/indra/newview/fsgrouptitles.h b/indra/newview/fsgrouptitles.h
index 9ad962da83..26551943c8 100644
--- a/indra/newview/fsgrouptitles.h
+++ b/indra/newview/fsgrouptitles.h
@@ -81,4 +81,4 @@ protected:
 	LLGroupData		mGroupData;
 };
 
-#endif
+#endif // FS_GROUPTITLES_H
diff --git a/indra/newview/fsmoneytracker.h b/indra/newview/fsmoneytracker.h
index 1a3515969b..38847529f7 100644
--- a/indra/newview/fsmoneytracker.h
+++ b/indra/newview/fsmoneytracker.h
@@ -48,4 +48,4 @@ private:
 	LLChatHistory* mTransactionHistory;
 };
 
-#endif
+#endif // FS_MONEYTRACKER_H
diff --git a/indra/newview/fsnearbychatvoicemonitor.h b/indra/newview/fsnearbychatvoicemonitor.h
index 36adfb7876..a317a0b599 100644
--- a/indra/newview/fsnearbychatvoicemonitor.h
+++ b/indra/newview/fsnearbychatvoicemonitor.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef FS_NEARBYCHATVOICEMONITOR
-#define FS_NEARBYCHATVOICEMONITOR
+#ifndef FS_NEARBYCHATVOICEMONITOR_H
+#define FS_NEARBYCHATVOICEMONITOR_H
 
 #include "llnearbychatcontrol.h"
 #include "lloutputmonitorctrl.h"
@@ -54,4 +54,4 @@ protected:
 	bool				mVoiceMonitorVisible;
 };
 
-#endif // FS_NEARBYCHATVOICEMONITOR
+#endif // FS_NEARBYCHATVOICEMONITOR_H
diff --git a/indra/newview/fspanelclassified.h b/indra/newview/fspanelclassified.h
index e61506c6ec..4a3c78dd3c 100644
--- a/indra/newview/fspanelclassified.h
+++ b/indra/newview/fspanelclassified.h
@@ -27,8 +27,9 @@
 // Display of a classified used both for the global view in the
 // Find directory, and also for each individual user's classified in their
 // profile.
-#ifndef LL_FSPANELCLASSIFIED_H
-#define LL_FSPANELCLASSIFIED_H
+
+#ifndef FS_PANELCLASSIFIED_H
+#define FS_PANELCLASSIFIED_H
 
 #include "llavatarpropertiesprocessor.h"
 #include "llclassifiedinfo.h"
@@ -293,4 +294,4 @@ private:
 	commit_signal_t mSaveButtonClickedSignal;
 };
 
-#endif // LL_FSPANELCLASSIFIED_H
+#endif // FS_PANELCLASSIFIED_H
diff --git a/indra/newview/fspanelprofile.h b/indra/newview/fspanelprofile.h
index 344e0c1cd3..c87cbcf7b3 100644
--- a/indra/newview/fspanelprofile.h
+++ b/indra/newview/fspanelprofile.h
@@ -25,8 +25,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef FS_FSPANELPROFILE_H
-#define FS_FSPANELPROFILE_H
+#ifndef FS_PANELPROFILE_H
+#define FS_PANELPROFILE_H
 
 #include "llfloater.h"
 #include "llavatarpropertiesprocessor.h"
@@ -584,4 +584,4 @@ protected:
 	LLTextEditor*		mNotesEditor;
 };
 
-#endif // FS_FSPANELPROFILE_H
+#endif // FS_PANELPROFILE_H
diff --git a/indra/newview/fspanelprofileclassifieds.h b/indra/newview/fspanelprofileclassifieds.h
index 7a6e9e1fa9..55af21fe5e 100644
--- a/indra/newview/fspanelprofileclassifieds.h
+++ b/indra/newview/fspanelprofileclassifieds.h
@@ -24,8 +24,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef FS_FSPANELCLASSIFIEDS_H
-#define FS_FSPANELCLASSIFIEDS_H
+#ifndef FS_PANELCLASSIFIEDS_H
+#define FS_PANELCLASSIFIEDS_H
 
 #include "llpanel.h"
 #include "v3dmath.h"
@@ -202,4 +202,4 @@ private:
 	S32 mPriceForListing;
 };
 
-#endif // FS_FSPANELCLASSIFIEDS_H
+#endif // FS_PANELCLASSIFIEDS_H
diff --git a/indra/newview/fsradarlistctrl.h b/indra/newview/fsradarlistctrl.h
index 1b023678fb..2c3bdabb0e 100644
--- a/indra/newview/fsradarlistctrl.h
+++ b/indra/newview/fsradarlistctrl.h
@@ -24,8 +24,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLRADARLISTCTRL_H
-#define LL_LLRADARLISTCTRL_H
+#ifndef FS_RADARLISTCTRL_H
+#define FS_RADARLISTCTRL_H
 
 #include <set>
 #include "llscrolllistctrl.h"
@@ -92,4 +92,4 @@ private:
 	
 };
 
-#endif
+#endif // FS_RADARLISTCTRL_H
diff --git a/indra/newview/fsslurlcommand.h b/indra/newview/fsslurlcommand.h
index a796cee6d9..8779c95f5a 100644
--- a/indra/newview/fsslurlcommand.h
+++ b/indra/newview/fsslurlcommand.h
@@ -25,4 +25,4 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#endif
+#endif // FS_SLURLCOMMAND_H