i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More catalog-related cleanup.

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
docs/develop/makefile-engine.html
+2 -2
View File
@@ -166,8 +166,8 @@ engine, last line must contain:</p>
<pre><code>#include &lt;stdio.h&gt; <pre><code>#include &lt;stdio.h&gt;
#include &lt;Catalog.h&gt; #include &lt;Catalog.h&gt;
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#ifdef B_TRANSLATE_CONTEXT "hello" #define B_TRANSLATION_CONTEXT "hello"
int main(void) int main(void)
{ {
docs/user/locale/Catalog.dox
+1 -1
View File
@@ -41,7 +41,7 @@
\section macros Using the macros \section macros Using the macros
You don't have to do much in your program to handle catalogs. You must You don't have to do much in your program to handle catalogs. You must
first set the B_TRANSLATE_CONTEXT define to a string that identifies which first set the B_TRANSLATION_CONTEXT define to a string that identifies which
part of the application the strings you will translate are in. This allows part of the application the strings you will translate are in. This allows
the translators to keep track of the strings in the catalog more easily, the translators to keep track of the strings in the catalog more easily,
and find where they are visible in the application. then, all you have to and find where they are visible in the application. then, all you have to
headers/os/locale/Catalog.h
+11 -13
View File
@@ -59,8 +59,8 @@ private:
}; };
#undef B_TRANSLATE_SYSTEM_NAME_CONTEXT #undef B_TRANSLATION_SYSTEM_NAME_CONTEXT
#define B_TRANSLATE_SYSTEM_NAME_CONTEXT "System name" #define B_TRANSLATION_SYSTEM_NAME_CONTEXT "System name"
#ifndef B_AVOID_TRANSLATION_MACROS #ifndef B_AVOID_TRANSLATION_MACROS
@@ -68,9 +68,7 @@ private:
// you don't want these (in which case you need to collect the catalog keys // you don't want these (in which case you need to collect the catalog keys
// manually, as collectcatkeys won't do it for you): // manually, as collectcatkeys won't do it for you):
// TODO: maybe rename this to B_TRANSLATE_DEFAULT_CONTEXT, so that #undef B_TRANSLATION_CONTEXT
// B_TRANSLATE_WITH_CONTEXT() can just be called B_TRANSLATE_CONTEXT()
#undef B_TRANSLATE_CONTEXT
// In a single application, several strings (e.g. 'Ok') will be used // In a single application, several strings (e.g. 'Ok') will be used
// more than once, in different contexts. // more than once, in different contexts.
// As the application programmer can not know if all translations of // As the application programmer can not know if all translations of
@@ -81,10 +79,10 @@ private:
// same string and tell which strings appears in what context of the // same string and tell which strings appears in what context of the
// application. // application.
// In order to give the translator a useful hint, the application // In order to give the translator a useful hint, the application
// programmer needs to define B_TRANSLATE_CONTEXT with the context he'd // programmer needs to define B_TRANSLATION_CONTEXT with the context he'd
// like to be associated with the strings used in this specifc source file. // like to be associated with the strings used in this specifc source file.
// example: // example:
// #define B_TRANSLATE_CONTEXT "Folder-Window" // #define B_TRANSLATION_CONTEXT "Folder-Window"
// Tip: Use a descriptive name of the class implemented in that // Tip: Use a descriptive name of the class implemented in that
// source-file. // source-file.
@@ -92,16 +90,16 @@ private:
#undef B_TRANSLATE #undef B_TRANSLATE
#define B_TRANSLATE(string) \ #define B_TRANSLATE(string) \
BLocaleRoster::Default()->GetCatalog()->GetString((string), \ BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_CONTEXT) B_TRANSLATION_CONTEXT)
#undef B_TRANSLATE_WITH_CONTEXT #undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_WITH_CONTEXT(string, context) \ #define B_TRANSLATE_CONTEXT(string, context) \
BLocaleRoster::Default()->GetCatalog()->GetString((string), (context)) BLocaleRoster::Default()->GetCatalog()->GetString((string), (context))
#undef B_TRANSLATE_COMMENT #undef B_TRANSLATE_COMMENT
#define B_TRANSLATE_COMMENT(string, comment) \ #define B_TRANSLATE_COMMENT(string, comment) \
BLocaleRoster::Default()->GetCatalog()->GetString((string), \ BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_CONTEXT, (comment)) B_TRANSLATION_CONTEXT, (comment))
#undef B_TRANSLATE_ALL #undef B_TRANSLATE_ALL
#define B_TRANSLATE_ALL(string, context, comment) \ #define B_TRANSLATE_ALL(string, context, comment) \
@@ -116,13 +114,13 @@ private:
#define B_TRANSLATE_SYSTEM_NAME(string) \ #define B_TRANSLATE_SYSTEM_NAME(string) \
BLocaleRoster::Default()->IsFilesystemTranslationPreferred() \ BLocaleRoster::Default()->IsFilesystemTranslationPreferred() \
? BLocaleRoster::Default()->GetCatalog()->GetString((string), \ ? BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_SYSTEM_NAME_CONTEXT) \ B_TRANSLATION_SYSTEM_NAME_CONTEXT) \
: (string) : (string)
// Translation markers which can be used to mark static strings/IDs which // Translation markers which can be used to mark static strings/IDs which
// are used as key for translation requests (at other places in the code). // are used as key for translation requests (at other places in the code).
/* Example: /* Example:
#define B_TRANSLATE_CONTEXT "MyDecentApp-Menu" #define B_TRANSLATION_CONTEXT "MyDecentApp-Menu"
static const char* choices[] = { static const char* choices[] = {
B_TRANSLATE_MARK("left"), B_TRANSLATE_MARK("left"),
headers/private/locale/collecting/Catalog.h
+15 -15
View File
@@ -2,27 +2,27 @@
* Copyright 2012, Haiku, Inc. * Copyright 2012, Haiku, Inc.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _CATALOG_COLLECTOR_H_ #ifndef _COLLECTING_CATALOG_H_
#define _CATALOG_COLLECTOR_H_ #define _COLLECTING_CATALOG_H_
#include_next <Catalog.h> #include_next <Catalog.h>
// Translation macros used when executing collectcatkeys // Translation macros used when executing collectcatkeys
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#undef B_TRANSLATE #undef B_TRANSLATE
#define B_TRANSLATE(string) \ #define B_TRANSLATE(string) \
B_CATKEY((string), B_TRANSLATE_CONTEXT) B_CATKEY((string), B_TRANSLATION_CONTEXT)
#undef B_TRANSLATE_WITH_CONTEXT #undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_WITH_CONTEXT(string, context) \ #define B_TRANSLATE_CONTEXT(string, context) \
B_CATKEY((string), (context)) B_CATKEY((string), (context))
#undef B_TRANSLATE_COMMENT #undef B_TRANSLATE_COMMENT
#define B_TRANSLATE_COMMENT(string, comment) \ #define B_TRANSLATE_COMMENT(string, comment) \
B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment)) B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
#undef B_TRANSLATE_ALL #undef B_TRANSLATE_ALL
#define B_TRANSLATE_ALL(string, context, comment) \ #define B_TRANSLATE_ALL(string, context, comment) \
@@ -34,15 +34,15 @@
#undef B_TRANSLATE_SYSTEM_NAME #undef B_TRANSLATE_SYSTEM_NAME
#define B_TRANSLATE_SYSTEM_NAME(string) \ #define B_TRANSLATE_SYSTEM_NAME(string) \
B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT) B_CATKEY((string), B_TRANSLATION_SYSTEM_NAME_CONTEXT)
#undef B_TRANSLATE_MARK #undef B_TRANSLATE_MARK
#define B_TRANSLATE_MARK(string) \ #define B_TRANSLATE_MARK(string) \
B_CATKEY((string), B_TRANSLATE_CONTEXT) B_CATKEY((string), B_TRANSLATION_CONTEXT)
#undef B_TRANSLATE_MARK_COMMENT #undef B_TRANSLATE_MARK_COMMENT
#define B_TRANSLATE_MARK_COMMENT(string, comment) \ #define B_TRANSLATE_MARK_COMMENT(string, comment) \
B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment)) B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
#undef B_TRANSLATE_MARK_ALL #undef B_TRANSLATE_MARK_ALL
#define B_TRANSLATE_MARK_ALL(string, context, comment) \ #define B_TRANSLATE_MARK_ALL(string, context, comment) \
@@ -54,15 +54,15 @@
#undef B_TRANSLATE_MARK_SYSTEM_NAME #undef B_TRANSLATE_MARK_SYSTEM_NAME
#define B_TRANSLATE_MARK_SYSTEM_NAME(string) \ #define B_TRANSLATE_MARK_SYSTEM_NAME(string) \
B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT, "") B_CATKEY((string), B_TRANSLATION_SYSTEM_NAME_CONTEXT, "")
#undef B_TRANSLATE_MARK_VOID #undef B_TRANSLATE_MARK_VOID
#define B_TRANSLATE_MARK_VOID(string) \ #define B_TRANSLATE_MARK_VOID(string) \
B_CATKEY((string), B_TRANSLATE_CONTEXT) B_CATKEY((string), B_TRANSLATION_CONTEXT)
#undef B_TRANSLATE_MARK_COMMENT_VOID #undef B_TRANSLATE_MARK_COMMENT_VOID
#define B_TRANSLATE_MARK_COMMENT_VOID(string, comment) \ #define B_TRANSLATE_MARK_COMMENT_VOID(string, comment) \
B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment)) B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
#undef B_TRANSLATE_MARK_ALL_VOID #undef B_TRANSLATE_MARK_ALL_VOID
#define B_TRANSLATE_MARK_ALL_VOID(string, context, comment) \ #define B_TRANSLATE_MARK_ALL_VOID(string, context, comment) \
@@ -74,7 +74,7 @@
#undef B_TRANSLATE_MARK_SYSTEM_NAME_VOID #undef B_TRANSLATE_MARK_SYSTEM_NAME_VOID
#define B_TRANSLATE_MARK_SYSTEM_NAME_VOID(string) \ #define B_TRANSLATE_MARK_SYSTEM_NAME_VOID(string) \
B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT, "") B_CATKEY((string), B_TRANSLATION_SYSTEM_NAME_CONTEXT, "")
#undef B_TRANSLATE_NOCOLLECT #undef B_TRANSLATE_NOCOLLECT
#define B_TRANSLATE_NOCOLLECT(string) #define B_TRANSLATE_NOCOLLECT(string)
@@ -92,4 +92,4 @@
#define B_TRANSLATE_NOCOLLECT_SYSTEM_NAME(string) #define B_TRANSLATE_NOCOLLECT_SYSTEM_NAME(string)
#endif /* _CATALOG_COLLECTOR_H_ */ #endif /* _COLLECTING_CATALOG_H_ */
src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp
+2 -2
View File
@@ -24,8 +24,8 @@
#include <Window.h> #include <Window.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "BFS_Initialize_Parameter" #define B_TRANSLATION_CONTEXT "BFS_Initialize_Parameter"
static uint32 MSG_BLOCK_SIZE = 'blsz'; static uint32 MSG_BLOCK_SIZE = 'blsz';
src/add-ons/disk_systems/intel/CreationParameterEditor.cpp
+2 -2
View File
@@ -12,8 +12,8 @@
#include <PartitionParameterEditor.h> #include <PartitionParameterEditor.h>
#include <View.h> #include <View.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "BFS_Creation_Parameter" #define B_TRANSLATION_CONTEXT "BFS_Creation_Parameter"
PrimaryPartitionEditor::PrimaryPartitionEditor() PrimaryPartitionEditor::PrimaryPartitionEditor()
src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
+2 -2
View File
@@ -35,8 +35,8 @@
#include "TeamListItem.h" #include "TeamListItem.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "Team monitor" #define B_TRANSLATION_CONTEXT "Team monitor"
TeamMonitorWindow* gTeamMonitorWindow = NULL; TeamMonitorWindow* gTeamMonitorWindow = NULL;
src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
#include <MailSettings.h> #include <MailSettings.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
const uint32 kMsgActionMoveTo = 'argm'; const uint32 kMsgActionMoveTo = 'argm';
src/add-ons/mail_daemon/inbound_filters/match_header/RuleFilter.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
#include <MailProtocol.h> #include <MailProtocol.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "RuleFilter" #define B_TRANSLATION_CONTEXT "RuleFilter"
RuleFilter::RuleFilter(MailProtocol& protocol, AddonSettings* addonSettings) RuleFilter::RuleFilter(MailProtocol& protocol, AddonSettings* addonSettings)
src/add-ons/mail_daemon/inbound_filters/notifier/ConfigView.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
#include <MailSettings.h> #include <MailSettings.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
const uint32 kMsgNotifyMethod = 'nomt'; const uint32 kMsgNotifyMethod = 'nomt';
src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
#include "ConfigView.h" #include "ConfigView.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "filter" #define B_TRANSLATION_CONTEXT "filter"
class NotifyFilter : public MailFilter class NotifyFilter : public MailFilter
src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp
+2 -2
View File
@@ -129,8 +129,8 @@
#include "SpamFilter.h" #include "SpamFilter.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "SpamFilter" #define B_TRANSLATION_CONTEXT "SpamFilter"
// The names match the ones set up by spamdbm for sound effects. // The names match the ones set up by spamdbm for sound effects.
src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp
+2 -2
View File
@@ -95,8 +95,8 @@
#include <FileConfigView.h> #include <FileConfigView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "SpamFilterConfig" #define B_TRANSLATION_CONTEXT "SpamFilterConfig"
static const char *kServerSignature = "application/x-vnd.agmsmith.spamdbm"; static const char *kServerSignature = "application/x-vnd.agmsmith.spamdbm";
src/add-ons/mail_daemon/inbound_protocols/imap/IMAPFolderConfig.cpp
+2 -2
View File
@@ -19,8 +19,8 @@
#include <crypt.h> #include <crypt.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "IMAPFolderConfig" #define B_TRANSLATION_CONTEXT "IMAPFolderConfig"
class EditableListItem { class EditableListItem {
src/add-ons/mail_daemon/inbound_protocols/imap/imap_config.cpp
+2 -2
View File
@@ -21,8 +21,8 @@
#include "IMAPFolderConfig.h" #include "IMAPFolderConfig.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "imap_config" #define B_TRANSLATION_CONTEXT "imap_config"
const uint32 kMsgOpenIMAPFolder = '&OIF'; const uint32 kMsgOpenIMAPFolder = '&OIF';
src/add-ons/mail_daemon/inbound_protocols/pop3/ConfigView.cpp
+2 -2
View File
@@ -14,8 +14,8 @@
#include <ProtocolConfigView.h> #include <ProtocolConfigView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
class POP3ConfigView : public BMailProtocolConfigView { class POP3ConfigView : public BMailProtocolConfigView {
src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
+2 -2
View File
@@ -44,8 +44,8 @@
#include "MessageIO.h" #include "MessageIO.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "pop3" #define B_TRANSLATION_CONTEXT "pop3"
static void NotHere(BStringList &that, BStringList &otherList, static void NotHere(BStringList &that, BStringList &otherList,
src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cpp
+2 -2
View File
@@ -14,8 +14,8 @@
#include <FileConfigView.h> #include <FileConfigView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
ConfigView::ConfigView() ConfigView::ConfigView()
src/add-ons/mail_daemon/outbound_protocols/smtp/ConfigView.cpp
+2 -2
View File
@@ -17,8 +17,8 @@
#include <ProtocolConfigView.h> #include <ProtocolConfigView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
class SMTPConfigView : public BMailProtocolConfigView { class SMTPConfigView : public BMailProtocolConfigView {
src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
+2 -2
View File
@@ -48,8 +48,8 @@
#endif #endif
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "smtp" #define B_TRANSLATION_CONTEXT "smtp"
#define CRLF "\r\n" #define CRLF "\r\n"
src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
+2 -2
View File
@@ -29,8 +29,8 @@
#include "MixerUtils.h" #include "MixerUtils.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "AudioMixer" #define B_TRANSLATION_CONTEXT "AudioMixer"
// the range of the gain sliders (in dB) // the range of the gain sliders (in dB)
src/add-ons/screen_savers/butterfly/Butterfly.cpp
+2 -2
View File
@@ -19,8 +19,8 @@
#include <BuildScreenSaverDefaultSettingsView.h> #include <BuildScreenSaverDefaultSettingsView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "Screensaver Butterfly" #define B_TRANSLATION_CONTEXT "Screensaver Butterfly"
extern "C" BScreenSaver* extern "C" BScreenSaver*
src/add-ons/screen_savers/debugnow/DebugNow.cpp
+2 -2
View File
@@ -15,8 +15,8 @@
#include <BuildScreenSaverDefaultSettingsView.h> #include <BuildScreenSaverDefaultSettingsView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "Screensaver DebugNow" #define B_TRANSLATION_CONTEXT "Screensaver DebugNow"
const rgb_color kMediumBlue = {0, 0, 100}; const rgb_color kMediumBlue = {0, 0, 100};
src/add-ons/screen_savers/haiku/ScreenSaver.cpp
+2 -2
View File
@@ -19,8 +19,8 @@
#include <BuildScreenSaverDefaultSettingsView.h> #include <BuildScreenSaverDefaultSettingsView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "Screensaver Haiku" #define B_TRANSLATION_CONTEXT "Screensaver Haiku"
class ScreenSaver : public BScreenSaver class ScreenSaver : public BScreenSaver
src/add-ons/screen_savers/icons/IconsSaver.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
#include "IconDisplay.h" #include "IconDisplay.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "Screensaver Icons" #define B_TRANSLATION_CONTEXT "Screensaver Icons"
#define MAX_ICONS 15 #define MAX_ICONS 15
src/add-ons/screen_savers/ifs/IFSSaver.cpp
+2 -2
View File
@@ -11,8 +11,8 @@
#include "IFSSaver.h" #include "IFSSaver.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "Screensaver IFS" #define B_TRANSLATION_CONTEXT "Screensaver IFS"
enum { enum {
src/add-ons/screen_savers/leaves/Leaves.cpp
+2 -2
View File
@@ -19,8 +19,8 @@
#include <TextView.h> #include <TextView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "Leaves" #define B_TRANSLATION_CONTEXT "Leaves"
// path data for the leaf shape // path data for the leaf shape
src/add-ons/screen_savers/message/Message.cpp
+2 -2
View File
@@ -24,8 +24,8 @@
#include <BuildScreenSaverDefaultSettingsView.h> #include <BuildScreenSaverDefaultSettingsView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "Screensaver Message" #define B_TRANSLATION_CONTEXT "Screensaver Message"
// Double brackets to satisfy a compiler warning // Double brackets to satisfy a compiler warning
src/add-ons/screen_savers/spider/SpiderSaver.cpp
+2 -2
View File
@@ -24,8 +24,8 @@
#include "Polygon.h" #include "Polygon.h"
#include "PolygonQueue.h" #include "PolygonQueue.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "Screensaver Spider" #define B_TRANSLATION_CONTEXT "Screensaver Spider"
enum { enum {
MSG_QUEUE_NUMBER = 'qunm', MSG_QUEUE_NUMBER = 'qunm',
src/add-ons/tracker/zipomatic/ZipOMatic.cpp
+2 -2
View File
@@ -17,8 +17,8 @@
#include "ZipOMaticWindow.h" #include "ZipOMaticWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "file:ZipOMatic.cpp" #define B_TRANSLATION_CONTEXT "file:ZipOMatic.cpp"
int int
src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
+2 -2
View File
@@ -33,8 +33,8 @@
#include "ZipperThread.h" #include "ZipperThread.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "file:ZipOMaticWindow.cpp" #define B_TRANSLATION_CONTEXT "file:ZipOMaticWindow.cpp"
ZippoWindow::ZippoWindow(BList windowList, bool keepOpen) ZippoWindow::ZippoWindow(BList windowList, bool keepOpen)
src/add-ons/tracker/zipomatic/ZipperThread.cpp
+2 -2
View File
@@ -27,8 +27,8 @@
#include "ZipOMaticWindow.h" #include "ZipOMaticWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "file:ZipperThread.cpp" #define B_TRANSLATION_CONTEXT "file:ZipperThread.cpp"
ZipperThread::ZipperThread(BMessage* refsMessage, BWindow* window) ZipperThread::ZipperThread(BMessage* refsMessage, BWindow* window)
src/add-ons/translators/bmp/BMPMain.cpp
+2 -2
View File
@@ -37,8 +37,8 @@
#include "BMPTranslator.h" #include "BMPTranslator.h"
#include "TranslatorWindow.h" #include "TranslatorWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "BMPMain" #define B_TRANSLATION_CONTEXT "BMPMain"
// --------------------------------------------------------------- // ---------------------------------------------------------------
src/add-ons/translators/bmp/BMPTranslator.cpp
+2 -2
View File
@@ -28,8 +28,8 @@ using std::min;
//#define ERROR(x) printf(x); //#define ERROR(x) printf(x);
#define ERROR(x) #define ERROR(x)
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "BMPTranslator" #define B_TRANSLATION_CONTEXT "BMPTranslator"
// The input formats that this translator supports. // The input formats that this translator supports.
src/add-ons/translators/bmp/BMPView.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
#include <stdio.h> #include <stdio.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "BMPView" #define B_TRANSLATION_CONTEXT "BMPView"
BMPView::BMPView(const BRect &frame, const char *name, uint32 resizeMode, BMPView::BMPView(const BRect &frame, const char *name, uint32 resizeMode,
src/add-ons/translators/exr/ConfigView.cpp
+2 -2
View File
@@ -19,8 +19,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
ConfigView::ConfigView(uint32 flags) ConfigView::ConfigView(uint32 flags)
src/add-ons/translators/exr/EXRTranslator.cpp
+2 -2
View File
@@ -16,8 +16,8 @@
#include "ImfRgbaFile.h" #include "ImfRgbaFile.h"
#include "IStreamWrapper.h" #include "IStreamWrapper.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "EXRTranslator" #define B_TRANSLATION_CONTEXT "EXRTranslator"
// The input formats that this translator supports. // The input formats that this translator supports.
src/add-ons/translators/exr/main.cpp
+2 -2
View File
@@ -10,8 +10,8 @@
#include <Application.h> #include <Application.h>
#include <Catalog.h> #include <Catalog.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "main" #define B_TRANSLATION_CONTEXT "main"
int int
main(int /*argc*/, char **/*argv*/) main(int /*argc*/, char **/*argv*/)
src/add-ons/translators/gif/GIFTranslator.cpp
+2 -2
View File
@@ -37,8 +37,8 @@
#define GIF_TYPE 'GIF ' #define GIF_TYPE 'GIF '
#endif #endif
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "GIFTranslator" #define B_TRANSLATION_CONTEXT "GIFTranslator"
// This global will be externed in other files - set once here // This global will be externed in other files - set once here
src/add-ons/translators/gif/GIFView.cpp
+2 -2
View File
@@ -31,8 +31,8 @@
#include "GIFView.h" #include "GIFView.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "GIFView" #define B_TRANSLATION_CONTEXT "GIFView"
extern int32 translatorVersion; extern int32 translatorVersion;
src/add-ons/translators/hpgs/ConfigView.cpp
+2 -2
View File
@@ -15,8 +15,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags) ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
src/add-ons/translators/hpgs/HPGSTranslator.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "HPGSTranslator" #define B_TRANSLATION_CONTEXT "HPGSTranslator"
typedef struct my_hpgs_png_image_st { typedef struct my_hpgs_png_image_st {
src/add-ons/translators/hvif/HVIFMain.cpp
+2 -2
View File
@@ -11,8 +11,8 @@
#include "HVIFTranslator.h" #include "HVIFTranslator.h"
#include "TranslatorWindow.h" #include "TranslatorWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "HVIFMain" #define B_TRANSLATION_CONTEXT "HVIFMain"
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
src/add-ons/translators/hvif/HVIFTranslator.cpp
+2 -2
View File
@@ -22,8 +22,8 @@
#define HVIF_TRANSLATION_QUALITY 1.0 #define HVIF_TRANSLATION_QUALITY 1.0
#define HVIF_TRANSLATION_CAPABILITY 1.0 #define HVIF_TRANSLATION_CAPABILITY 1.0
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "HVIFTranslator" #define B_TRANSLATION_CONTEXT "HVIFTranslator"
static const translation_format sInputFormats[] = { static const translation_format sInputFormats[] = {
src/add-ons/translators/hvif/HVIFView.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
#define HVIF_SETTING_RENDER_SIZE_CHANGED 'rsch' #define HVIF_SETTING_RENDER_SIZE_CHANGED 'rsch'
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "HVIFView" #define B_TRANSLATION_CONTEXT "HVIFView"
HVIFView::HVIFView(const char* name, uint32 flags, TranslatorSettings *settings) HVIFView::HVIFView(const char* name, uint32 flags, TranslatorSettings *settings)
src/add-ons/translators/ico/ConfigView.cpp
+2 -2
View File
@@ -16,8 +16,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
ConfigView::ConfigView() ConfigView::ConfigView()
src/add-ons/translators/ico/ICOTranslator.cpp
+2 -2
View File
@@ -17,8 +17,8 @@
#include "ICO.h" #include "ICO.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ICOTranslator" #define B_TRANSLATION_CONTEXT "ICOTranslator"
const char *kDocumentCount = "/documentCount"; const char *kDocumentCount = "/documentCount";
src/add-ons/translators/ico/main.cpp
+2 -2
View File
@@ -11,8 +11,8 @@
#include "ICO.h" #include "ICO.h"
#include "TranslatorWindow.h" #include "TranslatorWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "main" #define B_TRANSLATION_CONTEXT "main"
int int
main(int /*argc*/, char ** /*argv*/) main(int /*argc*/, char ** /*argv*/)
src/add-ons/translators/jpeg/JPEGTranslator.cpp
+2 -2
View File
@@ -43,8 +43,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <TabView.h> #include <TabView.h>
#include <TextView.h> #include <TextView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "JPEGTranslator" #define B_TRANSLATION_CONTEXT "JPEGTranslator"
#define MARKER_EXIF 0xe1 #define MARKER_EXIF 0xe1
src/add-ons/translators/jpeg/JPEGTranslator.h
+2 -2
View File
@@ -53,8 +53,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseTranslator.h" #include "BaseTranslator.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "JPEGTranslator" #define B_TRANSLATION_CONTEXT "JPEGTranslator"
// Settings // Settings
#define SETTINGS_FILE "JPEGTranslator" #define SETTINGS_FILE "JPEGTranslator"
src/add-ons/translators/jpeg/be_jerror.cpp
+2 -2
View File
@@ -51,8 +51,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "JPEGTranslator.h" #include "JPEGTranslator.h"
#include "TranslatorSettings.h" #include "TranslatorSettings.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "be_jerror" #define B_TRANSLATION_CONTEXT "be_jerror"
// Since Translator doesn't use it's own error table, we can use error_mgr's // Since Translator doesn't use it's own error table, we can use error_mgr's
// variables to store some usefull data. // variables to store some usefull data.
src/add-ons/translators/jpeg/exif_parser.cpp
+2 -2
View File
@@ -17,8 +17,8 @@
#include <ReadHelper.h> #include <ReadHelper.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "exit_parser" #define B_TRANSLATION_CONTEXT "exit_parser"
using std::set; using std::set;
src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
+2 -2
View File
@@ -42,8 +42,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <TextView.h> #include <TextView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "JPEG2000Translator" #define B_TRANSLATION_CONTEXT "JPEG2000Translator"
// Set these accordingly // Set these accordingly
#define JP2_ACRONYM "JP2" #define JP2_ACRONYM "JP2"
src/add-ons/translators/jpeg2000/JPEG2000Translator.h
+2 -2
View File
@@ -53,8 +53,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "libjasper/jasper.h" #include "libjasper/jasper.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "JPEG2000Translator" #define B_TRANSLATION_CONTEXT "JPEG2000Translator"
// Settings // Settings
#define JP2_SETTINGS_FILE "JPEG2000Translator" #define JP2_SETTINGS_FILE "JPEG2000Translator"
src/add-ons/translators/pcx/ConfigView.cpp
+2 -2
View File
@@ -16,8 +16,8 @@
#include <string.h> #include <string.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags) ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
src/add-ons/translators/pcx/PCXTranslator.cpp
+2 -2
View File
@@ -14,8 +14,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "PCXTranslator" #define B_TRANSLATION_CONTEXT "PCXTranslator"
#define kPCXMimeType "image/x-pcx" #define kPCXMimeType "image/x-pcx"
src/add-ons/translators/pcx/main.cpp
+2 -2
View File
@@ -13,8 +13,8 @@
#include <Catalog.h> #include <Catalog.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "main" #define B_TRANSLATION_CONTEXT "main"
int int
src/add-ons/translators/png/PNGMain.cpp
+2 -2
View File
@@ -38,8 +38,8 @@
#include "PNGView.h" #include "PNGView.h"
#include "TranslatorWindow.h" #include "TranslatorWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "PNGTranslator" #define B_TRANSLATION_CONTEXT "PNGTranslator"
// --------------------------------------------------------------- // ---------------------------------------------------------------
// main // main
src/add-ons/translators/png/PNGTranslator.cpp
+2 -2
View File
@@ -43,8 +43,8 @@
#include "PNGView.h" #include "PNGView.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "PNGTranslator" #define B_TRANSLATION_CONTEXT "PNGTranslator"
// The input formats that this translator supports. // The input formats that this translator supports.
static const translation_format sInputFormats[] = { static const translation_format sInputFormats[] = {
src/add-ons/translators/png/PNGView.cpp
+2 -2
View File
@@ -23,8 +23,8 @@
#define PNG_NO_PEDANTIC_WARNINGS #define PNG_NO_PEDANTIC_WARNINGS
#include <png.h> #include <png.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "PNGTranslator" #define B_TRANSLATION_CONTEXT "PNGTranslator"
PNGView::PNGView(const BRect &frame, const char *name, uint32 resizeMode, PNGView::PNGView(const BRect &frame, const char *name, uint32 resizeMode,
uint32 flags, TranslatorSettings *settings) uint32 flags, TranslatorSettings *settings)
src/add-ons/translators/ppm/PPMMain.cpp
+2 -2
View File
@@ -15,8 +15,8 @@
#include <stdio.h> #include <stdio.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "PPMMain" #define B_TRANSLATION_CONTEXT "PPMMain"
BPoint get_window_origin(); BPoint get_window_origin();
src/add-ons/translators/ppm/PPMTranslator.cpp
+2 -2
View File
@@ -36,8 +36,8 @@
#include "colorspace.h" #include "colorspace.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "PPMTranslator" #define B_TRANSLATION_CONTEXT "PPMTranslator"
#if DEBUG #if DEBUG
#define dprintf(x) printf x #define dprintf(x) printf x
src/add-ons/translators/raw/ConfigView.cpp
+2 -2
View File
@@ -17,8 +17,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
const char* kShortName2 = B_TRANSLATE_MARK("RAWTranslator Settings"); const char* kShortName2 = B_TRANSLATE_MARK("RAWTranslator Settings");
src/add-ons/translators/raw/RAWTranslator.cpp
+2 -2
View File
@@ -17,8 +17,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "RAWTranslator" #define B_TRANSLATION_CONTEXT "RAWTranslator"
class FreeAllocation { class FreeAllocation {
src/add-ons/translators/raw/main.cpp
+2 -2
View File
@@ -25,8 +25,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "RAWTranslator main" #define B_TRANSLATION_CONTEXT "RAWTranslator main"
int int
main(int argc, char **argv) main(int argc, char **argv)
src/add-ons/translators/rtf/ConfigView.cpp
+2 -2
View File
@@ -12,8 +12,8 @@
#include <stdio.h> #include <stdio.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags) ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
src/add-ons/translators/rtf/RTFTranslator.cpp
+2 -2
View File
@@ -14,8 +14,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "RTFTranslator" #define B_TRANSLATION_CONTEXT "RTFTranslator"
#define READ_BUFFER_SIZE 2048 #define READ_BUFFER_SIZE 2048
#define DATA_BUFFER_SIZE 64 #define DATA_BUFFER_SIZE 64
src/add-ons/translators/rtf/main.cpp
+2 -2
View File
@@ -19,8 +19,8 @@
#include "RTF.h" #include "RTF.h"
#include "RTFTranslator.h" #include "RTFTranslator.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "main" #define B_TRANSLATION_CONTEXT "main"
int int
src/add-ons/translators/sgi/SGIMain.cpp
+2 -2
View File
@@ -39,8 +39,8 @@
#include "SGITranslator.h" #include "SGITranslator.h"
#include "TranslatorWindow.h" #include "TranslatorWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "SGIMain" #define B_TRANSLATION_CONTEXT "SGIMain"
// --------------------------------------------------------------- // ---------------------------------------------------------------
// main // main
src/add-ons/translators/sgi/SGITranslator.cpp
+2 -2
View File
@@ -54,8 +54,8 @@
using std::nothrow; using std::nothrow;
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "SGITranslator" #define B_TRANSLATION_CONTEXT "SGITranslator"
// The input formats that this translator supports. // The input formats that this translator supports.
src/add-ons/translators/sgi/SGIView.cpp
+2 -2
View File
@@ -50,8 +50,8 @@
const char* author = "Stephan Aßmus, <[email protected]>"; const char* author = "Stephan Aßmus, <[email protected]>";
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "SGIView" #define B_TRANSLATION_CONTEXT "SGIView"
// add_menu_item // add_menu_item
void void
src/add-ons/translators/shared/BaseTranslator.cpp
+2 -2
View File
@@ -38,8 +38,8 @@
#include "BaseTranslator.h" #include "BaseTranslator.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "BaseTranslator" #define B_TRANSLATION_CONTEXT "BaseTranslator"
// --------------------------------------------------------------- // ---------------------------------------------------------------
src/add-ons/translators/shared/TranslatorWindow.cpp
+2 -2
View File
@@ -35,8 +35,8 @@
#include "TranslatorWindow.h" #include "TranslatorWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "TranslatorWindow" #define B_TRANSLATION_CONTEXT "TranslatorWindow"
// --------------------------------------------------------------- // ---------------------------------------------------------------
src/add-ons/translators/stxt/STXTMain.cpp
+2 -2
View File
@@ -37,8 +37,8 @@
#include "STXTTranslator.h" #include "STXTTranslator.h"
#include "TranslatorWindow.h" #include "TranslatorWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "STXTMain" #define B_TRANSLATION_CONTEXT "STXTMain"
// --------------------------------------------------------------- // ---------------------------------------------------------------
// main // main
src/add-ons/translators/stxt/STXTTranslator.cpp
+2 -2
View File
@@ -28,8 +28,8 @@
using namespace BPrivate; using namespace BPrivate;
using namespace std; using namespace std;
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "STXTTranslator" #define B_TRANSLATION_CONTEXT "STXTTranslator"
#define READ_BUFFER_SIZE 32768 #define READ_BUFFER_SIZE 32768
#define DATA_BUFFER_SIZE 256 #define DATA_BUFFER_SIZE 256
src/add-ons/translators/stxt/STXTView.cpp
+2 -2
View File
@@ -19,8 +19,8 @@
#include <stdio.h> #include <stdio.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "STXTView" #define B_TRANSLATION_CONTEXT "STXTView"
STXTView::STXTView(const BRect &frame, const char *name, uint32 resizeMode, STXTView::STXTView(const BRect &frame, const char *name, uint32 resizeMode,
src/add-ons/translators/tga/TGAMain.cpp
+2 -2
View File
@@ -33,8 +33,8 @@
#include "TGATranslator.h" #include "TGATranslator.h"
#include "TranslatorWindow.h" #include "TranslatorWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "TGAMain" #define B_TRANSLATION_CONTEXT "TGAMain"
// --------------------------------------------------------------- // ---------------------------------------------------------------
// main // main
src/add-ons/translators/tga/TGATranslator.cpp
+2 -2
View File
@@ -37,8 +37,8 @@
#include "TGAView.h" #include "TGAView.h"
#include "StreamBuffer.h" #include "StreamBuffer.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "TGATranslator" #define B_TRANSLATION_CONTEXT "TGATranslator"
// The input formats that this translator supports. // The input formats that this translator supports.
static const translation_format sInputFormats[] = { static const translation_format sInputFormats[] = {
src/add-ons/translators/tga/TGAView.cpp
+2 -2
View File
@@ -40,8 +40,8 @@
#include "TGAView.h" #include "TGAView.h"
#include "TGATranslator.h" #include "TGATranslator.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "TGAView" #define B_TRANSLATION_CONTEXT "TGAView"
TGAView::TGAView(const char *name, uint32 flags, TranslatorSettings *settings) TGAView::TGAView(const char *name, uint32 flags, TranslatorSettings *settings)
src/add-ons/translators/tiff/TIFFMain.cpp
+2 -2
View File
@@ -37,8 +37,8 @@
#include "TIFFTranslator.h" #include "TIFFTranslator.h"
#include "TranslatorWindow.h" #include "TranslatorWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "TIFFMain" #define B_TRANSLATION_CONTEXT "TIFFMain"
// --------------------------------------------------------------- // ---------------------------------------------------------------
// main // main
src/add-ons/translators/tiff/TIFFTranslator.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
#include <string.h> #include <string.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "TIFFTranslator" #define B_TRANSLATION_CONTEXT "TIFFTranslator"
/*! /*!
src/add-ons/translators/tiff/TIFFView.cpp
+2 -2
View File
@@ -50,8 +50,8 @@
#include "TIFFView.h" #include "TIFFView.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "TIFFView" #define B_TRANSLATION_CONTEXT "TIFFView"
// add_menu_item // add_menu_item
void void
src/add-ons/translators/webp/ConfigView.cpp
+2 -2
View File
@@ -31,8 +31,8 @@
#include "WebPTranslator.h" #include "WebPTranslator.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ConfigView" #define B_TRANSLATION_CONTEXT "ConfigView"
static const uint32 kMsgQuality = 'qlty'; static const uint32 kMsgQuality = 'qlty';
src/add-ons/translators/webp/WebPTranslator.cpp
+2 -2
View File
@@ -25,8 +25,8 @@
#include "TranslatorSettings.h" #include "TranslatorSettings.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "WebPTranslator" #define B_TRANSLATION_CONTEXT "WebPTranslator"
class FreeAllocation { class FreeAllocation {
src/add-ons/translators/webp/main.cpp
+2 -2
View File
@@ -14,8 +14,8 @@
#include "WebPTranslator.h" #include "WebPTranslator.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "main" #define B_TRANSLATION_CONTEXT "main"
int int
src/add-ons/translators/wonderbrush/Layer.cpp
+2 -2
View File
@@ -21,8 +21,8 @@
#include "support.h" #include "support.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "Layer" #define B_TRANSLATION_CONTEXT "Layer"
// constructor // constructor
src/add-ons/translators/wonderbrush/WonderBrushMain.cpp
+2 -2
View File
@@ -13,8 +13,8 @@
#include "TranslatorWindow.h" #include "TranslatorWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "WonderBrushMain" #define B_TRANSLATION_CONTEXT "WonderBrushMain"
int int
src/add-ons/translators/wonderbrush/WonderBrushTranslator.cpp
+2 -2
View File
@@ -22,8 +22,8 @@
#include "WonderBrushView.h" #include "WonderBrushView.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "WonderBrushTranslator" #define B_TRANSLATION_CONTEXT "WonderBrushTranslator"
using std::nothrow; using std::nothrow;
src/add-ons/translators/wonderbrush/WonderBrushView.cpp
+2 -2
View File
@@ -22,8 +22,8 @@
#include "WonderBrushTranslator.h" #include "WonderBrushTranslator.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "WonderBrushView" #define B_TRANSLATION_CONTEXT "WonderBrushView"
const char* kAuthor = "Stephan Aßmus, <[email protected]>"; const char* kAuthor = "Stephan Aßmus, <[email protected]>";
src/apps/aboutsystem/AboutSystem.cpp
+4 -4
View File
@@ -400,8 +400,8 @@ AboutApp::AboutApp()
// #pragma mark - // #pragma mark -
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "AboutWindow" #define B_TRANSLATION_CONTEXT "AboutWindow"
AboutWindow::AboutWindow() AboutWindow::AboutWindow()
: BWindow(BRect(0, 0, 500, 300), B_TRANSLATE("About this system"), : BWindow(BRect(0, 0, 500, 300), B_TRANSLATE("About this system"),
@@ -543,8 +543,8 @@ CropView::DoLayout()
// #pragma mark - AboutView // #pragma mark - AboutView
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "AboutView" #define B_TRANSLATION_CONTEXT "AboutView"
AboutView::AboutView() AboutView::AboutView()
: BView("aboutview", B_WILL_DRAW | B_PULSE_NEEDED), : BView("aboutview", B_WILL_DRAW | B_PULSE_NEEDED),
src/apps/aboutsystem/Utilities.cpp
+2 -2
View File
@@ -17,8 +17,8 @@
#include <Message.h> #include <Message.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "Utilities" #define B_TRANSLATION_CONTEXT "Utilities"
BString BString
src/apps/activitymonitor/ActivityMonitor.h
+2 -2
View File
@@ -12,8 +12,8 @@
class BMessage; class BMessage;
class ActivityWindow; class ActivityWindow;
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ActivityWindow" #define B_TRANSLATION_CONTEXT "ActivityWindow"
class ActivityMonitor : public BApplication { class ActivityMonitor : public BApplication {
src/apps/activitymonitor/ActivityView.cpp
+2 -2
View File
@@ -32,8 +32,8 @@
#include "SystemInfo.h" #include "SystemInfo.h"
#include "SystemInfoHandler.h" #include "SystemInfoHandler.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ActivityView" #define B_TRANSLATION_CONTEXT "ActivityView"
template<typename ObjectType> template<typename ObjectType>
class ListAddDeleter { class ListAddDeleter {
src/apps/activitymonitor/ActivityWindow.cpp
+2 -2
View File
@@ -26,8 +26,8 @@
#include "DataSource.h" #include "DataSource.h"
#include "SettingsWindow.h" #include "SettingsWindow.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "ActivityWindow" #define B_TRANSLATION_CONTEXT "ActivityWindow"
static const uint32 kMsgAddView = 'advw'; static const uint32 kMsgAddView = 'advw';
static const uint32 kMsgShowSettings = 'shst'; static const uint32 kMsgShowSettings = 'shst';
src/apps/activitymonitor/DataSource.cpp
+2 -2
View File
@@ -15,8 +15,8 @@
#include "SystemInfo.h" #include "SystemInfo.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "DataSource" #define B_TRANSLATION_CONTEXT "DataSource"
const DataSource* kSources[] = { const DataSource* kSources[] = {
src/apps/activitymonitor/SettingsWindow.cpp
+3 -3
View File
@@ -15,8 +15,8 @@
#include <Slider.h> #include <Slider.h>
#include <String.h> #include <String.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "SettingsWindow" #define B_TRANSLATION_CONTEXT "SettingsWindow"
static const uint32 kMsgUpdateTimeInterval = 'upti'; static const uint32 kMsgUpdateTimeInterval = 'upti';
@@ -90,7 +90,7 @@ private:
SettingsWindow::SettingsWindow(ActivityWindow* target) SettingsWindow::SettingsWindow(ActivityWindow* target)
: BWindow(_RelativeTo(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), B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
fTarget(target) fTarget(target)
{ {
src/apps/bootmanager/BootManager.cpp
+2 -2
View File
@@ -14,8 +14,8 @@
#include <Catalog.h> #include <Catalog.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "BootManager" #define B_TRANSLATION_CONTEXT "BootManager"
static const char* kSignature = "application/x-vnd.Haiku-BootManager"; static const char* kSignature = "application/x-vnd.Haiku-BootManager";
src/apps/bootmanager/BootManagerController.cpp
+2 -2
View File
@@ -29,8 +29,8 @@
#include "WizardView.h" #include "WizardView.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "BootManagerController" #define B_TRANSLATION_CONTEXT "BootManagerController"
BootManagerController::BootManagerController() BootManagerController::BootManagerController()
src/apps/bootmanager/BootManagerWindow.cpp
+2 -2
View File
@@ -22,8 +22,8 @@
#include "WizardView.h" #include "WizardView.h"
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "BootManagerWindow" #define B_TRANSLATION_CONTEXT "BootManagerWindow"
BootManagerWindow::BootManagerWindow() BootManagerWindow::BootManagerWindow()
src/apps/bootmanager/DefaultPartitionPage.cpp
+2 -2
View File
@@ -24,8 +24,8 @@
#include <TextView.h> #include <TextView.h>
#undef B_TRANSLATE_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATE_CONTEXT "DefaultPartitionPage" #define B_TRANSLATION_CONTEXT "DefaultPartitionPage"
enum { enum {

Some files were not shown because too many files have changed in this diff Show More