dont return temp objects

diff --git a/zypp/ResObject.cc b/zypp/ResObject.cc
index 15eef42..c412e93 100644 (file)
--- a/zypp/ResObject.cc
+++ b/zypp/ResObject.cc
@@ -43,11 +43,11 @@ namespace zypp
   //
   ///////////////////////////////////////////////////////////////////
 
-  const TranslatedText & ResObject::summary() const
-  { return pimpl().summary(); }
+  Text ResObject::summary() const
+  { return pimpl().summary().text(); }
 
-  const TranslatedText & ResObject::description() const
-  { return pimpl().description(); }
+  Text ResObject::description() const
+  { return pimpl().description().text(); }
 
   Text ResObject::insnotify() const
   { return pimpl().insnotify(); }

diff --git a/zypp/ResObject.h b/zypp/ResObject.h
index 9aaab42..c475e27 100644 (file)
--- a/zypp/ResObject.h
+++ b/zypp/ResObject.h
@@ -43,10 +43,10 @@ namespace zypp
 
   public:
     /** */
-    const TranslatedText & summary() const;
+    Text summary() const;
 
     /** */
-    const TranslatedText & description() const;
+    Text description() const;
 
     /** */
     Text insnotify() const;

diff --git a/zypp/TranslatedText.cc b/zypp/TranslatedText.cc
index cd391f6..47926b6 100644 (file)
--- a/zypp/TranslatedText.cc
+++ b/zypp/TranslatedText.cc
@@ -21,6 +21,8 @@ using std::endl;
 namespace zypp
 { /////////////////////////////////////////////////////////////////
 
+  const TranslatedText TranslatedText::notext;
+
   struct TranslatedText::Private
   {
     std::map<LanguageCode, std::string> translations;

diff --git a/zypp/TranslatedText.h b/zypp/TranslatedText.h
index 17b2798..5a783d8 100644 (file)
--- a/zypp/TranslatedText.h
+++ b/zypp/TranslatedText.h
@@ -22,7 +22,6 @@ using std::string;
 ///////////////////////////////////////////////////////////////////
 namespace zypp
 { /////////////////////////////////////////////////////////////////
-
   ///////////////////////////////////////////////////////////////////
   //
   //   CLASS NAME : TranslatedText
@@ -35,6 +34,7 @@ namespace zypp
 
   public:
     /** Default ctor: 0 */
+    static const TranslatedText notext;
     TranslatedText();
     ~TranslatedText();
     TranslatedText(const std::string &text, const LanguageCode &lang = LanguageCode());

diff --git a/zypp/detail/ResObjectImplIf.cc b/zypp/detail/ResObjectImplIf.cc
index 44a5ad4..f290410 100644 (file)
--- a/zypp/detail/ResObjectImplIf.cc
+++ b/zypp/detail/ResObjectImplIf.cc
@@ -26,10 +26,10 @@ namespace zypp
     /////////////////////////////////////////////////////////////////
 
       const TranslatedText & ResObjectImplIf::summary() const
-      { return TranslatedText(); }
+      { return TranslatedText::notext; }
 
       const TranslatedText & ResObjectImplIf::description() const
-      { return TranslatedText(); }
+      { return TranslatedText::notext; }
 
       Text ResObjectImplIf::insnotify() const
       { return Text(); }

diff --git a/zypp/detail/SelectionImplIf.cc b/zypp/detail/SelectionImplIf.cc
index 63916ae..5bdd182 100644 (file)
--- a/zypp/detail/SelectionImplIf.cc
+++ b/zypp/detail/SelectionImplIf.cc
@@ -27,10 +27,10 @@ namespace zypp
     /////////////////////////////////////////////////////////////////
 
     const TranslatedText & SelectionImplIf::summary() const
-    { return TranslatedText(); }
+    { return TranslatedText::notext; }
 
     const TranslatedText & SelectionImplIf::description() const
-    { return TranslatedText(); }
+    { return TranslatedText::notext; }
 
     Label SelectionImplIf::category() const
     { return Label(); }