Final part of cleanup in Catalog.h.
* move versions of the B_TRANSLATE_...-macros used during collecting of catalog keys to a specific header file, which will only be picked up when running collectcatkeys * fix a couple of build problems during the preprocessing of the libbe- sources when extracting catalog keys, all due to private headers not being found * move ZombieReplicantView.h from kits/interface to headers/private/interface, as this way it can be picked up when building the libbe catalog
This commit is contained in:
Oliver Tappe
@@ -63,8 +63,6 @@ private:
|
||||
#define B_TRANSLATE_SYSTEM_NAME_CONTEXT "System name"
|
||||
|
||||
|
||||
#ifndef B_COLLECTING_CATKEYS
|
||||
|
||||
#ifndef B_AVOID_TRANSLATION_MACROS
|
||||
// macros for easy catalog-access, define B_AVOID_TRANSLATION_MACROS if
|
||||
// you don't want these (in which case you need to collect the catalog keys
|
||||
@@ -200,95 +198,5 @@ private:
|
||||
|
||||
#endif /* B_AVOID_TRANSLATION_MACROS */
|
||||
|
||||
#else /* B_COLLECTING_CATKEYS */
|
||||
// TODO: why define them here? Since we obviously control the preprocessor, we
|
||||
// could simply always include a certain file that defines them; this doesn't
|
||||
// really belong into a public header.
|
||||
|
||||
// Translation macros used when executing collectcatkeys
|
||||
|
||||
#undef B_TRANSLATE_CONTEXT
|
||||
|
||||
#undef B_TRANSLATE
|
||||
#define B_TRANSLATE(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT)
|
||||
|
||||
#undef B_TRANSLATE_WITH_CONTEXT
|
||||
#define B_TRANSLATE_WITH_CONTEXT(string, context) \
|
||||
B_CATKEY((string), (context))
|
||||
|
||||
#undef B_TRANSLATE_COMMENT
|
||||
#define B_TRANSLATE_COMMENT(string, comment) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment))
|
||||
|
||||
#undef B_TRANSLATE_ALL
|
||||
#define B_TRANSLATE_ALL(string, context, comment) \
|
||||
B_CATKEY((string), (context), (comment))
|
||||
|
||||
#undef B_TRANSLATE_ID
|
||||
#define B_TRANSLATE_ID(id) \
|
||||
B_CATKEY((id))
|
||||
|
||||
#undef B_TRANSLATE_SYSTEM_NAME
|
||||
#define B_TRANSLATE_SYSTEM_NAME(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT)
|
||||
|
||||
#undef B_TRANSLATE_MARK
|
||||
#define B_TRANSLATE_MARK(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT)
|
||||
|
||||
#undef B_TRANSLATE_MARK_COMMENT
|
||||
#define B_TRANSLATE_MARK_COMMENT(string, comment) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment))
|
||||
|
||||
#undef B_TRANSLATE_MARK_ALL
|
||||
#define B_TRANSLATE_MARK_ALL(string, context, comment) \
|
||||
B_CATKEY((string), (context), (comment))
|
||||
|
||||
#undef B_TRANSLATE_MARK_ID
|
||||
#define B_TRANSLATE_MARK_ID(id) \
|
||||
B_CATKEY((id))
|
||||
|
||||
#undef B_TRANSLATE_MARK_SYSTEM_NAME
|
||||
#define B_TRANSLATE_MARK_SYSTEM_NAME(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT, "")
|
||||
|
||||
#undef B_TRANSLATE_MARK_VOID
|
||||
#define B_TRANSLATE_MARK_VOID(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT)
|
||||
|
||||
#undef B_TRANSLATE_MARK_COMMENT_VOID
|
||||
#define B_TRANSLATE_MARK_COMMENT_VOID(string, comment) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment))
|
||||
|
||||
#undef B_TRANSLATE_MARK_ALL_VOID
|
||||
#define B_TRANSLATE_MARK_ALL_VOID(string, context, comment) \
|
||||
B_CATKEY((string), (context), (comment))
|
||||
|
||||
#undef B_TRANSLATE_MARK_ID_VOID
|
||||
#define B_TRANSLATE_MARK_ID_VOID(id) \
|
||||
B_CATKEY((id))
|
||||
|
||||
#undef B_TRANSLATE_MARK_SYSTEM_NAME_VOID
|
||||
#define B_TRANSLATE_MARK_SYSTEM_NAME_VOID(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT, "")
|
||||
|
||||
#undef B_TRANSLATE_NOCOLLECT
|
||||
#define B_TRANSLATE_NOCOLLECT(string)
|
||||
|
||||
#undef B_TRANSLATE_NOCOLLECT_COMMENT
|
||||
#define B_TRANSLATE_NOCOLLECT_COMMENT(string, comment)
|
||||
|
||||
#undef B_TRANSLATE_NOCOLLECT_ALL
|
||||
#define B_TRANSLATE_NOCOLLECT_ALL(string, context, comment)
|
||||
|
||||
#undef B_TRANSLATE_NOCOLLECT_ID
|
||||
#define B_TRANSLATE_NOCOLLECT_ID(id)
|
||||
|
||||
#undef B_TRANSLATE_NOCOLLECT_SYSTEM_NAME
|
||||
#define B_TRANSLATE_NOCOLLECT_SYSTEM_NAME(string)
|
||||
|
||||
#endif /* B_COLLECTING_CATKEYS */
|
||||
|
||||
|
||||
#endif /* _CATALOG_H_ */
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// Copyright (c) 2001-2010, Haiku
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||
// copy of this software and associated documentation files (the "Software"),
|
||||
// to deal in the Software without restriction, including without limitation
|
||||
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
// and/or sell copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
// File Name: ZombieReplicantView.h
|
||||
// Author: Marc Flerackers ([email protected])
|
||||
// Description: Class for Zombie replicants
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#ifndef _ZOMBIE_REPLICANT_VIEW_H
|
||||
#define _ZOMBIE_REPLICANT_VIEW_H
|
||||
|
||||
#include <BeBuild.h>
|
||||
#include <Box.h>
|
||||
|
||||
|
||||
const static rgb_color kZombieColor = {220, 220, 220, 255};
|
||||
|
||||
|
||||
// _BZombieReplicantView_ class ------------------------------------------------
|
||||
class _BZombieReplicantView_ : public BBox {
|
||||
|
||||
public:
|
||||
_BZombieReplicantView_(BRect frame,
|
||||
status_t error);
|
||||
virtual ~_BZombieReplicantView_();
|
||||
|
||||
virtual void MessageReceived(BMessage*msg);
|
||||
|
||||
virtual void Draw(BRect updateRect);
|
||||
|
||||
virtual void MouseDown(BPoint);
|
||||
|
||||
virtual status_t Archive(BMessage* archive,
|
||||
bool deep = true) const;
|
||||
|
||||
void SetArchive(BMessage*);
|
||||
|
||||
private:
|
||||
status_t fError;
|
||||
BMessage* fArchive;
|
||||
};
|
||||
|
||||
#endif /* _ZOMBIE_REPLICANT_VIEW_H */
|
||||
@@ -0,0 +1,95 @@
|
||||
/*
|
||||
* Copyright 2012, Haiku, Inc.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _CATALOG_COLLECTOR_H_
|
||||
#define _CATALOG_COLLECTOR_H_
|
||||
|
||||
|
||||
#include_next <Catalog.h>
|
||||
|
||||
|
||||
// Translation macros used when executing collectcatkeys
|
||||
#undef B_TRANSLATE_CONTEXT
|
||||
|
||||
#undef B_TRANSLATE
|
||||
#define B_TRANSLATE(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT)
|
||||
|
||||
#undef B_TRANSLATE_WITH_CONTEXT
|
||||
#define B_TRANSLATE_WITH_CONTEXT(string, context) \
|
||||
B_CATKEY((string), (context))
|
||||
|
||||
#undef B_TRANSLATE_COMMENT
|
||||
#define B_TRANSLATE_COMMENT(string, comment) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment))
|
||||
|
||||
#undef B_TRANSLATE_ALL
|
||||
#define B_TRANSLATE_ALL(string, context, comment) \
|
||||
B_CATKEY((string), (context), (comment))
|
||||
|
||||
#undef B_TRANSLATE_ID
|
||||
#define B_TRANSLATE_ID(id) \
|
||||
B_CATKEY((id))
|
||||
|
||||
#undef B_TRANSLATE_SYSTEM_NAME
|
||||
#define B_TRANSLATE_SYSTEM_NAME(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT)
|
||||
|
||||
#undef B_TRANSLATE_MARK
|
||||
#define B_TRANSLATE_MARK(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT)
|
||||
|
||||
#undef B_TRANSLATE_MARK_COMMENT
|
||||
#define B_TRANSLATE_MARK_COMMENT(string, comment) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment))
|
||||
|
||||
#undef B_TRANSLATE_MARK_ALL
|
||||
#define B_TRANSLATE_MARK_ALL(string, context, comment) \
|
||||
B_CATKEY((string), (context), (comment))
|
||||
|
||||
#undef B_TRANSLATE_MARK_ID
|
||||
#define B_TRANSLATE_MARK_ID(id) \
|
||||
B_CATKEY((id))
|
||||
|
||||
#undef B_TRANSLATE_MARK_SYSTEM_NAME
|
||||
#define B_TRANSLATE_MARK_SYSTEM_NAME(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT, "")
|
||||
|
||||
#undef B_TRANSLATE_MARK_VOID
|
||||
#define B_TRANSLATE_MARK_VOID(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT)
|
||||
|
||||
#undef B_TRANSLATE_MARK_COMMENT_VOID
|
||||
#define B_TRANSLATE_MARK_COMMENT_VOID(string, comment) \
|
||||
B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment))
|
||||
|
||||
#undef B_TRANSLATE_MARK_ALL_VOID
|
||||
#define B_TRANSLATE_MARK_ALL_VOID(string, context, comment) \
|
||||
B_CATKEY((string), (context), (comment))
|
||||
|
||||
#undef B_TRANSLATE_MARK_ID_VOID
|
||||
#define B_TRANSLATE_MARK_ID_VOID(id) \
|
||||
B_CATKEY((id))
|
||||
|
||||
#undef B_TRANSLATE_MARK_SYSTEM_NAME_VOID
|
||||
#define B_TRANSLATE_MARK_SYSTEM_NAME_VOID(string) \
|
||||
B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT, "")
|
||||
|
||||
#undef B_TRANSLATE_NOCOLLECT
|
||||
#define B_TRANSLATE_NOCOLLECT(string)
|
||||
|
||||
#undef B_TRANSLATE_NOCOLLECT_COMMENT
|
||||
#define B_TRANSLATE_NOCOLLECT_COMMENT(string, comment)
|
||||
|
||||
#undef B_TRANSLATE_NOCOLLECT_ALL
|
||||
#define B_TRANSLATE_NOCOLLECT_ALL(string, context, comment)
|
||||
|
||||
#undef B_TRANSLATE_NOCOLLECT_ID
|
||||
#define B_TRANSLATE_NOCOLLECT_ID(id)
|
||||
|
||||
#undef B_TRANSLATE_NOCOLLECT_SYSTEM_NAME
|
||||
#define B_TRANSLATE_NOCOLLECT_SYSTEM_NAME(string)
|
||||
|
||||
|
||||
#endif /* _CATALOG_COLLECTOR_H_ */
|
||||
Reference in New Issue
Block a user