Use camel cased dumpAsXmlOn

diff --git a/zypp/RepoInfo.cc b/zypp/RepoInfo.cc
index 78ffb6cffca0147f17a8d68e6440483440324075..470da719b3d0dd2649a54d209c670ed0dd042196 100644 (file)
--- a/zypp/RepoInfo.cc
+++ b/zypp/RepoInfo.cc
@@ -463,10 +463,7 @@ namespace zypp
     return str;
   }
 
-  std::ostream & RepoInfo::dumpAsXMLOn( std::ostream & str) const
-  { return dumpAsXMLOn(str, ""); }
-
-  std::ostream & RepoInfo::dumpAsXMLOn( std::ostream & str, const std::string & content) const
+  std::ostream & RepoInfo::dumpAsXmlOn( std::ostream & str, const std::string & content ) const
   {
     string tmpstr;
     str

diff --git a/zypp/RepoInfo.h b/zypp/RepoInfo.h
index 71eb895b6e46ec42e713a5b8ffb14ec2f170be41..47b111fce8a235be7345b68680888d97c19a8684 100644 (file)
--- a/zypp/RepoInfo.h
+++ b/zypp/RepoInfo.h
@@ -311,9 +311,9 @@ namespace zypp
 
       /** Whether the repo license has to be accepted, e.g. there is no
        * no acceptance needed for openSUSE.
-       */ 
+       */
       bool needToAcceptLicense() const;
-    
+
       /** Return the best license for the current (or a specified) locale. */
       std::string getLicense( const Locale & lang_r = Locale() );
 
@@ -343,11 +343,6 @@ namespace zypp
        */
       virtual std::ostream & dumpAsIniOn( std::ostream & str ) const;
 
-      /**
-       * Write an XML representation of this RepoInfo object.
-       */
-      virtual std::ostream & dumpAsXMLOn(std::ostream & str) const;
-
       /**
        * Write an XML representation of this RepoInfo object.
        *
@@ -355,7 +350,10 @@ namespace zypp
        * \param content this argument is ignored (used in other classed derived
        *                from RepoInfoBase.
        */
-      virtual std::ostream & dumpAsXMLOn( std::ostream & str, const std::string & content ) const;
+      virtual std::ostream & dumpAsXmlOn( std::ostream & str, const std::string & content = "" ) const;
+
+      /** \deprecated Use camel cased dumpAsXmlOn */
+      ZYPP_DEPRECATED std::ostream & dumpAsXMLOn( std::ostream & str, const std::string & content = "" ) const { return dumpAsXmlOn( str, content ); }
 
       class Impl;
     private:

diff --git a/zypp/ServiceInfo.cc b/zypp/ServiceInfo.cc
index 175caf273e986773ee43202ee6e025d0053c298f..48c5597e617ad4556e599176993bf523ca05cc2c 100644 (file)
--- a/zypp/ServiceInfo.cc
+++ b/zypp/ServiceInfo.cc
@@ -178,10 +178,7 @@ namespace zypp
     return str;
   }
 
-  std::ostream & ServiceInfo::dumpAsXMLOn(std::ostream & str) const
-  { return dumpAsXMLOn(str, ""); }
-
-  ostream & ServiceInfo::dumpAsXMLOn( ostream & str, const string & content) const
+  ostream & ServiceInfo::dumpAsXmlOn( ostream & str, const string & content ) const
   {
     str
       << "<service"

diff --git a/zypp/ServiceInfo.h b/zypp/ServiceInfo.h
index 17e609d1c724a2ac1b9a7a76f07e52f1db3c39de..d5e0bb2a1615a64299481ed2875756ebc06d2360 100644 (file)
--- a/zypp/ServiceInfo.h
+++ b/zypp/ServiceInfo.h
@@ -145,11 +145,6 @@ namespace zypp
      */
     virtual std::ostream & dumpAsIniOn( std::ostream & str ) const;
 
-    /**
-     * Write an XML representation of this ServiceInfo object.
-     */
-    virtual std::ostream & dumpAsXMLOn(std::ostream & str) const;
-
     /**
      * Write an XML representation of this ServiceInfo object.
      *
@@ -157,8 +152,10 @@ namespace zypp
      * \param content if not empty, produces <service ...>content</service>
      *                otherwise <service .../>
      */
-    virtual std::ostream & dumpAsXMLOn(
-        std::ostream & str, const std::string & content) const;
+    virtual std::ostream & dumpAsXmlOn( std::ostream & str, const std::string & content = "" ) const;
+
+    /** \deprecated Use camel cased dumpAsXmlOn */
+    ZYPP_DEPRECATED std::ostream & dumpAsXMLOn( std::ostream & str, const std::string & content = "" ) const { return dumpAsXmlOn( str, content ); }
 
     class Impl;
 

diff --git a/zypp/repo/RepoInfoBase.cc b/zypp/repo/RepoInfoBase.cc
index bac195b9f823a93a6b4ffcdd077b2a9c7d655225..d0ac4215f90ecf29afb3a4a8c42780227cae6c64 100644 (file)
--- a/zypp/repo/RepoInfoBase.cc
+++ b/zypp/repo/RepoInfoBase.cc
@@ -169,10 +169,7 @@ namespace zypp
     return str;
   }
 
-  std::ostream & RepoInfoBase::dumpAsXMLOn(std::ostream & str) const
-  { return dumpAsXMLOn(str, ""); }
-
-  std::ostream & RepoInfoBase::dumpAsXMLOn( std::ostream & str, const std::string & content) const
+  std::ostream & RepoInfoBase::dumpAsXmlOn( std::ostream & str, const std::string & content ) const
   {
     return str << "<!-- there's no XML representation of RepoInfoBase -->" << endl;
   }

