Rename fscontactsfloater.cpp/h to fsfloatercontacts.cpp/h since the class is called FSFloaterContacts and this causes less confusion

indra/newview/CMakeLists.txt

@@ -136,11 +136,11 @@ set(viewer_SOURCE_FILES
     fschathistory.cpp
     fscommon.cpp
     fsconsoleutils.cpp
-    fscontactsfloater.cpp
     fsdata.cpp
     fsexportperms.cpp
     fsfloateraddtocontactset.cpp
     fsfloaterblocklist.cpp
+    fsfloatercontacts.cpp
     fsfloatercontactsetconfiguration.cpp
     fsfloaterexport.cpp
     fsfloatergroup.cpp
@@ -834,11 +834,11 @@ set(viewer_HEADER_FILES
     fschathistory.h
     fscommon.h
     fsconsoleutils.h
-    fscontactsfloater.h
     fsdata.h
     fsexportperms.h
     fsfloateraddtocontactset.h
     fsfloaterblocklist.h
+    fsfloatercontacts.h
     fsfloatercontactsetconfiguration.h
     fsfloaterexport.h
     fsfloatergroup.h

indra/newview/fsfloateraddtocontactset.cpp

@@ -30,7 +30,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "fsfloateraddtocontactset.h"
 
-#include "fscontactsfloater.h"
+#include "fsfloatercontacts.h"
 #include "fspanelcontactsets.h"
 #include "llnotificationsutil.h"
 #include "llslurl.h"

indra/newview/fsfloatercontacts.cpp

@@ -1,5 +1,5 @@
 /** 
- * @file fscontactsfloater.cpp
+ * @file fsfloatercontacts.cpp
  * @brief Legacy contacts floater implementation
  *
  * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$
@@ -28,7 +28,7 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include "fscontactsfloater.h"
+#include "fsfloatercontacts.h"
 
 // libs
 #include "llagent.h"

indra/newview/fsfloatercontacts.h

@@ -1,5 +1,5 @@
 /** 
- * @file fscontactsfloater.h
+ * @file fsfloatercontacts.h
  * @brief Legacy contacts floater header file
  *
  * $LicenseInfo:firstyear=2011&license=fsviewerlgpl$
@@ -26,8 +26,8 @@
  */
  
  
-#ifndef FS_CONTACTSFLOATER_H
-#define FS_CONTACTSFLOATER_H
+#ifndef FS_FLOATERCONTACTS_H
+#define FS_FLOATERCONTACTS_H
 
 #include "llfloater.h"
 #include "lleventtimer.h"
@@ -142,4 +142,4 @@ private:
 };
 
 
-#endif // FS_CONTACTSFLOATER_H
+#endif // FS_FLOATERCONTACTS_H

indra/newview/fsfloaterimcontainer.cpp

@@ -37,7 +37,7 @@
 #include "llagent.h"
 #include "lltransientfloatermgr.h"
 #include "fsfloaternearbychat.h"
-#include "fscontactsfloater.h"
+#include "fsfloatercontacts.h"
 #include "llfloater.h"
 #include "llviewercontrol.h"
 #include "fsfloaterim.h"

indra/newview/fspanelcontactsets.cpp

@@ -32,7 +32,7 @@
 #include "llnotificationsutil.h"
 
 #include "fspanelcontactsets.h"
-#include "fscontactsfloater.h"
+#include "fsfloatercontacts.h"
 #include "lggcontactsets.h"
 #include "llavataractions.h"
 #include "llcallingcard.h"

indra/newview/llfloaterpreference.cpp

@@ -116,7 +116,7 @@
 #include "llsdserialize.h"
 
 // Firestorm Includes
-#include "fscontactsfloater.h" // TS: sort contacts list
+#include "fsfloatercontacts.h" // TS: sort contacts list
 #include "fsfloaterimcontainer.h"
 #include "growlmanager.h"
 #include "llavatarname.h"	// <FS:CR> Deeper name cache stuffs

indra/newview/llgroupactions.cpp

@@ -44,8 +44,8 @@
 
 // Firestorm includes
 #include "exogroupmutelist.h"
-#include "fscontactsfloater.h"
 #include "fsdata.h"
+#include "fsfloatercontacts.h"
 #include "fsfloatergroup.h"
 #include "fsfloaterim.h"
 #include "llpanelgroup.h"

indra/newview/llstartup.cpp

@@ -210,8 +210,8 @@
 #include "growlmanager.h"
 #endif
 
-#include "fscontactsfloater.h"
 #include "fsdata.h"
+#include "fsfloatercontacts.h"
 #include "fsfloaterimcontainer.h"
 #include "fsfloaternearbychat.h"
 #include "fsfloatersearch.h"

indra/newview/llviewerfloaterreg.cpp

@@ -156,8 +156,8 @@
 #include "daeexport.h"
 #include "floatermedialists.h"
 #include "fsareasearch.h"
-#include "fscontactsfloater.h"
 #include "fsfloateraddtocontactset.h"
+#include "fsfloatercontacts.h"
 #include "fsfloatercontactsetconfiguration.h"
 #include "fsfloaterexport.h"
 #include "fsfloaterblocklist.h"

indra/newview/llviewermenu.cpp

@@ -137,7 +137,7 @@
 #include "fslslbridge.h"
 #include "fscommon.h"
 #include "fsfloaterexport.h"
-#include "fscontactsfloater.h"	// <FS:Zi> Display group list in contacts floater
+#include "fsfloatercontacts.h"	// <FS:Zi> Display group list in contacts floater
 #include "fspose.h"	// <FS:CR> FIRE-4345: Undeform
 #include "fswsassetblacklist.h"
 #include "llavatarpropertiesprocessor.h"	// ## Zi: Texture Refresh