From f2a4cb29e16ee704c7c6d9d7a4e4e8f70b4be5bd Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 29 Sep 2009 19:58:51 +0000 Subject: [PATCH] * fixed a couple of warnings about TR_CONTEXT being redefined. It is good practive to #undef this before every definition, due to how the ExtractCatalogEntries jam-rule works. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33360 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/appearance/APRView.cpp | 1 + src/preferences/appearance/APRWindow.cpp | 1 + src/preferences/appearance/AntialiasingSettingsView.cpp | 1 + src/preferences/appearance/ColorSet.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/src/preferences/appearance/APRView.cpp b/src/preferences/appearance/APRView.cpp index c24e6a32e8..68deaace59 100644 --- a/src/preferences/appearance/APRView.cpp +++ b/src/preferences/appearance/APRView.cpp @@ -29,6 +29,7 @@ #include "ColorSet.h" +#undef TR_CONTEXT #define TR_CONTEXT "Colors tab" #define COLOR_DROPPED 'cldp' diff --git a/src/preferences/appearance/APRWindow.cpp b/src/preferences/appearance/APRWindow.cpp index 7851e61eb0..1a20343589 100644 --- a/src/preferences/appearance/APRWindow.cpp +++ b/src/preferences/appearance/APRWindow.cpp @@ -18,6 +18,7 @@ #include "APRView.h" #include "defs.h" +#undef TR_CONTEXT #define TR_CONTEXT "APRWindow" static const uint32 kMsgSetDefaults = 'dflt'; diff --git a/src/preferences/appearance/AntialiasingSettingsView.cpp b/src/preferences/appearance/AntialiasingSettingsView.cpp index 548447d351..73f5882f1a 100644 --- a/src/preferences/appearance/AntialiasingSettingsView.cpp +++ b/src/preferences/appearance/AntialiasingSettingsView.cpp @@ -27,6 +27,7 @@ #include "APRWindow.h" +#undef TR_CONTEXT #define TR_CONTEXT "AntialiasingSettingsView" diff --git a/src/preferences/appearance/ColorSet.cpp b/src/preferences/appearance/ColorSet.cpp index c646481430..2ff0b318dd 100644 --- a/src/preferences/appearance/ColorSet.cpp +++ b/src/preferences/appearance/ColorSet.cpp @@ -19,6 +19,7 @@ #include #include "ColorSet.h" +#undef TR_CONTEXT #define TR_CONTEXT "Colors tab" static ColorDescription sColorDescriptionTable[] =