diff --git a/zypp/repo/RepoInfoBase.h b/zypp/repo/RepoInfoBase.h
index e348b871d8937909e82aaad39b0b0a44caa467eb..55f9f838550212141d3c011c90653df5238862cf 100644 (file)
--- a/zypp/repo/RepoInfoBase.h
+++ b/zypp/repo/RepoInfoBase.h
@@ -15,7 +15,7 @@
 #include <iosfwd>
 
 #include "zypp/base/PtrTypes.h"
-
+#include "zypp/APIConfig.h"
 #include "zypp/Pathname.h"
 
 ///////////////////////////////////////////////////////////////////
@@ -140,17 +140,13 @@ namespace zypp
        */
       virtual std::ostream & dumpAsIniOn( std::ostream & str ) const;
 
-      /**
-       * Write an XML representation of this object. Implement in
-       * derived classes.
-       */
-      virtual std::ostream & dumpAsXMLOn(std::ostream & str) const;
-
       /**
        * Write an XML representation of this object with content (if available).
        */
-      virtual std::ostream & dumpAsXMLOn(
-          std::ostream & str, const std::string & content) const;
+      virtual std::ostream & dumpAsXmlOn( std::ostream & str, const std::string & content = "" ) const;
+
+      /** \deprecated Use camel cased dumpAsXmlOn */
+      ZYPP_DEPRECATED std::ostream & dumpAsXMLOn( std::ostream & str, const std::string & content = "" ) const { return dumpAsXmlOn( str, content ); }
 
       class Impl;
     private:

diff --git a/zypp/sat/FileConflicts.cc b/zypp/sat/FileConflicts.cc
index 2f226701cd22d7429280bf1d0e81e373c01c37a2..dd71505da1dc1fa7150c12b5bae4512f5597bac6 100644 (file)
--- a/zypp/sat/FileConflicts.cc
+++ b/zypp/sat/FileConflicts.cc
@@ -131,14 +131,14 @@ namespace zypp
     }
 
 
-    std::ostream & dumpAsXMLOn( std::ostream & str, const FileConflicts & obj )
+    std::ostream & dumpAsXmlOn( std::ostream & str, const FileConflicts & obj )
     {
       xmlout::Node guard( str, "fileconflicts", { "size", obj.size() } );
       if ( ! obj.empty() )
       {
        *guard << "\n";
        for ( const auto & el : obj )
-         dumpAsXMLOn( *guard, el ) << "\n";
+         dumpAsXmlOn( *guard, el ) << "\n";
       }
       return str;
     }
@@ -146,7 +146,7 @@ namespace zypp
     namespace
     {
       /// \todo
-      std::ostream & dumpAsXMLHelper( std::ostream & str, const std::string & tag_r, IdString filename_r, IdString md5sum_r, Solvable solv_r )
+      std::ostream & dumpAsXmlHelper( std::ostream & str, const std::string & tag_r, IdString filename_r, IdString md5sum_r, Solvable solv_r )
       {
        xmlout::Node guard( str, tag_r );
        *xmlout::Node( *guard, "file" ) << filename_r;
@@ -172,11 +172,11 @@ namespace zypp
       }
     }
 
-    std::ostream & dumpAsXMLOn( std::ostream & str, const FileConflicts::Conflict & obj )
+    std::ostream & dumpAsXmlOn( std::ostream & str, const FileConflicts::Conflict & obj )
     {
       xmlout::Node guard( str, "fileconflict" );
-      dumpAsXMLHelper( *guard<<"\n", "lhs", obj.lhsFilename(), obj.lhsFilemd5(), obj.lhsSolvable() );
-      dumpAsXMLHelper( *guard<<"\n", "rhs", obj.rhsFilename(), obj.rhsFilemd5(), obj.rhsSolvable() );
+      dumpAsXmlHelper( *guard<<"\n", "lhs", obj.lhsFilename(), obj.lhsFilemd5(), obj.lhsSolvable() );
+      dumpAsXmlHelper( *guard<<"\n", "rhs", obj.rhsFilename(), obj.rhsFilemd5(), obj.rhsSolvable() );
       return str;
     }
 

diff --git a/zypp/sat/FileConflicts.h b/zypp/sat/FileConflicts.h
index 90d9ffe09b2355037025fd08006370c4ba54f5a2..783d6c8cd2a769478e9e15919bf9de0e9b9ad90d 100644 (file)
--- a/zypp/sat/FileConflicts.h
+++ b/zypp/sat/FileConflicts.h
@@ -76,10 +76,10 @@ namespace zypp
     std::ostream & operator<<( std::ostream & str, const FileConflicts::Conflict & obj );
 
     /** \relates FileConflicts XML output */
-    std::ostream & dumpAsXMLOn( std::ostream & str, const FileConflicts & obj );
+    std::ostream & dumpAsXmlOn( std::ostream & str, const FileConflicts & obj );
 
     /** \relates FileConflicts::Conflict XML output */
-    std::ostream & dumpAsXMLOn( std::ostream & str, const FileConflicts::Conflict & obj );
+    std::ostream & dumpAsXmlOn( std::ostream & str, const FileConflicts::Conflict & obj );
 
     /** \relates FileConflicts */
     inline bool operator==( const FileConflicts & lhs, const FileConflicts & rhs )