diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-07 09:10:33 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-07 09:10:33 -0700 |
| commit | 646b8c0c15d26cceb50a1ef97531aef7a610f1a0 (patch) | |
| tree | 8aef33f7199eabd58536a06a5319b5c51bca9767 /indra/newview/llpanelface.h | |
| parent | 7e4e59470f36ae7a0e01b8d2613af4c8fb6b0101 (diff) | |
NORSPEC-233 WIP make gcc like it and do some clean-up
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rwxr-xr-x | indra/newview/llpanelface.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index b93e214326..c178ed783f 100755 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -75,7 +75,7 @@ template< class LLMaterialGetFunctor { public: - LLMaterialGetFunctor() : {} + LLMaterialGetFunctor() {} virtual DataType get(LLMaterialPtr& material) { return (material->*(MaterialGetFunc)); } }; @@ -85,9 +85,8 @@ template< class LLTEGetFunctor { public: - LLTEGetFunctor() : _data(data) {} + LLTEGetFunctor() {} virtual DataType get(LLTextureEntry* entry) { return (entry*(TEGetFunc)); } - DataType _data; }; class LLPanelFace : public LLPanel @@ -348,27 +347,27 @@ private: // Accessors for selected TE material state // - #define DEF_GET_MAT_STATE(DataType,ReturnType,MaterialMemberFunc) \ - static void MaterialMemberFunc(DataType& data, bool& identical) \ - { \ - getTEMaterialValue< DataType, ReturnType, &LLMaterial::##MaterialMemberFunc >(data, identical); \ + #define DEF_GET_MAT_STATE(DataType,ReturnType,MaterialMemberFunc) \ + static void MaterialMemberFunc(DataType& data, bool& identical) \ + { \ + getTEMaterialValue< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(data, identical); \ } // Mutators for selected TE material // - #define DEF_EDIT_MAT_STATE(DataType,ReturnType,MaterialMemberFunc) \ - static void MaterialMemberFunc(LLPanelFace* p,DataType data) \ - { \ - edit< DataType, ReturnType, &LLMaterial::##MaterialMemberFunc >(p,data); \ + #define DEF_EDIT_MAT_STATE(DataType,ReturnType,MaterialMemberFunc) \ + static void MaterialMemberFunc(LLPanelFace* p,DataType data) \ + { \ + edit< DataType, ReturnType, &LLMaterial::MaterialMemberFunc >(p,data); \ } // Accessors for selected TE state proper (legacy settings etc) // - #define DEF_GET_TE_STATE(DataType,ReturnType,TexEntryMemberFunc) \ - static void TexEntryMemberFunc(DataType& data, bool& identical) \ - { \ - getTEValue< DataType, ReturnType, &LLTextureEntry::##TexEntryMemberFunc >(data, identical); \ + #define DEF_GET_TE_STATE(DataType,ReturnType,TexEntryMemberFunc) \ + static void TexEntryMemberFunc(DataType& data, bool& identical) \ + { \ + getTEValue< DataType, ReturnType, &LLTextureEntry::TexEntryMemberFunc >(data, identical); \ } class LLSelectedTEMaterial |