More catalog-related cleanup.

* rename B_TRANSLATE_CONTEXT to B_TRANSLATION_CONTEXT and
  B_TRANSLATE_WITH_CONTEXT to B_TRANSLATE_CONTEXT, squashing a TODO
* adjust all uses of both macros in Haiku's source tree
* use correct header guard for collecting/Catalog.h

The renamed macros require adjustments to all external applications
using catalogs.
This commit is contained in:
Oliver Tappe
2012-04-16 21:31:22 +02:00
parent 3244c2bcf2
commit 546208a539
521 changed files with 1171 additions and 1165 deletions
+3 -3
View File
@@ -15,8 +15,8 @@
#include <Slider.h>
#include <String.h>
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "SettingsWindow"
#undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "SettingsWindow"
static const uint32 kMsgUpdateTimeInterval = 'upti';
@@ -90,7 +90,7 @@ private:
SettingsWindow::SettingsWindow(ActivityWindow* target)
: BWindow(_RelativeTo(target),
B_TRANSLATE_WITH_CONTEXT("Settings", "ActivityWindow"), B_FLOATING_WINDOW,
B_TRANSLATE_CONTEXT("Settings", "ActivityWindow"), B_FLOATING_WINDOW,
B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
fTarget(target)
{