From d824b7ce637e8092b27fe4062ebe2022d7c624a0 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 21 Mar 2014 14:25:19 +0100 Subject: [PATCH] Rename fscontactsfloater.cpp/h to fsfloatercontacts.cpp/h since the class is called FSFloaterContacts and this causes less confusion --- indra/newview/CMakeLists.txt | 4 ++-- indra/newview/fsfloateraddtocontactset.cpp | 2 +- .../{fscontactsfloater.cpp => fsfloatercontacts.cpp} | 4 ++-- .../newview/{fscontactsfloater.h => fsfloatercontacts.h} | 8 ++++---- indra/newview/fsfloaterimcontainer.cpp | 2 +- indra/newview/fspanelcontactsets.cpp | 2 +- indra/newview/llfloaterpreference.cpp | 2 +- indra/newview/llgroupactions.cpp | 2 +- indra/newview/llstartup.cpp | 2 +- indra/newview/llviewerfloaterreg.cpp | 2 +- indra/newview/llviewermenu.cpp | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) rename indra/newview/{fscontactsfloater.cpp => fsfloatercontacts.cpp} (99%) rename indra/newview/{fscontactsfloater.h => fsfloatercontacts.h} (97%) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 53e8522f9f..91048a6e77 100755 --- a/indra/newview/CMakeLists.txt +++ b/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 diff --git a/indra/newview/fsfloateraddtocontactset.cpp b/indra/newview/fsfloateraddtocontactset.cpp index 8216c5032a..e1c4c12045 100644 --- a/indra/newview/fsfloateraddtocontactset.cpp +++ b/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" diff --git a/indra/newview/fscontactsfloater.cpp b/indra/newview/fsfloatercontacts.cpp similarity index 99% rename from indra/newview/fscontactsfloater.cpp rename to indra/newview/fsfloatercontacts.cpp index 44606ff60d..efa2ae07fe 100644 --- a/indra/newview/fscontactsfloater.cpp +++ b/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" diff --git a/indra/newview/fscontactsfloater.h b/indra/newview/fsfloatercontacts.h similarity index 97% rename from indra/newview/fscontactsfloater.h rename to indra/newview/fsfloatercontacts.h index 7d859bd588..13fa5121e9 100644 --- a/indra/newview/fscontactsfloater.h +++ b/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 diff --git a/indra/newview/fsfloaterimcontainer.cpp b/indra/newview/fsfloaterimcontainer.cpp index 9ab8ff7035..a11c2d0b00 100644 --- a/indra/newview/fsfloaterimcontainer.cpp +++ b/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" diff --git a/indra/newview/fspanelcontactsets.cpp b/indra/newview/fspanelcontactsets.cpp index 5e52c99bc0..05e494df9f 100644 --- a/indra/newview/fspanelcontactsets.cpp +++ b/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" diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index c0f5d51a32..bc5da2a7e0 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/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" // Deeper name cache stuffs diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 1eab89fe04..fc0a0cf185 100755 --- a/indra/newview/llgroupactions.cpp +++ b/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" diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 98a66158f2..6af4e80562 100755 --- a/indra/newview/llstartup.cpp +++ b/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" diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index fa3cc2209f..7b977e0f61 100755 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/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" diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 684c8fdbdc..dfc4d9dedf 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -137,7 +137,7 @@ #include "fslslbridge.h" #include "fscommon.h" #include "fsfloaterexport.h" -#include "fscontactsfloater.h" // Display group list in contacts floater +#include "fsfloatercontacts.h" // Display group list in contacts floater #include "fspose.h" // FIRE-4345: Undeform #include "fswsassetblacklist.h" #include "llavatarpropertiesprocessor.h" // ## Zi: Texture Refresh