From 7ae67a9920ee43e5f8e2cd55efe9ea7fa0a0ec51 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 14 Apr 2012 20:33:45 +0200 Subject: [PATCH] Drop empty 'zeta' catalog add-on, wouldn't be useful anyway. --- build/jam/HaikuImage | 2 +- src/add-ons/locale/catalogs/Jamfile | 2 - src/add-ons/locale/catalogs/zeta/Catalog.cpp | 92 -------------------- src/add-ons/locale/catalogs/zeta/Jamfile | 8 -- 4 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 src/add-ons/locale/catalogs/zeta/Catalog.cpp delete mode 100644 src/add-ons/locale/catalogs/zeta/Jamfile diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 36f6edd7a3..d02dd66c8e 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -131,7 +131,7 @@ SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator RAWTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator TIFFTranslator WebPTranslator WonderBrushTranslator ; -SYSTEM_ADD_ONS_LOCALE_CATALOGS = zeta plaintext ; +SYSTEM_ADD_ONS_LOCALE_CATALOGS = plaintext ; SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon cortex_flanger.media_addon $(X86_ONLY)dvb.media_addon diff --git a/src/add-ons/locale/catalogs/Jamfile b/src/add-ons/locale/catalogs/Jamfile index a6e0e55ff4..9644ba3985 100644 --- a/src/add-ons/locale/catalogs/Jamfile +++ b/src/add-ons/locale/catalogs/Jamfile @@ -5,8 +5,6 @@ NotFile LocaleKitCatalogAddons ; Depends LocaleKitCatalogAddons : plaintext - zeta ; SubInclude HAIKU_TOP src add-ons locale catalogs plaintext ; -SubInclude HAIKU_TOP src add-ons locale catalogs zeta ; diff --git a/src/add-ons/locale/catalogs/zeta/Catalog.cpp b/src/add-ons/locale/catalogs/zeta/Catalog.cpp deleted file mode 100644 index 74891428fd..0000000000 --- a/src/add-ons/locale/catalogs/zeta/Catalog.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* -** Copyright 2003, Oliver Tappe, zooey@hirschkaefer.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ - -#include - -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -/** This implements a compatibility catalog-type which uses the catalogs - * supplied by the Zeta Locale Kit. - */ - -class ZetaCatalog : public BCatalogAddOn { - - public: - ZetaCatalog(const char *signature, const char *language, - uint32 fingerprint); - ~ZetaCatalog(); - - const char *GetString(const char *string, const char *context=NULL, - const char *comment=NULL); - const char *GetString(uint32 id); - - private: - -}; - -ZetaCatalog::ZetaCatalog(const char *signature, const char *language, - uint32 fingerprint) - : - BCatalogAddOn(signature, language, fingerprint) -{ - app_info appInfo; - be_app->GetAppInfo(&appInfo); - node_ref nref; - nref.device = appInfo.ref.device; - nref.node = appInfo.ref.directory; - BDirectory appDir( &nref); - - // ToDo: implement loading of zeta-catalog - fInitCheck = EOPNOTSUPP; - - log_team(LOG_DEBUG, - "trying to load zeta-catalog with sig %s for lang %s results in %s", - signature, language, strerror(fInitCheck)); -} - -ZetaCatalog::~ZetaCatalog() -{ -} - -const char * -ZetaCatalog::GetString(const char *string, const char *context, - const char *comment) -{ - return "zeta-string-by-string"; -} - -const char * -ZetaCatalog::GetString(uint32 id) -{ - return "zeta-string-by-id"; -} - - - -extern "C" BCatalogAddOn * -instantiate_catalog(const char *signature, const char *language, uint32 fingerprint) -{ - ZetaCatalog *catalog - = new(std::nothrow) ZetaCatalog(signature, language, fingerprint); - if (catalog && catalog->InitCheck() != B_OK) { - delete catalog; - return NULL; - } - return catalog; -} - -uint8 gCatalogAddOnPriority = 5; - // priority for Zeta catalog-add-on diff --git a/src/add-ons/locale/catalogs/zeta/Jamfile b/src/add-ons/locale/catalogs/zeta/Jamfile deleted file mode 100644 index c02cecb084..0000000000 --- a/src/add-ons/locale/catalogs/zeta/Jamfile +++ /dev/null @@ -1,8 +0,0 @@ -SubDir HAIKU_TOP src add-ons locale catalogs zeta ; - -UsePublicHeaders locale ; - -Addon zeta - : Catalog.cpp - : be $(TARGET_LIBSUPC++) - ;