From fa25d738ead7b80ecf04b47cde4dbd99150929a0 Mon Sep 17 00:00:00 2001 From: Stanislav Visnovsky Date: Mon, 13 Feb 2006 15:46:50 +0000 Subject: [PATCH] Product::displayName() is translatable --- zypp/Product.cc | 2 +- zypp/Product.h | 2 +- zypp/detail/ProductImplIf.cc | 4 ++-- zypp/detail/ProductImplIf.h | 2 +- zypp/source/susetags/SuseTagsProductImpl.cc | 4 ++-- zypp/source/susetags/SuseTagsProductImpl.h | 4 +--- zypp/source/yum/YUMProductImpl.cc | 2 +- zypp/source/yum/YUMProductImpl.h | 4 ++-- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/zypp/Product.cc b/zypp/Product.cc index 12d797d..ae7e55e 100644 --- a/zypp/Product.cc +++ b/zypp/Product.cc @@ -50,7 +50,7 @@ namespace zypp Label Product::vendor() const { return pimpl().vendor(); } - Label Product::displayName() const + TranslatedText Product::displayName() const { return pimpl().displayName(); } diff --git a/zypp/Product.h b/zypp/Product.h index fef73e1..4d33155 100644 --- a/zypp/Product.h +++ b/zypp/Product.h @@ -44,7 +44,7 @@ namespace zypp Label vendor() const; /** Get the name of the product to be presented to user */ - Label displayName() const; + TranslatedText displayName() const; protected: /** Ctor */ diff --git a/zypp/detail/ProductImplIf.cc b/zypp/detail/ProductImplIf.cc index 8f0fbb0..12804bc 100644 --- a/zypp/detail/ProductImplIf.cc +++ b/zypp/detail/ProductImplIf.cc @@ -29,8 +29,8 @@ namespace zypp { return Label(); } /** Get the name of the product to be presented to user */ - Label ProductImplIf::displayName() const - { return Label(); } + TranslatedText ProductImplIf::displayName() const + { return TranslatedText(); } /////////////////////////////////////////////////////////////////// diff --git a/zypp/detail/ProductImplIf.h b/zypp/detail/ProductImplIf.h index 3d7911d..12e7610 100644 --- a/zypp/detail/ProductImplIf.h +++ b/zypp/detail/ProductImplIf.h @@ -47,7 +47,7 @@ namespace zypp virtual Label vendor() const PURE_VIRTUAL; /** Get the name of the product to be presented to user */ - virtual Label displayName() const PURE_VIRTUAL; + virtual TranslatedText displayName() const PURE_VIRTUAL; }; /////////////////////////////////////////////////////////////////// diff --git a/zypp/source/susetags/SuseTagsProductImpl.cc b/zypp/source/susetags/SuseTagsProductImpl.cc index 0c9544e..a9c6a99 100644 --- a/zypp/source/susetags/SuseTagsProductImpl.cc +++ b/zypp/source/susetags/SuseTagsProductImpl.cc @@ -44,8 +44,8 @@ namespace zypp Label SuseTagsProductImpl::vendor() const { return _vendor; } - Label SuseTagsProductImpl::displayName() const - { return _displayName; } + TranslatedText SuseTagsProductImpl::displayName() const + { return _label; } ///////////////////////////////////////////////////////////////// } // namespace detail diff --git a/zypp/source/susetags/SuseTagsProductImpl.h b/zypp/source/susetags/SuseTagsProductImpl.h index 714a0ca..62e65a2 100644 --- a/zypp/source/susetags/SuseTagsProductImpl.h +++ b/zypp/source/susetags/SuseTagsProductImpl.h @@ -37,11 +37,9 @@ namespace zypp virtual std::string category() const; virtual Label vendor() const; - virtual Label displayName() const; + virtual TranslatedText displayName() const; - //std::string _vendor; std::string _category; - std::string _displayName; std::string _name; std::string _version; diff --git a/zypp/source/yum/YUMProductImpl.cc b/zypp/source/yum/YUMProductImpl.cc index a67aeee..895b4e8 100644 --- a/zypp/source/yum/YUMProductImpl.cc +++ b/zypp/source/yum/YUMProductImpl.cc @@ -59,7 +59,7 @@ namespace zypp Label YUMProductImpl::vendor() const { return _vendor; } - Label YUMProductImpl::displayName() const + TranslatedText YUMProductImpl::displayName() const { return _displayname; } TranslatedText YUMProductImpl::summary() const diff --git a/zypp/source/yum/YUMProductImpl.h b/zypp/source/yum/YUMProductImpl.h index 4c081e0..1872c18 100644 --- a/zypp/source/yum/YUMProductImpl.h +++ b/zypp/source/yum/YUMProductImpl.h @@ -42,7 +42,7 @@ namespace zypp ); std::string category() const; Label vendor() const; - Label displayName() const; + TranslatedText displayName() const; TranslatedText summary() const; TranslatedText description() const; Text insnotify() const; @@ -54,7 +54,7 @@ namespace zypp protected: std::string _category; Label _vendor; - Label _displayname; + TranslatedText _displayname; TranslatedText _description; -- 2.7.4